X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Ffind.c;h=626017d17515da8706b885e9829483795e728cb9;hp=d8829530827d2d05846cc983a1db72233cc12111;hb=e44cf42f362d793c47d892a18a6853d88abd6ecb;hpb=78029b529ad98769685d607230b70f71832d5906

diff --git a/daemon/find.c b/daemon/find.c
index d882953..626017d 100644
--- a/daemon/find.c
+++ b/daemon/find.c
@@ -23,9 +23,10 @@
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <sys/stat.h>
 
-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"
 
@@ -48,7 +49,7 @@ input_to_nul (FILE *fp, char *buf, int maxlen)
 }
 
 char **
-do_find (char *dir)
+do_find (const char *dir)
 {
   struct stat statbuf;
   int r, len, sysrootdirlen;
@@ -59,9 +60,6 @@ do_find (char *dir)
   char *sysrootdir;
   char str[PATH_MAX];
 
-  NEED_ROOT (NULL);
-  ABS_PATH (dir, NULL);
-
   sysrootdir = sysroot_path (dir);
   if (!sysrootdir) {
     reply_with_perror ("malloc");
@@ -83,21 +81,15 @@ do_find (char *dir)
   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);
   free (sysrootdir);
-  strcat (cmd, " -print0");
 
   if (verbose)
-    printf ("%s\n", cmd);
+    fprintf (stderr, "%s\n", cmd);
 
   fp = popen (cmd, "r");
   if (fp == NULL) {
@@ -122,7 +114,7 @@ do_find (char *dir)
     }
   }
   if (pclose (fp) != 0) {
-    reply_with_perror ("pclose: find");
+    reply_with_perror ("pclose");
     free_stringslen (res, size);
     return NULL;
   }
@@ -137,5 +129,103 @@ do_find (char *dir)
 
   sort_strings (res, size-1);
 
-  return res;			/* caller frees */
+  return res;                        /* caller frees */
+}
+
+/* The code below assumes each path returned can fit into a protocol
+ * chunk.  If this turns out not to be true at some point in the
+ * future then we'll need to modify the code a bit to handle it.
+ */
+#if PATH_MAX > GUESTFS_MAX_CHUNK_SIZE
+#error "PATH_MAX > GUESTFS_MAX_CHUNK_SIZE"
+#endif
+
+/* Has one FileOut parameter. */
+int
+do_find0 (const char *dir)
+{
+  struct stat statbuf;
+  int r;
+  FILE *fp;
+  char *cmd;
+  char *sysrootdir;
+  size_t sysrootdirlen, len;
+  char str[GUESTFS_MAX_CHUNK_SIZE];
+
+  sysrootdir = sysroot_path (dir);
+  if (!sysrootdir) {
+    reply_with_perror ("malloc");
+    return -1;
+  }
+
+  r = stat (sysrootdir, &statbuf);
+  if (r == -1) {
+    reply_with_perror ("%s", dir);
+    free (sysrootdir);
+    return -1;
+  }
+  if (!S_ISDIR (statbuf.st_mode)) {
+    reply_with_error ("%s: not a directory", dir);
+    free (sysrootdir);
+    return -1;
+  }
+
+  sysrootdirlen = strlen (sysrootdir);
+
+  if (asprintf_nowarn (&cmd, "find %Q -print0", sysrootdir) == -1) {
+    reply_with_perror ("asprintf");
+    free (sysrootdir);
+    return -1;
+  }
+  free (sysrootdir);
+
+  if (verbose)
+    fprintf (stderr, "%s\n", cmd);
+
+  fp = popen (cmd, "r");
+  if (fp == NULL) {
+    reply_with_perror ("%s", cmd);
+    free (cmd);
+    return -1;
+  }
+  free (cmd);
+
+  /* Now we must send the reply message, before the file contents.  After
+   * this there is no opportunity in the protocol to send any error
+   * message back.  Instead we can only cancel the transfer.
+   */
+  reply (NULL, NULL);
+
+  while ((r = input_to_nul (fp, str, GUESTFS_MAX_CHUNK_SIZE)) > 0) {
+    if (verbose)
+      printf ("find0 string: %s\n", str);
+
+    len = strlen (str);
+    if (len <= sysrootdirlen)
+      continue;
+
+    /* Remove the directory part of the path before sending it. */
+    if (send_file_write (str + sysrootdirlen, r - sysrootdirlen) < 0) {
+      pclose (fp);
+      return -1;
+    }
+  }
+
+  if (ferror (fp)) {
+    perror (dir);
+    send_file_end (1);                /* Cancel. */
+    pclose (fp);
+    return -1;
+  }
+
+  if (pclose (fp) != 0) {
+    perror (dir);
+    send_file_end (1);                /* Cancel. */
+    return -1;
+  }
+
+  if (send_file_end (0))        /* Normal end of file. */
+    return -1;
+
+  return 0;
 }