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
ecf919d
..
26a0d30
100644
(file)
--- a/
daemon/tar.c
+++ b/
daemon/tar.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,39
+28,31
@@
#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
do_tar_in (const char *dir)
{
}
/* Has one FileIn parameter. */
int
do_tar_in (const char *dir)
{
- int err, r
, len
;
+ int err, r;
FILE *fp;
char *cmd;
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. */
/* "tar -C /sysroot%s -xf -" but we have to quote the dir. */
- len = 2 * strlen (dir) + 32;
- cmd = malloc (len);
- if (!cmd) {
+ if (asprintf_nowarn (&cmd, "tar -C %R -xf -", dir) == -1) {
err = errno;
cancel_receive ();
errno = err;
err = errno;
cancel_receive ();
errno = err;
- reply_with_perror ("
malloc
");
+ reply_with_perror ("
asprintf
");
return -1;
}
return -1;
}
- strcpy (cmd, "tar -C /sysroot");
- shell_quote (cmd+15, len-15, dir);
-
strcat (cmd, " -xf -"
);
+
+ if (verbose)
+
fprintf (stderr, "%s\n", cmd
);
fp = popen (cmd, "w");
if (fp == NULL) {
fp = popen (cmd, "w");
if (fp == NULL) {
@@
-68,15
+60,20
@@
do_tar_in (const char *dir)
cancel_receive ();
errno = err;
reply_with_perror ("%s", cmd);
cancel_receive ();
errno = err;
reply_with_perror ("%s", cmd);
+ free (cmd);
return -1;
}
return -1;
}
+ free (cmd);
+
+ /* The semantics of fwrite are too undefined, so write to the
+ * file descriptor directly instead.
+ */
+ int fd = fileno (fp);
- r = receive_file (
fwrite_cb, &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;
}
@@
-86,11
+83,10
@@
do_tar_in (const char *dir)
return -1;
}
return -1;
}
- if (pclose (fp) == -1) {
- err = errno;
- cancel_receive ();
- errno = err;
- reply_with_perror ("pclose: %s", dir);
+ if (pclose (fp) != 0) {
+ 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;
}
@@
-101,30
+97,27
@@
do_tar_in (const char *dir)
int
do_tar_out (const char *dir)
{
int
do_tar_out (const char *dir)
{
- int r
, len
;
+ int r;
FILE *fp;
char *cmd;
char buf[GUESTFS_MAX_CHUNK_SIZE];
FILE *fp;
char *cmd;
char buf[GUESTFS_MAX_CHUNK_SIZE];
- NEED_ROOT (-1);
- ABS_PATH (dir, -1);
-
/* "tar -C /sysroot%s -cf - ." but we have to quote the dir. */
/* "tar -C /sysroot%s -cf - ." but we have to quote the dir. */
- len = 2 * strlen (dir) + 32;
- cmd = malloc (len);
- if (!cmd) {
- reply_with_perror ("malloc");
+ if (asprintf_nowarn (&cmd, "tar -C %R -cf - .", dir) == -1) {
+ reply_with_perror ("asprintf");
return -1;
}
return -1;
}
- strcpy (cmd, "tar -C /sysroot");
- shell_quote (cmd+15, len-15, dir);
-
strcat (cmd, " -cf - ."
);
+
+ if (verbose)
+
fprintf (stderr, "%s\n", cmd
);
fp = popen (cmd, "r");
if (fp == NULL) {
reply_with_perror ("%s", cmd);
fp = popen (cmd, "r");
if (fp == NULL) {
reply_with_perror ("%s", cmd);
+ free (cmd);
return -1;
}
return -1;
}
+ free (cmd);
/* Now we must send the reply message, before the file contents. After
* this there is no opportunity in the protocol to send any error
/* Now we must send the reply message, before the file contents. After
* this there is no opportunity in the protocol to send any error
@@
-139,50
+132,44
@@
do_tar_out (const char *dir)
}
}
}
}
- if (
r == -1
) {
+ if (
ferror (fp)
) {
perror (dir);
send_file_end (1); /* Cancel. */
pclose (fp);
return -1;
}
perror (dir);
send_file_end (1); /* Cancel. */
pclose (fp);
return -1;
}
- if (pclose (fp)
== -1
) {
+ if (pclose (fp)
!= 0
) {
perror (dir);
send_file_end (1); /* Cancel. */
return -1;
}
perror (dir);
send_file_end (1); /* Cancel. */
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 (const char *di
r)
+
static
int
+do_t
Xz_in (const char *dir, char filte
r)
{
{
- int err, r
, len
;
+ int err, r;
FILE *fp;
char *cmd;
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. */
- len = 2 * strlen (dir) + 32;
- cmd = malloc (len);
- if (!cmd) {
+ if (asprintf_nowarn (&cmd, "tar -C %R -%cxf -", dir, filter) == -1) {
err = errno;
cancel_receive ();
errno = err;
err = errno;
cancel_receive ();
errno = err;
- reply_with_perror ("
malloc
");
+ reply_with_perror ("
asprintf
");
return -1;
}
return -1;
}
- strcpy (cmd, "tar -C /sysroot");
- shell_quote (cmd+15, len-15, dir);
-
strcat (cmd, " -zxf -"
);
+
+ if (verbose)
+
fprintf (stderr, "%s\n", cmd
);
fp = popen (cmd, "w");
if (fp == NULL) {
fp = popen (cmd, "w");
if (fp == NULL) {
@@
-190,15
+177,17
@@
do_tgz_in (const char *dir)
cancel_receive ();
errno = err;
reply_with_perror ("%s", cmd);
cancel_receive ();
errno = err;
reply_with_perror ("%s", cmd);
+ free (cmd);
return -1;
}
return -1;
}
+ free (cmd);
+
+ int fd = fileno (fp);
- r = receive_file (
fwrite_cb, &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;
}
@@
-208,45
+197,55
@@
do_tgz_in (const char *dir)
return -1;
}
return -1;
}
- if (pclose (fp) == -1) {
- err = errno;
- cancel_receive ();
- errno = err;
- reply_with_perror ("pclose: %s", dir);
+ if (pclose (fp) != 0) {
+ 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 File
Out
parameter. */
+/* Has one File
In
parameter. */
int
int
-do_tgz_
out
(const char *dir)
+do_tgz_
in
(const char *dir)
{
{
- int r, len;
+ return do_tXz_in (dir, 'z');
+}
+
+/* Has one FileIn parameter. */
+int
+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];
FILE *fp;
char *cmd;
char buf[GUESTFS_MAX_CHUNK_SIZE];
- NEED_ROOT (-1);
- ABS_PATH (dir, -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. */
- len = 2 * strlen (dir) + 32;
- cmd = malloc (len);
- if (!cmd) {
- reply_with_perror ("malloc");
+ if (asprintf_nowarn (&cmd, "tar -C %R -%ccf - .", dir, filter) == -1) {
+ reply_with_perror ("asprintf");
return -1;
}
return -1;
}
- strcpy (cmd, "tar -C /sysroot");
- shell_quote (cmd+15, len-15, dir);
-
strcat (cmd, " -zcf - ."
);
+
+ if (verbose)
+
fprintf (stderr, "%s\n", cmd
);
fp = popen (cmd, "r");
if (fp == NULL) {
reply_with_perror ("%s", cmd);
fp = popen (cmd, "r");
if (fp == NULL) {
reply_with_perror ("%s", cmd);
+ free (cmd);
return -1;
}
return -1;
}
+ free (cmd);
/* Now we must send the reply message, before the file contents. After
* this there is no opportunity in the protocol to send any error
/* Now we must send the reply message, before the file contents. After
* this there is no opportunity in the protocol to send any error
@@
-261,19
+260,35
@@
do_tgz_out (const char *dir)
}
}
}
}
- if (
r == -1
) {
+ if (
ferror (fp)
) {
perror (dir);
send_file_end (1); /* Cancel. */
pclose (fp);
return -1;
}
perror (dir);
send_file_end (1); /* Cancel. */
pclose (fp);
return -1;
}
- if (pclose (fp)
== -1
) {
+ if (pclose (fp)
!= 0
) {
perror (dir);
send_file_end (1); /* Cancel. */
return -1;
}
perror (dir);
send_file_end (1); /* Cancel. */
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');
+}