X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fstrings.c;h=4701716899a60866b2c968627c499a90bb1d6e6b;hb=09a0427448b1f4328b9246d4d8a26610bb5228c8;hp=b26691d3540f6999c1ec3cdfcdbfce934d91ec7b;hpb=b2a5fec5f8b8b6bf1313d8474448cd8b50057d1b;p=libguestfs.git diff --git a/daemon/strings.c b/daemon/strings.c index b26691d..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 @@ -28,28 +28,21 @@ char ** 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;