From d1dd00606d0b5b1430598e5092b017aa15d9ee11 Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Fri, 9 Apr 2010 09:40:59 +0100 Subject: [PATCH] Allow aug-ls to take Augeas variable as argument (RHBZ#580016). --- daemon/augeas.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/daemon/augeas.c b/daemon/augeas.c index de325de..36b36b8 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); -- 1.8.3.1