git.annexia.org
/
libguestfs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4a64a5a
)
cpmv: Add pulse mode progress messages.
author
Richard W.M. Jones
<rjones@redhat.com>
Fri, 1 Apr 2011 17:37:29 +0000
(18:37 +0100)
committer
Richard W.M. Jones
<rjones@redhat.com>
Fri, 1 Apr 2011 17:37:48 +0000
(18:37 +0100)
daemon/cpmv.c
patch
|
blob
|
history
diff --git
a/daemon/cpmv.c
b/daemon/cpmv.c
index
587e017
..
e5457d6
100644
(file)
--- a/
daemon/cpmv.c
+++ b/
daemon/cpmv.c
@@
-1,5
+1,5
@@
/* libguestfs - the guestfsd daemon
/* 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
*
* 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
@@
-65,6
+65,8
@@
cpmv_cmd (const char *cmd, const char *flags, const char *src, const char *dest)
return -1;
}
return -1;
}
+ pulse_mode_start ();
+
if (flags)
r = command (NULL, &err, cmd, flags, srcbuf, destbuf, NULL);
else
if (flags)
r = command (NULL, &err, cmd, flags, srcbuf, destbuf, NULL);
else
@@
-74,11
+76,14
@@
cpmv_cmd (const char *cmd, const char *flags, const char *src, const char *dest)
free (destbuf);
if (r == -1) {
free (destbuf);
if (r == -1) {
+ pulse_mode_cancel ();
reply_with_error ("%s", err);
free (err);
return -1;
}
free (err);
reply_with_error ("%s", err);
free (err);
return -1;
}
free (err);
+ pulse_mode_end ();
+
return 0;
}
return 0;
}