Add progress messages to zero command.

[libguestfs.git] / daemon / zero.c

diff --git a/daemon/zero.c b/daemon/zero.c
index 4d06505..43089e0 100644 (file)
--- 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>
@@ -41,12 +42,50 @@ do_zero (const char *device)
 
   memset (buf, 0, sizeof buf);
 
-  for (i = 0; i < 32; ++i)
+  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;
+
+  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);