X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fupload.c;h=d93a5ade9b996a2ab05bb7bd83c0a797fb0a6ddc;hp=65c66675f2d9c0523bae63bab2fcc18b816d5c45;hb=00fae9fe88ca83dfc3ee0b1b7d8e27e644f6e9c7;hpb=07f4b20ae959069fca41756b0dc103ec5fa99754 diff --git a/daemon/upload.c b/daemon/upload.c index 65c6667..d93a5ad 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,13 +41,6 @@ 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); @@ -65,7 +58,7 @@ do_upload (const char *filename) err = errno; cancel_receive (); errno = err; - reply_with_perror ("write: %s", filename); + reply_with_error ("write error: %s", filename); close (fd); return -1; }