X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fzero.c;h=0ade2423f2ea9a1dfcbfd66847ea335c23026fb6;hp=ba87e68bb4e662f805b1e204e92b07adcdb2b3d7;hb=2b891ceef355ce2d6532d65f8febbe3833d4399e;hpb=1997858e90da728287ef26a6d01a5766ac914312

diff --git a/daemon/zero.c b/daemon/zero.c
index ba87e68..0ade242 100644
--- a/daemon/zero.c
+++ b/daemon/zero.c
@@ -28,13 +28,11 @@
 #include "actions.h"
 
 int
-do_zero (char *device)
+do_zero (const char *device)
 {
   int fd, i;
   char buf[4096];
 
-  RESOLVE_DEVICE (device, return -1);
-
   fd = open (device, O_WRONLY);
   if (fd == -1) {
     reply_with_perror ("%s", device);
@@ -43,10 +41,20 @@ do_zero (char *device)
 
   memset (buf, 0, sizeof buf);
 
+  int err = 0;
+  int saved_errno = 0;
   for (i = 0; i < 32; ++i)
-    (void) write (fd, buf, sizeof buf);
-
-  close (fd);
+    if (write (fd, buf, sizeof buf) != sizeof buf) {
+      saved_errno = errno;
+      err = -1;
+    }
+
+  if (close (fd) && saved_errno == 0) {
+    saved_errno = errno;
+    err = -1;
+  }
 
-  return 0;
+  if (saved_errno)
+    errno = saved_errno;
+  return err;
 }