mkswap: when writing the signature page, handle EINTR returns

If the signature page write bumps into EINTR, it should finish the
write, instead of dying.

Addresses-Ubuntu-Bug: 206113
Signed-off-by: LaMont Jones <lamont@canonical.com>
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 12d9a164a71e1c635d912efdeadffaef7556f3c9..dc3a3d308b81b387cf8c1fe4ee5f5baaf938ccbb 100644 (file)
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -465,6 +465,22 @@ check_mount(void) {
        return 1;
 }
 
+
+static int
+write_all(int fd, const void *buf, size_t count) {
+       while(count) {
+               ssize_t tmp = write(fd, buf, count);
+
+               if (tmp > 0) {
+                       count -= tmp;
+                       if (count)
+                               buf += tmp;
+               } else if (errno != EINTR && errno != EAGAIN)
+                       return -1;
+       }
+       return 0;
+}
+
 int
 main(int argc, char ** argv) {
        struct stat statbuf;
@@ -711,9 +727,12 @@ use 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"));
-       if (write(DEV,(char*)signature_page+offset, pagesize-offset)
-           != pagesize-offset)
-               die(_("unable to write signature page"));
+       if (write_all(DEV, (char *) signature_page + offset,
+                                   pagesize - offset) == -1) {
+               fprintf(stderr, _("%s: %s: unable to write signature page: %s"),
+                       program_name, device_name, strerror(errno));
+               exit(1);
+       }
 
        /*
         * A subsequent swapon() will fail if the signature