daemon: Fix grep and related to work on absolute symbolic links (RHBZ#579608).

diff --git a/daemon/grep.c b/daemon/grep.c
index d1f5a3f..73e58dd 100644 (file)
--- a/daemon/grep.c
+++ b/daemon/grep.c
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

+#include <fcntl.h>

 
 #include "../src/guestfs_protocol.h"
 #include "daemon.h"
 
 #include "../src/guestfs_protocol.h"
 #include "daemon.h"


@@ -30,23 +31,24 @@
 static char **
 grep (const char *prog, const char *flag, const char *regex, const char *path)
 {
 static char **
 grep (const char *prog, const char *flag, const char *regex, const char *path)
 {

-  char *buf;

   char *out, *err;
   char *out, *err;

-  int r;
+  int fd, flags, r;

   char **lines;
 
   char **lines;
 

-  /* Make the path relative to /sysroot. */
-  buf = sysroot_path (path);
-  if (!buf) {
-    reply_with_perror ("malloc");
+  CHROOT_IN;
+  fd = open (path, O_RDONLY);
+  CHROOT_OUT;
+
+  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.
    */
     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);
   if (r == -1 || r > 1) {
     reply_with_error ("%s %s %s: %s", prog, flag, regex, err);
     free (out);

diff --git a/src/generator.ml b/src/generator.ml
index 9112a48..ffdfb18 100755 (executable)
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -3293,7 +3293,10 @@ in the total size of file that can be handled.");
    [InitISOFS, Always, TestOutputList (
       [["grep"; "abc"; "/test-grep.txt"]], ["abc"; "abc123"]);
     InitISOFS, Always, TestOutputList (
    [InitISOFS, Always, TestOutputList (
       [["grep"; "abc"; "/test-grep.txt"]], ["abc"; "abc123"]);
     InitISOFS, Always, TestOutputList (

-      [["grep"; "nomatch"; "/test-grep.txt"]], [])],
+      [["grep"; "nomatch"; "/test-grep.txt"]], []);
+    (* Test for RHBZ#579608, absolute symbolic links. *)
+    InitISOFS, Always, TestOutputList (
+      [["grep"; "nomatch"; "/abssymlink"]], [])],

    "return lines matching a pattern",
    "\
 This calls the external C<grep> program and returns the
    "return lines matching a pattern",
    "\
 This calls the external C<grep> program and returns the