git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
daemon: Fix wc* commands to work on absolute symbolic links (RHBZ#579608).
[libguestfs.git]
/
daemon
/
upload.c
diff --git
a/daemon/upload.c
b/daemon/upload.c
index
65c6667
..
d93a5ad
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);
@@
-41,13
+41,6
@@
do_upload (const char *filename)
int err, fd, r, is_dev;
is_dev = STRPREFIX (filename, "/dev/");
int err, fd, r, is_dev;
is_dev = STRPREFIX (filename, "/dev/");
- if (!is_dev) {
- if (!root_mounted || filename[0] != '/') {
- cancel_receive ();
- reply_with_error ("root must be mounted and path must be absolute");
- return -1;
- }
- }
if (!is_dev) CHROOT_IN;
fd = open (filename, O_WRONLY|O_CREAT|O_TRUNC|O_NOCTTY, 0666);
if (!is_dev) CHROOT_IN;
fd = open (filename, O_WRONLY|O_CREAT|O_TRUNC|O_NOCTTY, 0666);
@@
-65,7
+58,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;
}