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/wc.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/wc.c')
-rw-r--r-- | daemon/wc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/daemon/wc.c b/daemon/wc.c index 370ffdde..4878b57e 100644 --- a/daemon/wc.c +++ b/daemon/wc.c @@ -32,19 +32,17 @@ wc (char *flag, char *path) { char *buf; char *out, *err; - int r, len; + int r; NEED_ROOT (-1); ABS_PATH (path, -1); /* Make the path relative to /sysroot. */ - len = strlen (path) + 9; - buf = malloc (len); + buf = sysroot_path (path); if (!buf) { reply_with_perror ("malloc"); return -1; } - snprintf (buf, len, "/sysroot%s", path); r = command (&out, &err, "wc", flag, buf, NULL); free (buf); |