X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fcpmv.c;h=b51ed419a9e96d8a27b7f418ea67217af2345789;hb=d81c0829ea4a99aadb98df37be9543a973269041;hp=47b8aa2797cb8de2b97a037e29d6d32d9dfdf4e3;hpb=80c479162db74c461d671128237975aecc982a5e;p=libguestfs.git diff --git a/daemon/cpmv.c b/daemon/cpmv.c index 47b8aa2..b51ed41 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 @@ -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 @@ -65,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 @@ -74,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; }