X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fzero.c;h=43089e0b23c4999b59a97df21c870bb1b1a5cc08;hp=9c803d8cb3f4e8806e58c0b04c290939a50aa085;hb=88ab203e611694bc0d01aca745e8df18cb3f094e;hpb=a7b73d4a1e09f12b2002083618056f0c823c1dcf

diff --git a/daemon/zero.c b/daemon/zero.c
index 9c803d8..43089e0 100644
--- a/daemon/zero.c
+++ b/daemon/zero.c
@@ -20,6 +20,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <inttypes.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -28,13 +29,11 @@
 #include "actions.h"
 
 int
-do_zero (char *device)
+do_zero (const char *device)
 {
   int fd, i;
   char buf[4096];
 
-  IS_DEVICE (device, -1);
-
   fd = open (device, O_WRONLY);
   if (fd == -1) {
     reply_with_perror ("%s", device);
@@ -43,10 +42,55 @@ do_zero (char *device)
 
   memset (buf, 0, sizeof buf);
 
-  for (i = 0; i < 32; ++i)
-    (void) write (fd, buf, sizeof buf);
+  for (i = 0; i < 32; ++i) {
+    if (write (fd, buf, sizeof buf) != sizeof buf) {
+      reply_with_perror ("write: %s", device);
+      close (fd);
+      return -1;
+    }
+    notify_progress ((uint64_t) i, 32);
+  }
+
+  if (close (fd) == -1) {
+    reply_with_perror ("close: %s", device);
+    return -1;
+  }
+
+  return 0;
+}
+
+int
+do_zero_device (const char *device)
+{
+  int64_t size = do_blockdev_getsize64 (device);
+  if (size == -1)
+    return -1;
 
-  close (fd);
+  int fd = open (device, O_WRONLY);
+  if (fd == -1) {
+    reply_with_perror ("%s", device);
+    return -1;
+  }
+
+  char buf[1024*1024];
+  memset (buf, 0, sizeof buf);
+
+  while (size > 0) {
+    size_t n = (size_t) size > sizeof buf ? sizeof buf : (size_t) size;
+    ssize_t r = write (fd, buf, n);
+    if (r == -1) {
+      reply_with_perror ("write: %s (with %" PRId64 " bytes left to write)",
+                         device, size);
+      close (fd);
+      return -1;
+    }
+    size -= r;
+  }
+
+  if (close (fd) == -1) {
+    reply_with_perror ("close: %s", device);
+    return -1;
+  }
 
   return 0;
 }