X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fupload.c;h=da86bd65575dfe64fc0ffc61221aa773abca03f6;hb=a3dfe9398c9f629d013a82c1ba8014b500462f7d;hp=6c5f6dc400913df340a0e9ad4e29329ff4517a8c;hpb=a7b73d4a1e09f12b2002083618056f0c823c1dcf;p=libguestfs.git diff --git a/daemon/upload.c b/daemon/upload.c index 6c5f6dc..da86bd6 100644 --- a/daemon/upload.c +++ b/daemon/upload.c @@ -36,7 +36,7 @@ write_cb (void *fd_ptr, const void *buf, int len) /* Has one FileIn parameter. */ int -do_upload (char *filename) +do_upload (const char *filename) { int err, fd, r, is_dev; @@ -88,13 +88,11 @@ do_upload (char *filename) /* Has one FileOut parameter. */ int -do_download (char *filename) +do_download (const char *filename) { int fd, r, is_dev; char buf[GUESTFS_MAX_CHUNK_SIZE]; - NEED_ROOT_OR_IS_DEVICE (filename, -1); - is_dev = strncmp (filename, "/dev/", 5) == 0; if (!is_dev) CHROOT_IN; @@ -131,6 +129,8 @@ do_download (char *filename) return -1; } - send_file_end (0); /* Normal end of file. */ + if (send_file_end (0)) /* Normal end of file. */ + return -1; + return 0; }