git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix tar-in command hangs when running out of disk space (RHBZ#580246).
[libguestfs.git]
/
daemon
/
tar.c
diff --git
a/daemon/tar.c
b/daemon/tar.c
index
c3bdcf7
..
bb0e483
100644
(file)
--- a/
daemon/tar.c
+++ b/
daemon/tar.c
@@
-44,7
+44,7
@@
do_tar_in (const char *dir)
if (!root_mounted || dir[0] != '/') {
cancel_receive ();
if (!root_mounted || dir[0] != '/') {
cancel_receive ();
- reply_with_error ("
tar-in:
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;
}
@@
-88,7
+88,8
@@
do_tar_in (const char *dir)
if (pclose (fp) != 0) {
err = errno;
if (pclose (fp) != 0) {
err = errno;
- cancel_receive ();
+ if (r == -1) /* if r == 0, file transfer ended already */
+ cancel_receive ();
errno = err;
reply_with_perror ("pclose: %s", dir);
return -1;
errno = err;
reply_with_perror ("pclose: %s", dir);
return -1;
@@
-165,7
+166,7
@@
do_tgz_in (const char *dir)
if (!root_mounted || dir[0] != '/') {
cancel_receive ();
if (!root_mounted || dir[0] != '/') {
cancel_receive ();
- reply_with_error ("
tar-in:
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;
}
@@
-209,7
+210,8
@@
do_tgz_in (const char *dir)
if (pclose (fp) != 0) {
err = errno;
if (pclose (fp) != 0) {
err = errno;
- cancel_receive ();
+ if (r == -1) /* if r == 0, file transfer ended already */
+ cancel_receive ();
errno = err;
reply_with_perror ("pclose: %s", dir);
return -1;
errno = err;
reply_with_perror ("pclose: %s", dir);
return -1;