X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fstrings.c;h=c0e073fe0b9eb064ea1a5914a700ea3599631065;hp=b26691d3540f6999c1ec3cdfcdbfce934d91ec7b;hb=78029b529ad98769685d607230b70f71832d5906;hpb=b2a5fec5f8b8b6bf1313d8474448cd8b50057d1b diff --git a/daemon/strings.c b/daemon/strings.c index b26691d..c0e073f 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,9 +26,8 @@ #include "actions.h" char ** -do_strings_e (const char *encoding, const char *path) +do_strings_e (char *encoding, char *path) { - int len; char *buf; int r; char *out, *err; @@ -37,15 +36,12 @@ do_strings_e (const char *encoding, const char *path) 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) { @@ -68,7 +64,7 @@ do_strings_e (const char *encoding, const char *path) } char ** -do_strings (const char *path) +do_strings (char *path) { return do_strings_e ("s", path); }