[Libguestfs] [PATCH 4/4] du: Add pulse mode progress messages.
Richard W.M. Jones
rjones at redhat.com
Fri Apr 1 15:09:22 UTC 2011
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
libguestfs lets you edit virtual machines. Supports shell scripting,
bindings from many languages. http://libguestfs.org
-------------- next part --------------
>From c1f7c0d03843c8cb41a012c691be6137002f5500 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones at redhat.com>
Date: Fri, 1 Apr 2011 16:03:14 +0100
Subject: [PATCH 4/4] du: Add pulse mode progress messages.
---
daemon/du.c | 8 +++++++-
generator/generator_actions.ml | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/daemon/du.c b/daemon/du.c
index 7cf2f4a..1c44b3b 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 a324d99..a10b7f7 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",
--
1.7.4.1
More information about the Libguestfs
mailing list