X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fgrep.c;h=73e58dd38169730ccda49d46f4048ccf0ef92869;hp=f0dbefd12b6e135454e1807f1d00440f64dc9701;hb=61da709722ec244da1c3c7d4f1a8706f76687cb3;hpb=6bda071b5cd8393b37653687027c4ae6c6cf3804

diff --git a/daemon/grep.c b/daemon/grep.c
index f0dbefd..73e58dd 100644
--- a/daemon/grep.c
+++ b/daemon/grep.c
@@ -22,34 +22,33 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <fcntl.h>
 
 #include "../src/guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"
 
 static char **
-grep (const char *prog, const char *flag, char *regex, char *path)
+grep (const char *prog, const char *flag, const char *regex, const char *path)
 {
-  char *buf;
   char *out, *err;
-  int r;
+  int fd, flags, r;
   char **lines;
 
-  NEED_ROOT (return NULL);
-  ABS_PATH (path, return NULL);
+  CHROOT_IN;
+  fd = open (path, O_RDONLY);
+  CHROOT_OUT;
 
-  /* Make the path relative to /sysroot. */
-  buf = sysroot_path (path);
-  if (!buf) {
-    reply_with_perror ("malloc");
+  if (fd == -1) {
+    reply_with_perror ("%s", path);
     return NULL;
   }
 
   /* Note that grep returns an error if no match.  We want to
    * suppress this error and return an empty list.
    */
-  r = commandr (&out, &err, prog, flag, regex, buf, NULL);
-  free (buf);
+  flags = COMMAND_FLAG_CHROOT_COPY_FILE_TO_STDIN | fd;
+  r = commandrf (&out, &err, flags, prog, flag, regex, NULL);
   if (r == -1 || r > 1) {
     reply_with_error ("%s %s %s: %s", prog, flag, regex, err);
     free (out);
@@ -67,74 +66,74 @@ grep (const char *prog, const char *flag, char *regex, char *path)
 }
 
 char **
-do_grep (char *regex, char *path)
+do_grep (const char *regex, const char *path)
 {
   /* The "--" is not really needed, but it helps when we don't need a flag. */
   return grep ("grep", "--", regex, path);
 }
 
 char **
-do_egrep (char *regex, char *path)
+do_egrep (const char *regex, const char *path)
 {
   return grep ("egrep", "--", regex, path);
 }
 
 char **
-do_fgrep (char *regex, char *path)
+do_fgrep (const char *regex, const char *path)
 {
   return grep ("fgrep", "--", regex, path);
 }
 
 char **
-do_grepi (char *regex, char *path)
+do_grepi (const char *regex, const char *path)
 {
   return grep ("grep", "-i", regex, path);
 }
 
 char **
-do_egrepi (char *regex, char *path)
+do_egrepi (const char *regex, const char *path)
 {
   return grep ("egrep", "-i", regex, path);
 }
 
 char **
-do_fgrepi (char *regex, char *path)
+do_fgrepi (const char *regex, const char *path)
 {
   return grep ("fgrep", "-i", regex, path);
 }
 
 char **
-do_zgrep (char *regex, char *path)
+do_zgrep (const char *regex, const char *path)
 {
   return grep ("zgrep", "--", regex, path);
 }
 
 char **
-do_zegrep (char *regex, char *path)
+do_zegrep (const char *regex, const char *path)
 {
   return grep ("zegrep", "--", regex, path);
 }
 
 char **
-do_zfgrep (char *regex, char *path)
+do_zfgrep (const char *regex, const char *path)
 {
   return grep ("zfgrep", "--", regex, path);
 }
 
 char **
-do_zgrepi (char *regex, char *path)
+do_zgrepi (const char *regex, const char *path)
 {
   return grep ("zgrep", "-i", regex, path);
 }
 
 char **
-do_zegrepi (char *regex, char *path)
+do_zegrepi (const char *regex, const char *path)
 {
   return grep ("zegrep", "-i", regex, path);
 }
 
 char **
-do_zfgrepi (char *regex, char *path)
+do_zfgrepi (const char *regex, const char *path)
 {
   return grep ("zfgrep", "-i", regex, path);
 }