X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fupload.c;h=da86bd65575dfe64fc0ffc61221aa773abca03f6;hp=5c1adaf65ba0b38593a81bc5068be93a68d40028;hb=ac2a53bbab44fe94306092b47aeddb899c55345a;hpb=fc266e5ab8c4f013d0e473029c5e0b4cd32cca92 diff --git a/daemon/upload.c b/daemon/upload.c index 5c1adaf..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]; - REQUIRE_ROOT_OR_RESOLVE_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; }