git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't kill self accidentally.
[libguestfs.git]
/
daemon
/
upload.c
diff --git
a/daemon/upload.c
b/daemon/upload.c
index
e15eade
..
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);
@@
-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;