du: Add pulse mode progress messages.

[libguestfs.git] / daemon / du.c

diff --git a/daemon/du.c b/daemon/du.c
index 7d9c663..1c44b3b 100644 (file)
--- a/daemon/du.c
+++ b/daemon/du.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009-2011 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,21 +24,18 @@
 #include <unistd.h>
 #include <inttypes.h>
 
-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"
 
 int64_t
-do_du (char *path)
+do_du (const char *path)
 {
   int r;
   int64_t rv;
   char *out, *err;
   char *buf;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, return -1);
-
   /* Make the path relative to /sysroot. */
   buf = sysroot_path (path);
   if (!buf) {
@@ -46,10 +43,13 @@ do_du (char *path)
     return -1;
   }
 
+  pulse_mode_start ();
+
   r = command (&out, &err, "du", "-s", buf, NULL);
   free (buf);
   if (r == -1) {
-    reply_with_error ("du: %s: %s", path, err);
+    pulse_mode_cancel ();
+    reply_with_error ("%s: %s", path, err);
     free (out);
     free (err);
     return -1;
@@ -58,12 +58,15 @@ do_du (char *path)
   free (err);
 
   if (sscanf (out, "%"SCNi64, &rv) != 1) {
-    reply_with_error ("du: %s: could not read output: %s", path, out);
+    pulse_mode_cancel ();
+    reply_with_error ("%s: could not read output: %s", path, out);
     free (out);
     return -1;
   }
 
   free (out);
 
+  pulse_mode_end ();
+
   return rv;
 }