X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fdu.c;h=efff2085ca0018deb46e37b5fd5adf040fee7bdf;hb=29172e7c4878085a680812f7f3b8ad6ea5f1193c;hp=6f1adba03fae28e8f7c811cd241336d60393d176;hpb=a7b73d4a1e09f12b2002083618056f0c823c1dcf;p=libguestfs.git

diff --git a/daemon/du.c b/daemon/du.c
index 6f1adba..efff208 100644
--- 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
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <config.h>
@@ -24,35 +24,32 @@
 #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;
-  int len;
-
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
 
   /* Make the path relative to /sysroot. */
-  len = strlen (path) + 9;
-  buf = malloc (len);
+  buf = sysroot_path (path);
   if (!buf) {
     reply_with_perror ("malloc");
     return -1;
   }
-  snprintf (buf, len, "/sysroot%s", path);
+
+  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;
@@ -61,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;
 }