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 grep and related to work on absolute symbolic links (RHBZ#579608).
[libguestfs.git]
/
daemon
/
upload.c
diff --git
a/daemon/upload.c
b/daemon/upload.c
index
b457695
..
d93a5ad
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
@@
-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,9
+40,7
@@
do_upload (const char *filename)
{
int err, fd, r, is_dev;
{
int err, fd, r, is_dev;
- 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_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);
@@
-60,7
+58,8
@@
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;
}
if (r == -2) { /* cancellation from library */
return -1;
}
if (r == -2) { /* cancellation from library */
@@
-71,7
+70,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;
@@
-87,9
+87,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];
- 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);
@@
-106,13
+104,16
@@
do_download (const char *filename)
reply (NULL, NULL);
while ((r = read (fd, buf, sizeof buf)) > 0) {
reply (NULL, NULL);
while ((r = read (fd, buf, sizeof buf)) > 0) {
- if (send_file_write (buf, r) < 0)
+ if (send_file_write (buf, r) < 0) {
+ close (fd);
return -1;
return -1;
+ }
}
if (r == -1) {
perror (filename);
send_file_end (1); /* Cancel. */
}
if (r == -1) {
perror (filename);
send_file_end (1); /* Cancel. */
+ close (fd);
return -1;
}
return -1;
}
@@
-122,6
+123,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;
}