X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fcpmv.c;h=e5457d65835fcb51b567b29d21e1cd70cf06553a;hb=5a50c04906828f6e99db6a9be420c84114476d39;hp=1007203a439bbc3c0415c4e43ac677ac6b238d61;hpb=84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0;p=libguestfs.git

diff --git a/daemon/cpmv.c b/daemon/cpmv.c
index 1007203..e5457d6 100644
--- a/daemon/cpmv.c
+++ b/daemon/cpmv.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
@@ -52,10 +52,6 @@ cpmv_cmd (const char *cmd, const char *flags, const char *src, const char *dest)
   char *err;
   int r;
 
-  NEED_ROOT (return -1);
-  ABS_PATH (src, return -1);
-  ABS_PATH (dest, return -1);
-
   srcbuf = sysroot_path (src);
   if (srcbuf == NULL) {
     reply_with_perror ("malloc");
@@ -69,6 +65,8 @@ cpmv_cmd (const char *cmd, const char *flags, const char *src, const char *dest)
     return -1;
   }
 
+  pulse_mode_start ();
+
   if (flags)
     r = command (NULL, &err, cmd, flags, srcbuf, destbuf, NULL);
   else
@@ -78,11 +76,14 @@ cpmv_cmd (const char *cmd, const char *flags, const char *src, const char *dest)
   free (destbuf);
 
   if (r == -1) {
-    reply_with_error ("%s: %s", cmd, err);
+    pulse_mode_cancel ();
+    reply_with_error ("%s", err);
     free (err);
     return -1;
   }
   free (err);
 
+  pulse_mode_end ();
+
   return 0;
 }