X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=daemon%2Fupload.c;h=e15eadefd70db50cf7046dc0493afaa7c56011ab;hb=699f38f05f2545a2c188370500df17cc52cbdf98;hp=aede24a5a3a64a896cc7dda764fadd625c14862a;hpb=84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0;p=libguestfs.git

diff --git a/daemon/upload.c b/daemon/upload.c
index aede24a..e15eade 100644
--- a/daemon/upload.c
+++ b/daemon/upload.c
@@ -40,11 +40,11 @@ do_upload (const char *filename)
 {
   int err, fd, r, is_dev;
 
-  is_dev = strncmp (filename, "/dev/", 5) == 0;
+  is_dev = STRPREFIX (filename, "/dev/");
   if (!is_dev) {
     if (!root_mounted || filename[0] != '/') {
       cancel_receive ();
-      reply_with_error ("upload: root must be mounted and path must be absolute");
+      reply_with_error ("root must be mounted and path must be absolute");
       return -1;
     }
   }
@@ -93,9 +93,7 @@ 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;
+  is_dev = STRPREFIX (filename, "/dev/");
 
   if (!is_dev) CHROOT_IN;
   fd = open (filename, O_RDONLY);
@@ -131,6 +129,8 @@ do_download (const 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;
 }