git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hivex: Various improvements in header parsing, thanks to better documentation.
[libguestfs.git]
/
daemon
/
upload.c
diff --git
a/daemon/upload.c
b/daemon/upload.c
index
0f737af
..
fdb8654
100644
(file)
--- a/
daemon/upload.c
+++ b/
daemon/upload.c
@@
-1,5
+1,5
@@
/* libguestfs - the guestfsd daemon
/* 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
*
* 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
/* Has one FileIn parameter. */
int
-do_upload (char *filename)
+do_upload (c
onst c
har *filename)
{
int err, fd, r, is_dev;
{
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 ();
if (!is_dev) {
if (!root_mounted || filename[0] != '/') {
cancel_receive ();
@@
-88,14
+88,12
@@
do_upload (char *filename)
/* Has one FileOut parameter. */
int
/* Has one FileOut parameter. */
int
-do_download (char *filename)
+do_download (c
onst c
har *filename)
{
int fd, r, is_dev;
char buf[GUESTFS_MAX_CHUNK_SIZE];
{
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);
if (!is_dev) CHROOT_IN;
fd = open (filename, O_RDONLY);
@@
-131,6
+129,8
@@
do_download (char *filename)
return -1;
}
return -1;
}
- send_file_end (0); /* Normal end of file. */
+ if (send_file_end (0)) /* Normal end of file. */
+ return -1;
+
return 0;
}
return 0;
}