From: Richard Jones <rjones@redhat.com>
Date: Thu, 6 May 2010 23:13:05 +0000 (+0100)
Subject: daemon: Fix strings to work on absolute symbolic links (RHBZ#579608).
X-Git-Tag: 1.3.10~3
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=26991ebb8181b57f4c8454f2862c938d7c5d012d;p=libguestfs.git

daemon: Fix strings to work on absolute symbolic links (RHBZ#579608).
---

diff --git a/daemon/strings.c b/daemon/strings.c
index 4701716..1ba0241 100644
--- a/daemon/strings.c
+++ b/daemon/strings.c
@@ -21,6 +21,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
 
 #include "daemon.h"
 #include "actions.h"
@@ -28,19 +30,21 @@
 char **
 do_strings_e (const char *encoding, const char *path)
 {
-  char *buf;
-  int r;
+  int fd, flags, r;
   char *out, *err;
   char **lines;
 
-  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;
   }
 
-  r = command (&out, &err, "strings", "-e", encoding, buf, NULL);
-  free (buf);
+  flags = COMMAND_FLAG_CHROOT_COPY_FILE_TO_STDIN | fd;
+  r = commandf (&out, &err, flags, "strings", "-e", encoding, NULL);
   if (r == -1) {
     reply_with_error ("%s: %s", path, err);
     free (err);
diff --git a/src/generator.ml b/src/generator.ml
index d23a8ae..a5a7ddc 100755
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -2446,7 +2446,10 @@ The external L<cmp(1)> program is used for the comparison.");
    [InitISOFS, Always, TestOutputList (
       [["strings"; "/known-5"]], ["abcdefghi"; "jklmnopqr"]);
     InitISOFS, Always, TestOutputList (
-      [["strings"; "/empty"]], [])],
+      [["strings"; "/empty"]], []);
+    (* Test for RHBZ#579608, absolute symbolic links. *)
+    InitISOFS, Always, TestRun (
+      [["strings"; "/abssymlink"]])],
    "print the printable strings in a file",
    "\
 This runs the L<strings(1)> command on a file and returns