X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fls.c;h=8ae150b46909290a30f4de00ff2616648d3ec5c7;hb=8601bbda56cdb2b8491b6e2054596ec9599c38f1;hp=a440080934265dd815ddebc04e5b1a746b8194b4;hpb=a7b73d4a1e09f12b2002083618056f0c823c1dcf;p=libguestfs.git

diff --git a/daemon/ls.c b/daemon/ls.c
index a440080..8ae150b 100644
--- a/daemon/ls.c
+++ b/daemon/ls.c
@@ -38,7 +38,7 @@ do_ls (char *path)
   struct dirent *d;
 
   NEED_ROOT (NULL);
-  ABS_PATH (path, NULL);
+  ABS_PATH (path, return NULL);
 
   CHROOT_IN;
   dir = opendir (path);
@@ -74,29 +74,30 @@ do_ls (char *path)
   return r;
 }
 
+/* Because we can't chroot and run the ls command (since 'ls' won't
+ * necessarily exist in the chroot), this command can be used to escape
+ * from the sysroot (eg. 'll /..').  This command is not meant for
+ * serious use anyway, just for quick interactive sessions.
+ *
+ * FIXME: eventually, provide a "debug ll" command that would list files
+ * in the appliance.
+ */
+
 char *
 do_ll (char *path)
 {
-  int r, len;
+  int r;
   char *out, *err;
   char *spath;
 
-  //NEED_ROOT
+  NEED_ROOT (NULL);
   ABS_PATH (path, NULL);
 
-  /* This exposes the /sysroot, because we can't chroot and run the ls
-   * command (since 'ls' won't necessarily exist in the chroot).  This
-   * command is not meant for serious use anyway, just for quick
-   * 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);