X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fupload.c;h=9a6c873129f4dd4ec8bacdb9e9200f432b5bbe52;hp=65c66675f2d9c0523bae63bab2fcc18b816d5c45;hb=41512f498b5f85a941ad165361b01135511fdd23;hpb=07f4b20ae959069fca41756b0dc103ec5fa99754

diff --git a/daemon/upload.c b/daemon/upload.c
index 65c6667..9a6c873 100644
--- a/daemon/upload.c
+++ b/daemon/upload.c
@@ -28,7 +28,7 @@
 #include "actions.h"
 
 static int
-write_cb (void *fd_ptr, const void *buf, int len)
+write_cb (void *fd_ptr, const void *buf, size_t len)
 {
   int fd = *(int *)fd_ptr;
   return xwrite (fd, buf, len);
@@ -41,31 +41,24 @@ do_upload (const char *filename)
   int err, fd, r, is_dev;
 
   is_dev = STRPREFIX (filename, "/dev/");
-  if (!is_dev) {
-    if (!root_mounted || filename[0] != '/') {
-      cancel_receive ();
-      reply_with_error ("root must be mounted and path must be absolute");
-      return -1;
-    }
-  }
 
   if (!is_dev) CHROOT_IN;
   fd = open (filename, O_WRONLY|O_CREAT|O_TRUNC|O_NOCTTY, 0666);
   if (!is_dev) CHROOT_OUT;
   if (fd == -1) {
     err = errno;
-    cancel_receive ();
+    r = cancel_receive ();
     errno = err;
-    reply_with_perror ("%s", filename);
+    if (r != -2) reply_with_perror ("%s", filename);
     return -1;
   }
 
   r = receive_file (write_cb, &fd);
   if (r == -1) {		/* write error */
     err = errno;
-    cancel_receive ();
+    r = cancel_receive ();
     errno = err;
-    reply_with_perror ("write: %s", filename);
+    if (r != -2) reply_with_error ("write error: %s", filename);
     close (fd);
     return -1;
   }
@@ -78,9 +71,10 @@ do_upload (const char *filename)
   if (close (fd) == -1) {
     err = errno;
     if (r == -1)                /* if r == 0, file transfer ended already */
-      cancel_receive ();
+      r = cancel_receive ();
     errno = err;
-    reply_with_perror ("close: %s", filename);
+    if (r != -2)
+      reply_with_perror ("close: %s", filename);
     return -1;
   }