X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fls.c;h=0af2356bb85277c22f2769c475e229cf71272267;hp=05e2cc70cee7a95d0fe8247cefe6c5bfff2fe756;hb=07f4b20ae959069fca41756b0dc103ec5fa99754;hpb=1cf85b1e60e85c4940869c6291d75ac44a5bd190

diff --git a/daemon/ls.c b/daemon/ls.c
index 05e2cc7..0af2356 100644
--- a/daemon/ls.c
+++ b/daemon/ls.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
@@ -29,14 +29,6 @@
 #include "daemon.h"
 #include "actions.h"
 
-static int
-compare (const void *vp1, const void *vp2)
-{
-  char * const *p1 = (char * const *) vp1;
-  char * const *p2 = (char * const *) vp2;
-  return strcmp (*p1, *p2);
-}
-
 char **
 do_ls (const char *path)
 {
@@ -45,9 +37,6 @@ do_ls (const char *path)
   DIR *dir;
   struct dirent *d;
 
-  NEED_ROOT (NULL);
-  ABS_PATH (path, NULL);
-
   CHROOT_IN;
   dir = opendir (path);
   CHROOT_OUT;
@@ -58,7 +47,7 @@ do_ls (const char *path)
   }
 
   while ((d = readdir (dir)) != NULL) {
-    if (strcmp (d->d_name, ".") == 0 || strcmp (d->d_name, "..") == 0)
+    if (STREQ (d->d_name, ".") || STREQ (d->d_name, ".."))
       continue;
 
     if (add_string (&r, &size, &alloc, d->d_name) == -1) {
@@ -78,33 +67,28 @@ do_ls (const char *path)
     return NULL;
   }
 
-  qsort (r, size-1, sizeof (char *), compare);
+  sort_strings (r, size-1);
   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.
+ */
+
 char *
 do_ll (const char *path)
 {
-  int r, len;
+  int r;
   char *out, *err;
   char *spath;
 
-  //NEED_ROOT
-  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);