diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2011-04-01 16:03:14 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-04-01 18:37:49 +0100 |
| commit | 9b60f3a9f3b38c085e9265e56ddb839dabe6e416 (patch) | |
| tree | 82d16d7f38d0e7c3c270864125bc8e34f5b9c7ec | |
| parent | e9feff6f4ca75a7c457927c93ae7f719694b86c7 (diff) | |
| download | libguestfs-9b60f3a9f3b38c085e9265e56ddb839dabe6e416.tar.gz libguestfs-9b60f3a9f3b38c085e9265e56ddb839dabe6e416.tar.xz libguestfs-9b60f3a9f3b38c085e9265e56ddb839dabe6e416.zip | |
du: Add pulse mode progress messages.
| -rw-r--r-- | daemon/du.c | 8 | ||||
| -rw-r--r-- | generator/generator_actions.ml | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/daemon/du.c b/daemon/du.c index 7cf2f4a6..1c44b3bd 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 @@ -43,9 +43,12 @@ do_du (const char *path) return -1; } + pulse_mode_start (); + r = command (&out, &err, "du", "-s", buf, NULL); free (buf); if (r == -1) { + pulse_mode_cancel (); reply_with_error ("%s: %s", path, err); free (out); free (err); @@ -55,6 +58,7 @@ do_du (const char *path) free (err); if (sscanf (out, "%"SCNi64, &rv) != 1) { + pulse_mode_cancel (); reply_with_error ("%s: could not read output: %s", path, out); free (out); return -1; @@ -62,5 +66,7 @@ do_du (const char *path) free (out); + pulse_mode_end (); + return rv; } diff --git a/generator/generator_actions.ml b/generator/generator_actions.ml index a324d997..a10b7f74 100644 --- a/generator/generator_actions.ml +++ b/generator/generator_actions.ml @@ -3577,7 +3577,7 @@ This command is mostly useful for interactive sessions. It is I<not> intended that you try to parse the output string. Use C<guestfs_statvfs> from programs."); - ("du", (RInt64 "sizekb", [Pathname "path"], []), 127, [], + ("du", (RInt64 "sizekb", [Pathname "path"], []), 127, [Progress], [InitISOFS, Always, TestOutputInt ( [["du"; "/directory"]], 2 (* ISO fs blocksize is 2K *))], "estimate file space usage", |