git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated Spanish translations (RHBZ#584038).
[libguestfs.git]
/
daemon
/
tar.c
diff --git
a/daemon/tar.c
b/daemon/tar.c
index
9d21e79
..
26a0d30
100644
(file)
--- a/
daemon/tar.c
+++ b/
daemon/tar.c
@@
-28,26
+28,20
@@
#include "actions.h"
static int
#include "actions.h"
static int
-
fwrite_cb (void *fp_ptr, const void *buf, in
t len)
+
write_cb (void *fd_ptr, const void *buf, size_
t len)
{
{
-
FILE *fp = *(FILE **)fp
_ptr;
- return
fwrite (buf, len, 1, fp) == 1 ? 0 : -1
;
+
int fd = *(int *)fd
_ptr;
+ return
xwrite (fd, buf, len)
;
}
/* Has one FileIn parameter. */
int
}
/* Has one FileIn parameter. */
int
-do_tar_in (char *dir)
+do_tar_in (c
onst c
har *dir)
{
int err, r;
FILE *fp;
char *cmd;
{
int err, r;
FILE *fp;
char *cmd;
- if (!root_mounted || dir[0] != '/') {
- cancel_receive ();
- reply_with_error ("tar-in: root must be mounted and path must be absolute");
- return -1;
- }
-
/* "tar -C /sysroot%s -xf -" but we have to quote the dir. */
if (asprintf_nowarn (&cmd, "tar -C %R -xf -", dir) == -1) {
err = errno;
/* "tar -C /sysroot%s -xf -" but we have to quote the dir. */
if (asprintf_nowarn (&cmd, "tar -C %R -xf -", dir) == -1) {
err = errno;
@@
-71,12
+65,15
@@
do_tar_in (char *dir)
}
free (cmd);
}
free (cmd);
- r = receive_file (fwrite_cb, &fp);
+ /* The semantics of fwrite are too undefined, so write to the
+ * file descriptor directly instead.
+ */
+ int fd = fileno (fp);
+
+ r = receive_file (write_cb, &fd);
if (r == -1) { /* write error */
if (r == -1) { /* write error */
- err = errno;
cancel_receive ();
cancel_receive ();
- errno = err;
- reply_with_perror ("write: %s", dir);
+ reply_with_error ("write error on directory: %s", dir);
pclose (fp);
return -1;
}
pclose (fp);
return -1;
}
@@
-87,10
+84,9
@@
do_tar_in (char *dir)
}
if (pclose (fp) != 0) {
}
if (pclose (fp) != 0) {
- err = errno;
- cancel_receive ();
- errno = err;
- reply_with_perror ("pclose: %s", dir);
+ if (r == -1) /* if r == 0, file transfer ended already */
+ cancel_receive ();
+ reply_with_error ("tar subcommand failed on directory: %s", dir);
return -1;
}
return -1;
}
@@
-99,16
+95,13
@@
do_tar_in (char *dir)
/* Has one FileOut parameter. */
int
/* Has one FileOut parameter. */
int
-do_tar_out (char *dir)
+do_tar_out (c
onst c
har *dir)
{
int r;
FILE *fp;
char *cmd;
char buf[GUESTFS_MAX_CHUNK_SIZE];
{
int r;
FILE *fp;
char *cmd;
char buf[GUESTFS_MAX_CHUNK_SIZE];
- NEED_ROOT (return -1);
- ABS_PATH (dir, return -1);
-
/* "tar -C /sysroot%s -cf - ." but we have to quote the dir. */
if (asprintf_nowarn (&cmd, "tar -C %R -cf - .", dir) == -1) {
reply_with_perror ("asprintf");
/* "tar -C /sysroot%s -cf - ." but we have to quote the dir. */
if (asprintf_nowarn (&cmd, "tar -C %R -cf - .", dir) == -1) {
reply_with_perror ("asprintf");
@@
-152,26
+145,22
@@
do_tar_out (char *dir)
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;
}
/* Has one FileIn parameter. */
return 0;
}
/* Has one FileIn parameter. */
-int
-do_t
gz_in (char *di
r)
+
static
int
+do_t
Xz_in (const char *dir, char filte
r)
{
int err, r;
FILE *fp;
char *cmd;
{
int err, r;
FILE *fp;
char *cmd;
- if (!root_mounted || dir[0] != '/') {
- cancel_receive ();
- reply_with_error ("tar-in: root must be mounted and path must be absolute");
- return -1;
- }
-
/* "tar -C /sysroot%s -zxf -" but we have to quote the dir. */
/* "tar -C /sysroot%s -zxf -" but we have to quote the dir. */
- if (asprintf_nowarn (&cmd, "tar -C %R -
zxf -", di
r) == -1) {
+ if (asprintf_nowarn (&cmd, "tar -C %R -
%cxf -", dir, filte
r) == -1) {
err = errno;
cancel_receive ();
errno = err;
err = errno;
cancel_receive ();
errno = err;
@@
-193,12
+182,12
@@
do_tgz_in (char *dir)
}
free (cmd);
}
free (cmd);
- r = receive_file (fwrite_cb, &fp);
+ int fd = fileno (fp);
+
+ r = receive_file (write_cb, &fd);
if (r == -1) { /* write error */
if (r == -1) { /* write error */
- err = errno;
cancel_receive ();
cancel_receive ();
- errno = err;
- reply_with_perror ("write: %s", dir);
+ reply_with_error ("write error on directory: %s", dir);
pclose (fp);
return -1;
}
pclose (fp);
return -1;
}
@@
-209,30
+198,40
@@
do_tgz_in (char *dir)
}
if (pclose (fp) != 0) {
}
if (pclose (fp) != 0) {
- err = errno;
- cancel_receive ();
- errno = err;
- reply_with_perror ("pclose: %s", dir);
+ if (r == -1) /* if r == 0, file transfer ended already */
+ cancel_receive ();
+ reply_with_error ("tar subcommand failed on directory: %s", dir);
return -1;
}
return 0;
}
return -1;
}
return 0;
}
-/* Has one FileOut parameter. */
+/* Has one FileIn parameter. */
+int
+do_tgz_in (const char *dir)
+{
+ return do_tXz_in (dir, 'z');
+}
+
+/* Has one FileIn parameter. */
int
int
-do_tgz_out (char *dir)
+do_txz_in (const char *dir)
+{
+ return do_tXz_in (dir, 'J');
+}
+
+/* Has one FileOut parameter. */
+static int
+do_tXz_out (const char *dir, char filter)
{
int r;
FILE *fp;
char *cmd;
char buf[GUESTFS_MAX_CHUNK_SIZE];
{
int r;
FILE *fp;
char *cmd;
char buf[GUESTFS_MAX_CHUNK_SIZE];
- NEED_ROOT (return -1);
- ABS_PATH (dir, return -1);
-
/* "tar -C /sysroot%s -zcf - ." but we have to quote the dir. */
/* "tar -C /sysroot%s -zcf - ." but we have to quote the dir. */
- if (asprintf_nowarn (&cmd, "tar -C %R -
zcf - .", di
r) == -1) {
+ if (asprintf_nowarn (&cmd, "tar -C %R -
%ccf - .", dir, filte
r) == -1) {
reply_with_perror ("asprintf");
return -1;
}
reply_with_perror ("asprintf");
return -1;
}
@@
-274,6
+273,22
@@
do_tgz_out (char *dir)
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;
}
+
+/* Has one FileOut parameter. */
+int
+do_tgz_out (const char *dir)
+{
+ return do_tXz_out (dir, 'z');
+}
+
+/* Has one FileOut parameter. */
+int
+do_txz_out (const char *dir)
+{
+ return do_tXz_out (dir, 'J');
+}