summaryrefslogtreecommitdiffstats
path: root/daemon/ls.c
diff options
context:
space:
mode:
authorRichard Jones <rjones@trick.home.annexia.org>2009-07-18 10:43:52 +0100
committerRichard Jones <rjones@trick.home.annexia.org>2009-07-18 10:43:52 +0100
commit78029b529ad98769685d607230b70f71832d5906 (patch)
treef103cb7252ccca7efc3e39f4400f961d5972937c /daemon/ls.c
parente8c954933b2bfb3bc3ead5a151d49d164f1a8eab (diff)
downloadlibguestfs-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/ls.c')
-rw-r--r--daemon/ls.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/daemon/ls.c b/daemon/ls.c
index a4400809..4d4714ee 100644
--- a/daemon/ls.c
+++ b/daemon/ls.c
@@ -77,7 +77,7 @@ do_ls (char *path)
char *
do_ll (char *path)
{
- int r, len;
+ int r;
char *out, *err;
char *spath;
@@ -90,13 +90,11 @@ do_ll (char *path)
* interactive sessions. For the same reason, you can also "escape"
* the sysroot (eg. 'll /..').
*/
- len = strlen (path) + 9;
- spath = malloc (len);
+ spath = sysroot_path (path);
if (!spath) {
reply_with_perror ("malloc");
return NULL;
}
- snprintf (spath, len, "/sysroot%s", path);
r = command (&out, &err, "ls", "-la", spath, NULL);
free (spath);