X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fupload.c;h=7b2ccea55241fbcaffdb8e08b51d7a71989e3f0a;hb=09d7b265e6a0b78592b0a8cc78d9382fd5cb680b;hp=0f737af2e06b70bf7b27373130fdf8585510e2be;hpb=56bef498f46ac3dd580f4bde3c8f3ed2fe688826;p=libguestfs.git

diff --git a/daemon/upload.c b/daemon/upload.c
index 0f737af..7b2ccea 100644
--- a/daemon/upload.c
+++ b/daemon/upload.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc. 
+ * Copyright (C) 2009 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,11 +36,11 @@ 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;
 
-  is_dev = strncmp (filename, "/dev/", 5) == 0;
+  is_dev = STREQLEN (filename, "/dev/", 5);
   if (!is_dev) {
     if (!root_mounted || filename[0] != '/') {
       cancel_receive ();
@@ -88,14 +88,12 @@ 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;
+  is_dev = STREQLEN (filename, "/dev/", 5);
 
   if (!is_dev) CHROOT_IN;
   fd = open (filename, O_RDONLY);
@@ -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;
 }