X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fstrings.c;h=f08401b2835b92fbac740cac303fe55f97938930;hp=2c52532d38b425077f93090e1d45a1af7d500d29;hb=0606cb54671e10f104b4eba1c70378ef8725322b;hpb=a7b73d4a1e09f12b2002083618056f0c823c1dcf

diff --git a/daemon/strings.c b/daemon/strings.c
index 2c52532..f08401b 100644
--- a/daemon/strings.c
+++ b/daemon/strings.c
@@ -21,35 +21,38 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
 
 #include "daemon.h"
 #include "actions.h"
 
 char **
-do_strings_e (char *encoding, char *path)
+do_strings_e (const char *encoding, const char *path)
 {
-  int len;
-  char *buf;
-  int r;
+  int fd, flags, r;
   char *out, *err;
   char **lines;
 
-  NEED_ROOT (NULL);
-  ABS_PATH (path, NULL);
-
-  len = strlen (path) + 9;
-  buf = malloc (len);
-  if (!buf) {
-    reply_with_perror ("malloc");
+  if (strlen (encoding) != 1 ||
+      strchr ("sSblBL", encoding[0]) == NULL) {
+    reply_with_error ("%s: invalid encoding", encoding);
     return NULL;
   }
 
-  snprintf (buf, len, "/sysroot%s", path);
+  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 ("strings: %s: %s", path, err);
+    reply_with_error ("%s: %s", path, err);
     free (err);
     free (out);
     return NULL;
@@ -68,7 +71,7 @@ do_strings_e (char *encoding, char *path)
 }
 
 char **
-do_strings (char *path)
+do_strings (const char *path)
 {
   return do_strings_e ("s", path);
 }