X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Finitrd.c;h=c1c7ce03aa744662361a3141e4f50031942844ec;hp=7b32a08a8c46d4adac82df18d62dc5bc427c5a26;hb=6bda071b5cd8393b37653687027c4ae6c6cf3804;hpb=a7b73d4a1e09f12b2002083618056f0c823c1dcf

diff --git a/daemon/initrd.c b/daemon/initrd.c
index 7b32a08..c1c7ce0 100644
--- a/daemon/initrd.c
+++ b/daemon/initrd.c
@@ -31,28 +31,23 @@ char **
 do_initrd_list (char *path)
 {
   FILE *fp;
-  int len;
   char *cmd;
   char filename[PATH_MAX];
   char **filenames = NULL;
   int size = 0, alloc = 0;
+  size_t len;
 
-  NEED_ROOT (NULL);
-  ABS_PATH (path, NULL);
+  NEED_ROOT (return NULL);
+  ABS_PATH (path, return NULL);
 
   /* "zcat /sysroot/<path> | cpio --quiet -it", but path must be quoted. */
-  len = 64 + 2 * strlen (path);
-  cmd = malloc (len);
-  if (!cmd) {
-    reply_with_perror ("malloc");
+  if (asprintf_nowarn (&cmd, "zcat %R | cpio --quiet -it", path) == -1) {
+    reply_with_perror ("asprintf");
     return NULL;
   }
 
-  strcpy (cmd, "zcat /sysroot");
-  shell_quote (cmd+13, len-13, path);
-  strcat (cmd, " | cpio --quiet -it");
-
-  fprintf (stderr, "%s\n", cmd);
+  if (verbose)
+    fprintf (stderr, "%s\n", cmd);
 
   fp = popen (cmd, "r");
   if (fp == NULL) {