X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fstrings.c;h=4701716899a60866b2c968627c499a90bb1d6e6b;hp=d78f9fdfb76e87dbd97eca8d097a3f68e81631e6;hb=cb9350019cc6382a35c98f522c9c4d221c92b605;hpb=887290e949d54c6ac4c9b787231e588f84f2367c diff --git a/daemon/strings.c b/daemon/strings.c index d78f9fd..4701716 100644 --- a/daemon/strings.c +++ b/daemon/strings.c @@ -1,5 +1,5 @@ /* libguestfs - the guestfsd daemon - * Copyright (C) 2009 Red Hat Inc. + * Copyright (C) 2009 Red Hat Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,30 +26,23 @@ #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; char *out, *err; char **lines; - NEED_ROOT (NULL); - ABS_PATH (path, NULL); - - len = strlen (path) + 9; - buf = malloc (len); + buf = sysroot_path (path); if (!buf) { reply_with_perror ("malloc"); return NULL; } - snprintf (buf, len, "/sysroot%s", 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; @@ -68,7 +61,7 @@ do_strings_e (char *encoding, char *path) } char ** -do_strings (char *path) +do_strings (const char *path) { return do_strings_e ("s", path); }