summaryrefslogtreecommitdiffstats
path: root/daemon
diff options
context:
space:
mode:
authorRichard Jones <rjones@redhat.com>2010-04-09 09:40:59 +0100
committerRichard Jones <rjones@redhat.com>2010-04-09 09:40:59 +0100
commitd1dd00606d0b5b1430598e5092b017aa15d9ee11 (patch)
treeeda78067c40bba0bace3b1e63bc0da66955a2474 /daemon
parent3765f97898a1194d96ab4124e1eb46e25701b3b2 (diff)
downloadlibguestfs-d1dd00606d0b5b1430598e5092b017aa15d9ee11.tar.gz
libguestfs-d1dd00606d0b5b1430598e5092b017aa15d9ee11.tar.xz
libguestfs-d1dd00606d0b5b1430598e5092b017aa15d9ee11.zip
Allow aug-ls to take Augeas variable as argument (RHBZ#580016).
Diffstat (limited to 'daemon')
-rw-r--r--daemon/augeas.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/daemon/augeas.c b/daemon/augeas.c
index de325ded..36b36b86 100644
--- a/daemon/augeas.c
+++ b/daemon/augeas.c
@@ -348,7 +348,9 @@ do_aug_ls (const char *path)
NEED_AUG (NULL);
- ABS_PATH (path, return NULL);
+ /* Note that path might also be a previously defined variable
+ * (defined with aug_defvar). See RHBZ#580016.
+ */
len = strlen (path);
@@ -358,9 +360,8 @@ do_aug_ls (const char *path)
return NULL;
}
- if (len == 1)
- /* we know path must be "/" because of ABS_PATH above */
- matches = do_aug_match ("/");
+ if (STREQ (path, "/"))
+ matches = do_aug_match ("/*");
else {
len += 3; /* / * + terminating \0 */
buf = malloc (len);