git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
supermin: Ignore more unreadable files found on RHEL 6.
[libguestfs.git]
/
daemon
/
tar.c
diff --git
a/daemon/tar.c
b/daemon/tar.c
index
9f4813c
..
c3bdcf7
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
@@
-38,7
+38,7
@@
fwrite_cb (void *fp_ptr, const void *buf, int len)
int
do_tar_in (const char *dir)
{
int
do_tar_in (const char *dir)
{
- int err, r
, len
;
+ int err, r;
FILE *fp;
char *cmd;
FILE *fp;
char *cmd;
@@
-49,18
+49,16
@@
do_tar_in (const char *dir)
}
/* "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) {
@@
-88,7
+86,7
@@
do_tar_in (const char *dir)
return -1;
}
return -1;
}
- if (pclose (fp)
== -1
) {
+ if (pclose (fp)
!= 0
) {
err = errno;
cancel_receive ();
errno = err;
err = errno;
cancel_receive ();
errno = err;
@@
-103,24
+101,19
@@
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) {
fp = popen (cmd, "r");
if (fp == NULL) {
@@
-150,13
+143,15
@@
do_tar_out (const char *dir)
return -1;
}
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;
}
@@
-164,7
+159,7
@@
do_tar_out (const char *dir)
int
do_tgz_in (const char *dir)
{
int
do_tgz_in (const char *dir)
{
- int err, r
, len
;
+ int err, r;
FILE *fp;
char *cmd;
FILE *fp;
char *cmd;
@@
-175,18
+170,16
@@
do_tgz_in (const char *dir)
}
/* "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 -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 /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) {
@@
-214,7
+207,7
@@
do_tgz_in (const char *dir)
return -1;
}
return -1;
}
- if (pclose (fp)
== -1
) {
+ if (pclose (fp)
!= 0
) {
err = errno;
cancel_receive ();
errno = err;
err = errno;
cancel_receive ();
errno = err;
@@
-229,24
+222,19
@@
do_tgz_in (const char *dir)
int
do_tgz_out (const char *dir)
{
int
do_tgz_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 -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 -zcf - .", dir) == -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) {
fp = popen (cmd, "r");
if (fp == NULL) {
@@
-276,12
+264,14
@@
do_tgz_out (const char *dir)
return -1;
}
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;
}