X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Faugeas.c;h=76b85d934833495129c6b7b8c2956e5c34ed87fc;hb=dd0432e2efc2e22ddbc9fb0a2746ee1c6a9c582f;hp=2b273875a233cf55dcd99d47b74edf39e8255cfe;hpb=e7eca50046e9a69dac27c0bee832af0a3014e02c;p=libguestfs.git

diff --git a/daemon/augeas.c b/daemon/augeas.c
index 2b27387..76b85d9 100644
--- a/daemon/augeas.c
+++ b/daemon/augeas.c
@@ -57,7 +57,7 @@ do_aug_init (const char *root, int flags)
     aug = NULL;
   }
 
-  len = strlen (root) + 8;
+  len = strlen (root) + 9;
   buf = malloc (len);
   if (!buf) {
     reply_with_perror ("malloc");
@@ -276,3 +276,46 @@ do_aug_load (void)
 
   return 0;
 }
+
+/* Simpler version of aug-match, which also sorts the output. */
+char **
+do_aug_ls (const char *path)
+{
+  char **matches;
+  char *buf;
+  int len;
+
+  NEED_AUG (NULL);
+
+  ABS_PATH (path, NULL);
+
+  len = strlen (path);
+
+  if (len > 1 &&
+      (path[len-1] == '/' || path[len-1] == ']' || path[len-1] == '*')) {
+    reply_with_error ("don't use aug-ls with a path that ends with / ] *");
+    return NULL;
+  }
+
+  if (len == 1)
+    /* we know path must be "/" because of ABS_PATH above */
+    matches = do_aug_match ("/");
+  else {
+    len += 3;			/* / * + terminating \0 */
+    buf = malloc (len);
+    if (buf == NULL) {
+      reply_with_perror ("malloc");
+      return NULL;
+    }
+
+    snprintf (buf, len, "%s/*", path);
+    matches = do_aug_match (buf);
+    free (buf);
+  }
+
+  if (matches == NULL)
+    return NULL;		/* do_aug_match has already sent the error */
+
+  sort_strings (matches, count_strings (matches));
+  return matches;		/* Caller frees. */
+}