X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fstrings.c;h=778aea349c1a8b920b4a1a13f4b11e8adb9e9219;hb=4580b79d9a47dc9b6ff76070b7b5cc8f3499da09;hp=89e04a8b77fedb6fcc0105a7aeeb989dee8492d7;hpb=0dd6c8c8442d4ff588f6dac2efab24d3409b0dec;p=libguestfs.git

diff --git a/daemon/strings.c b/daemon/strings.c
index 89e04a8..778aea3 100644
--- a/daemon/strings.c
+++ b/daemon/strings.c
@@ -26,15 +26,18 @@
 #include "actions.h"
 
 char **
-do_strings_e (char *encoding, char *path)
+do_strings_e (const char *encoding, const char *path)
 {
   char *buf;
   int r;
   char *out, *err;
   char **lines;
 
-  NEED_ROOT (NULL);
-  ABS_PATH (path, return NULL);
+  if (strlen (encoding) != 1 ||
+      strchr ("sSblBL", encoding[0]) == NULL) {
+    reply_with_error ("%s: invalid encoding", encoding);
+    return NULL;
+  }
 
   buf = sysroot_path (path);
   if (!buf) {
@@ -45,7 +48,7 @@ do_strings_e (char *encoding, char *path)
   r = command (&out, &err, "strings", "-e", encoding, buf, NULL);
   free (buf);
   if (r == -1) {
-    reply_with_error ("strings: %s: %s", path, err);
+    reply_with_error ("%s: %s", path, err);
     free (err);
     free (out);
     return NULL;
@@ -64,7 +67,7 @@ do_strings_e (char *encoding, char *path)
 }
 
 char **
-do_strings (char *path)
+do_strings (const char *path)
 {
   return do_strings_e ("s", path);
 }