X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fstrings.c;h=f08401b2835b92fbac740cac303fe55f97938930;hp=c0e073fe0b9eb064ea1a5914a700ea3599631065;hb=428a45c3e15f03e9861e1b551e1ae8da821dba5f;hpb=78029b529ad98769685d607230b70f71832d5906;ds=sidebyside diff --git a/daemon/strings.c b/daemon/strings.c index c0e073f..f08401b 100644 --- a/daemon/strings.c +++ b/daemon/strings.c @@ -21,31 +21,38 @@ #include #include #include +#include +#include #include "daemon.h" #include "actions.h" char ** -do_strings_e (char *encoding, char *path) +do_strings_e (const char *encoding, const char *path) { - char *buf; - int r; + int fd, flags, r; char *out, *err; char **lines; - NEED_ROOT (NULL); - ABS_PATH (path, NULL); + if (strlen (encoding) != 1 || + strchr ("sSblBL", encoding[0]) == NULL) { + reply_with_error ("%s: invalid encoding", encoding); + return NULL; + } + + CHROOT_IN; + fd = open (path, O_RDONLY); + CHROOT_OUT; - buf = sysroot_path (path); - if (!buf) { - reply_with_perror ("malloc"); + 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; @@ -64,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); }