diff options
| author | Richard Jones <rjones@trick.home.annexia.org> | 2009-07-18 10:43:52 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@trick.home.annexia.org> | 2009-07-18 10:43:52 +0100 |
| commit | 78029b529ad98769685d607230b70f71832d5906 (patch) | |
| tree | f103cb7252ccca7efc3e39f4400f961d5972937c /daemon/strings.c | |
| parent | e8c954933b2bfb3bc3ead5a151d49d164f1a8eab (diff) | |
| download | libguestfs-78029b529ad98769685d607230b70f71832d5906.tar.gz libguestfs-78029b529ad98769685d607230b70f71832d5906.tar.xz libguestfs-78029b529ad98769685d607230b70f71832d5906.zip | |
Make /sysroot path configurable.
Currently /sysroot is hard-coded throughout the daemon code.
This patch turns the path into a variable so that we can change
it in future, for example to allow standalone mode to be implemented.
This patch was tested by running all the C API tests successfully.
Diffstat (limited to 'daemon/strings.c')
| -rw-r--r-- | daemon/strings.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/daemon/strings.c b/daemon/strings.c index 2c52532d..c0e073fe 100644 --- a/daemon/strings.c +++ b/daemon/strings.c @@ -28,7 +28,6 @@ char ** do_strings_e (char *encoding, char *path) { - int len; char *buf; int r; char *out, *err; @@ -37,15 +36,12 @@ do_strings_e (char *encoding, 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) { |