X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fupload.c;h=e15eadefd70db50cf7046dc0493afaa7c56011ab;hb=1ea1e536346f59fa63fdd33639ffc297282bfc37;hp=41b1bf2dd5430af766ced4b723ff790dd86608b0;hpb=feb188d27787c595f12507ce5bff5431c4932523;p=libguestfs.git diff --git a/daemon/upload.c b/daemon/upload.c index 41b1bf2..e15eade 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 @@ -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]; - NEED_ROOT_OR_IS_DEVICE (filename, -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; }