mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace shell_quote function with %Q and %R printf specifiers.

Browse Source 
%Q => simple shell quoted string
%R => path will be prefixed by /sysroot

eg. snprintf (cmd, sizeof cmd, "cat %R", path); system (cmd);
This commit is contained in:
Richard Jones
2009-07-27 22:27:45 +01:00
parent bf920f5767
commit 0f2e9c84e9
9 changed files with 178 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
daemon/file.c
View File

@@ -440,6 +440,7 @@ char *
do_zfile (char *method, char *path)
{
int len;
const char *zcat;
char *cmd;
FILE *fp;
char line[256];
@@ -447,27 +448,22 @@ do_zfile (char *method, char *path)
NEED_ROOT (NULL);
ABS_PATH (path, NULL);
len = 2 * strlen (path) + sysroot_len + 64;
cmd = malloc (len);
if (!cmd) {
reply_with_perror ("malloc");
return NULL;
}
if (strcmp (method, "gzip") == 0 || strcmp (method, "compress") == 0)
strcpy (cmd, "zcat");
zcat = "zcat";
else if (strcmp (method, "bzip2") == 0)
strcpy (cmd, "bzcat");
zcat = "bzcat";
else {
free (cmd);
reply_with_error ("zfile: unknown method");
return NULL;
}
strcat (cmd, " ");
strcat (cmd, sysroot);
shell_quote (cmd + strlen (cmd), len - strlen (cmd), path);
strcat (cmd, " | file -bsL -");
if (asprintf_nowarn (&cmd, "%s %R | file -bsL -", zcat, path) == -1) {
reply_with_perror ("asprintf");
return NULL;
}
if (verbose)
fprintf (stderr, "%s\n", cmd);
fp = popen (cmd, "r");
if (fp == NULL) {