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 lvresize test on RHEL 5, by fixing guestfs_e2fsck_l.
[libguestfs.git]
/
daemon
/
tar.c
diff --git
a/daemon/tar.c
b/daemon/tar.c
index
3008574
..
ebcaded
100644
(file)
--- a/
daemon/tar.c
+++ b/
daemon/tar.c
@@
-36,32
+36,29
@@
fwrite_cb (void *fp_ptr, const void *buf, int 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
, len
;
+ int err, r;
FILE *fp;
char *cmd;
if (!root_mounted || dir[0] != '/') {
cancel_receive ();
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");
+ reply_with_error ("root must be mounted and path must be absolute");
return -1;
}
/* "tar -C /sysroot%s -xf -" but we have to quote the dir. */
return -1;
}
/* "tar -C /sysroot%s -xf -" but we have to quote the dir. */
- len = 2 * strlen (dir) + sysroot_len + 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 ");
- strcat (cmd, 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) {
@@
-102,27
+99,21
@@
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
, 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) + sysroot_len + 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 ");
- strcat (cmd, 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) {
fp = popen (cmd, "r");
if (fp == NULL) {
@@
-158,38
+149,37
@@
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. */
int
return 0;
}
/* Has one FileIn parameter. */
int
-do_tgz_in (char *dir)
+do_tgz_in (c
onst c
har *dir)
{
{
- int err, r
, len
;
+ int err, r;
FILE *fp;
char *cmd;
if (!root_mounted || dir[0] != '/') {
cancel_receive ();
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");
+ reply_with_error ("root must be mounted and path must be absolute");
return -1;
}
/* "tar -C /sysroot%s -zxf -" but we have to quote the dir. */
return -1;
}
/* "tar -C /sysroot%s -zxf -" but we have to quote the dir. */
- len = 2 * strlen (dir) + sysroot_len + 32;
- cmd = malloc (len);
- if (!cmd) {
+ if (asprintf_nowarn (&cmd, "tar -C %R -zxf -", 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 ");
- strcat (cmd, 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) {
@@
-230,27
+220,21
@@
do_tgz_in (char *dir)
/* Has one FileOut parameter. */
int
/* Has one FileOut parameter. */
int
-do_tgz_out (char *dir)
+do_tgz_out (c
onst c
har *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 -zcf - ." but we have to quote the dir. */
/* "tar -C /sysroot%s -zcf - ." but we have to quote the dir. */
- len = 2 * strlen (dir) + sysroot_len + 32;
- cmd = malloc (len);
- if (!cmd) {
- reply_with_perror ("malloc");
+ if (asprintf_nowarn (&cmd, "tar -C %R -zcf - .", dir) == -1) {
+ reply_with_perror ("asprintf");
return -1;
}
return -1;
}
- strcpy (cmd, "tar -C ");
- strcat (cmd, 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) {
fp = popen (cmd, "r");
if (fp == NULL) {
@@
-286,6
+270,8
@@
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;
}