Version 1.13.26.

[libguestfs.git] / daemon / upload.c

diff --git a/daemon/upload.c b/daemon/upload.c
index f8d312f..a1a37ae 100644 (file)
--- a/daemon/upload.c
+++ b/daemon/upload.c
@@ -94,16 +94,15 @@ upload (const char *filename, int flags, int64_t offset)
     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");
     close (data.fd);
-    /* Do NOT send any error. */
     return -1;
   }
 
   if (close (data.fd) == -1) {
-    err = errno;
-    if (r == -1)                /* if r == 0, file transfer ended already */
-      r = cancel_receive ();
-    errno = err;
     reply_with_perror ("close: %s", filename);
     return -1;
   }