X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fstrings.c;h=d94ac44eb51f8456f7f300c0cc8770e689e914c5;hb=8bc6e9d6a89672bbe1e7469774abe889354deb67;hp=d7dc392af4ad3fb7e6fcd775e95ffbbaa31c794d;hpb=84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0;p=libguestfs.git

diff --git a/daemon/strings.c b/daemon/strings.c
index d7dc392..d94ac44 100644
--- a/daemon/strings.c
+++ b/daemon/strings.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <config.h>
@@ -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,21 +30,29 @@
 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");
+  if (strlen (encoding) != 1 ||
+      strchr ("sSblBL", encoding[0]) == NULL) {
+    reply_with_error ("%s: invalid encoding", encoding);
     return NULL;
   }
 
-  r = command (&out, &err, "strings", "-e", encoding, buf, NULL);
-  free (buf);
+  CHROOT_IN;
+  fd = open (path, O_RDONLY);
+  CHROOT_OUT;
+
+  if (fd == -1) {
+    reply_with_perror ("%s", path);
+    return NULL;
+  }
+
+  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;