X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Ffind.c;h=950a0fcbc96752c99b5cf9f124ffa885bca24fa3;hp=85994b6dc4e4c8e73b8ecfdde7cebb2ebf75682a;hb=6bda071b5cd8393b37653687027c4ae6c6cf3804;hpb=a7b73d4a1e09f12b2002083618056f0c823c1dcf

diff --git a/daemon/find.c b/daemon/find.c
index 85994b6..950a0fc 100644
--- a/daemon/find.c
+++ b/daemon/find.c
@@ -56,40 +56,41 @@ do_find (char *dir)
   FILE *fp;
   char **res = NULL;
   int size = 0, alloc = 0;
-  char sysrootdir[PATH_MAX];
+  char *sysrootdir;
   char str[PATH_MAX];
 
-  NEED_ROOT (NULL);
-  ABS_PATH (dir, NULL);
+  NEED_ROOT (return NULL);
+  ABS_PATH (dir, return NULL);
 
-  snprintf (sysrootdir, sizeof sysrootdir, "/sysroot%s", dir);
+  sysrootdir = sysroot_path (dir);
+  if (!sysrootdir) {
+    reply_with_perror ("malloc");
+    return NULL;
+  }
 
   r = stat (sysrootdir, &statbuf);
   if (r == -1) {
     reply_with_perror ("%s", dir);
+    free (sysrootdir);
     return NULL;
   }
   if (!S_ISDIR (statbuf.st_mode)) {
     reply_with_error ("%s: not a directory", dir);
+    free (sysrootdir);
     return NULL;
   }
 
   sysrootdirlen = strlen (sysrootdir);
 
   /* Assemble the external find command. */
-  len = 2 * sysrootdirlen + 32;
-  cmd = malloc (len);
-  if (!cmd) {
+  if (asprintf_nowarn (&cmd, "find %Q -print0", sysrootdir) == -1) {
     reply_with_perror ("malloc");
+    free (sysrootdir);
     return NULL;
   }
 
-  strcpy (cmd, "find ");
-  shell_quote (cmd+5, len-5, sysrootdir);
-  strcat (cmd, " -print0");
-
   if (verbose)
-    printf ("%s\n", cmd);
+    fprintf (stderr, "%s\n", cmd);
 
   fp = popen (cmd, "r");
   if (fp == NULL) {