git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clarify sparse behaviour of truncate-size command.
[libguestfs.git]
/
daemon
/
upload.c
diff --git
a/daemon/upload.c
b/daemon/upload.c
index
aede24a
..
3c20d6f
100644
(file)
--- a/
daemon/upload.c
+++ b/
daemon/upload.c
@@
-28,7
+28,7
@@
#include "actions.h"
static int
#include "actions.h"
static int
-write_cb (void *fd_ptr, const void *buf,
in
t len)
+write_cb (void *fd_ptr, const void *buf,
size_
t len)
{
int fd = *(int *)fd_ptr;
return xwrite (fd, buf, len);
{
int fd = *(int *)fd_ptr;
return xwrite (fd, buf, len);
@@
-40,11
+40,11
@@
do_upload (const char *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 ();
- 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;
}
}
return -1;
}
}
@@
-65,7
+65,7
@@
do_upload (const char *filename)
err = errno;
cancel_receive ();
errno = err;
err = errno;
cancel_receive ();
errno = err;
- reply_with_
perror ("write
: %s", filename);
+ reply_with_
error ("write error
: %s", filename);
close (fd);
return -1;
}
close (fd);
return -1;
}
@@
-77,7
+77,8
@@
do_upload (const char *filename)
if (close (fd) == -1) {
err = errno;
if (close (fd) == -1) {
err = errno;
- cancel_receive ();
+ if (r == -1) /* if r == 0, file transfer ended already */
+ cancel_receive ();
errno = err;
reply_with_perror ("close: %s", filename);
return -1;
errno = err;
reply_with_perror ("close: %s", filename);
return -1;
@@
-93,9
+94,7
@@
do_download (const char *filename)
int fd, r, is_dev;
char buf[GUESTFS_MAX_CHUNK_SIZE];
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);
if (!is_dev) CHROOT_IN;
fd = open (filename, O_RDONLY);
@@
-131,6
+130,8
@@
do_download (const 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;
}