X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Ftar.c;h=74d7b056697847e8e9cba3d6e6d555fa0106fe04;hb=995674a44aa00b3c68d47d367a8e92b610ffc700;hp=2ddde88a51e06a812b3e139b7dd667ae61338596;hpb=363978fa7fc055da380d31103c7de378a08b71fb;p=libguestfs.git

diff --git a/daemon/tar.c b/daemon/tar.c
index 2ddde88..74d7b05 100644
--- a/daemon/tar.c
+++ b/daemon/tar.c
@@ -85,7 +85,7 @@ do_tXz_in (const char *dir, const char *filter)
     err = errno;
     r = cancel_receive ();
     errno = err;
-    if (r != -2) reply_with_perror ("asprintf");
+    reply_with_perror ("asprintf");
     return -1;
   }
 
@@ -97,7 +97,7 @@ do_tXz_in (const char *dir, const char *filter)
     err = errno;
     r = cancel_receive ();
     errno = err;
-    if (r != -2) reply_with_perror ("%s", cmd);
+    reply_with_perror ("%s", cmd);
     free (cmd);
     return -1;
   }
@@ -110,29 +110,27 @@ do_tXz_in (const char *dir, const char *filter)
 
   r = receive_file (write_cb, &fd);
   if (r == -1) {		/* write error */
-    if (cancel_receive () != -2) {
-      char *errstr = read_error_file ();
-      reply_with_error ("write error on directory: %s: %s", dir, errstr);
-      free (errstr);
-    }
+    cancel_receive ();
+    char *errstr = read_error_file ();
+    reply_with_error ("write error on directory: %s: %s", dir, errstr);
+    free (errstr);
     pclose (fp);
     return -1;
   }
   if (r == -2) {		/* cancellation from library */
+    /* This error is ignored by the library since it initiated the
+     * cancel.  Nevertheless we must send an error reply here.
+     */
+    reply_with_error ("file upload cancelled");
     pclose (fp);
-    /* Do NOT send any error. */
     return -1;
   }
 
   if (pclose (fp) != 0) {
-    if (r == -1)                /* if r == 0, file transfer ended already */
-      r = cancel_receive ();
-    if (r != -2) {
-      char *errstr = read_error_file ();
-      reply_with_error ("tar subcommand failed on directory: %s: %s",
-                        dir, errstr);
-      free (errstr);
-    }
+    char *errstr = read_error_file ();
+    reply_with_error ("tar subcommand failed on directory: %s: %s",
+                      dir, errstr);
+    free (errstr);
     return -1;
   }