X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fupload.c;h=da86bd65575dfe64fc0ffc61221aa773abca03f6;hp=7815e2344161bccf9cbf2fc159c1d8d87165f606;hb=6a14f1c2502f58ff7bed8cb451f95a83f5ee920a;hpb=1997858e90da728287ef26a6d01a5766ac914312 diff --git a/daemon/upload.c b/daemon/upload.c index 7815e23..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, return -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; }