Update FSF address.

[libguestfs.git] / daemon / cpmv.c

diff --git a/daemon/cpmv.c b/daemon/cpmv.c
index 5448a97..b51ed41 100644 (file)
--- 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
@@ -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>
@@ -28,19 +28,19 @@
 static int cpmv_cmd (const char *cmd, const char *flags, const char *src, const char *dest);
 
 int
-do_cp (char *src, char *dest)
+do_cp (const char *src, const char *dest)
 {
   return cpmv_cmd ("cp", NULL, src, dest);
 }
 
 int
-do_cp_a (char *src, char *dest)
+do_cp_a (const char *src, const char *dest)
 {
   return cpmv_cmd ("cp", "-a", src, dest);
 }
 
 int
-do_mv (char *src, char *dest)
+do_mv (const char *src, const char *dest)
 {
   return cpmv_cmd ("mv", NULL, src, dest);
 }
@@ -49,31 +49,23 @@ static int
 cpmv_cmd (const char *cmd, const char *flags, const char *src, const char *dest)
 {
   char *srcbuf, *destbuf;
-  int srclen, destlen;
   char *err;
   int r;
 
-  NEED_ROOT (-1);
-  ABS_PATH (src, -1);
-  ABS_PATH (dest, -1);
-
-  srclen = strlen (src) + 32;
-  srcbuf = malloc (srclen);
+  srcbuf = sysroot_path (src);
   if (srcbuf == NULL) {
     reply_with_perror ("malloc");
     return -1;
   }
 
-  destlen = strlen (dest) + 32;
-  destbuf = malloc (destlen);
+  destbuf = sysroot_path (dest);
   if (destbuf == NULL) {
     reply_with_perror ("malloc");
     free (srcbuf);
     return -1;
   }
 
-  snprintf (srcbuf, srclen, "/sysroot%s", src);
-  snprintf (destbuf, destlen, "/sysroot%s", dest);
+  pulse_mode_start ();
 
   if (flags)
     r = command (NULL, &err, cmd, flags, srcbuf, destbuf, NULL);
@@ -84,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;
 }