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

diff --git a/daemon/zero.c b/daemon/zero.c
index ba87e68..4d06505 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);
@@ -44,9 +42,16 @@ do_zero (char *device)
   memset (buf, 0, sizeof buf);
 
   for (i = 0; i < 32; ++i)
-    (void) write (fd, buf, sizeof buf);
-
-  close (fd);
+    if (write (fd, buf, sizeof buf) != sizeof buf) {
+      reply_with_perror ("write: %s", device);
+      close (fd);
+      return -1;
+    }
+
+  if (close (fd) == -1) {
+    reply_with_perror ("close: %s", device);
+    return -1;
+  }
 
   return 0;
 }