From: LaMont Jones Date: Tue, 15 Apr 2008 00:17:25 +0000 (-0600) Subject: Revert "mkswap: when writing the signature page, handle EINTR returns." X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=563ee4e1c7339286a02daea01fcc33d0aa828c7e;p=util-linux Revert "mkswap: when writing the signature page, handle EINTR returns." This reverts commit 5a913db9576f87ae9780d22de7d7f614e7f53dda. --- diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c index dbbfa389..4b1becaf 100644 --- a/disk-utils/mkswap.c +++ b/disk-utils/mkswap.c @@ -488,24 +488,6 @@ check_mount(void) { return 1; } -static ssize_t -write_all(int fd, const void *buf, size_t count) { - const unsigned char *b = buf; - ssize_t ret = 0; - ssize_t tmp; - do { - tmp = write(fd, b + ret, count - ret); - if (tmp > 0) { - ret += tmp, b += tmp, count -= tmp; - } else if (tmp == 0) { - break; /* hit end of file... */ - } else if (errno != EINTR && errno != EAGAIN) { - return -1; - } - } while (ret < count && ret != -1); - return ret; -} - int main(int argc, char ** argv) { struct stat statbuf; @@ -748,11 +730,8 @@ the -f option to force it.\n"), offset = ((version == 0) ? 0 : 1024); if (lseek(DEV, offset, SEEK_SET) != offset) die(_("unable to rewind swap-device")); - i=write_all(DEV,(char*)signature_page+offset, pagesize-offset); - if (i < 0) - fprintf(stderr, _("error writing swap signature: %s"), - strerror(errno)); - if (i != pagesize-offset) + if (write(DEV,(char*)signature_page+offset, pagesize-offset) + != pagesize-offset) die(_("unable to write signature page")); /*