X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Faugeas.c;h=a9ad91ff2768cf4552885e7d355b0fe1810a819e;hp=b56012cd8af71f4001d7596f1dd15985f7cde0ea;hb=88ab203e611694bc0d01aca745e8df18cb3f094e;hpb=7cf477952aeb448294d8984cf5183b4cef0f6d5d

diff --git a/daemon/augeas.c b/daemon/augeas.c
index b56012c..a9ad91f 100644
--- a/daemon/augeas.c
+++ b/daemon/augeas.c
@@ -29,6 +29,7 @@
 
 #include "daemon.h"
 #include "actions.h"
+#include "optgroups.h"
 
 #ifdef HAVE_AUGEAS
 /* The Augeas handle.  We maintain a single handle per daemon, which
@@ -45,6 +46,18 @@ static augeas *aug = NULL;
     }									\
   }									\
   while (0)
+
+int
+optgroup_augeas_available (void)
+{
+  return 1;
+}
+#else /* !HAVE_AUGEAS */
+int
+optgroup_augeas_available (void)
+{
+  return 0;
+}
 #endif
 
 /* We need to rewrite the root path so it is based at /sysroot. */
@@ -75,8 +88,7 @@ do_aug_init (const char *root, int flags)
 
   return 0;
 #else
-  reply_with_error ("%s is not available", __func__);
-  return -1;
+  NOT_AVAILABLE (-1);
 #endif
 }
 
@@ -91,8 +103,7 @@ do_aug_close (void)
 
   return 0;
 #else
-  reply_with_error ("%s is not available", __func__);
-  return -1;
+  NOT_AVAILABLE (-1);
 #endif
 }
 
@@ -111,8 +122,7 @@ do_aug_defvar (const char *name, const char *expr)
   }
   return r;
 #else
-  reply_with_error ("%s is not available", __func__);
-  return -1;
+  NOT_AVAILABLE (-1);
 #endif
 }
 
@@ -133,8 +143,7 @@ do_aug_defnode (const char *name, const char *expr, const char *val)
   r.b = created;
   return &r;
 #else
-  reply_with_error ("%s is not available", __func__);
-  return NULL;
+  NOT_AVAILABLE (NULL);
 #endif
 }
 
@@ -176,8 +185,7 @@ do_aug_get (const char *path)
 
   return v;			/* Caller frees. */
 #else
-  reply_with_error ("%s is not available", __func__);
-  return NULL;
+  NOT_AVAILABLE (NULL);
 #endif
 }
 
@@ -197,8 +205,27 @@ do_aug_set (const char *path, const char *val)
 
   return 0;
 #else
-  reply_with_error ("%s is not available", __func__);
-  return -1;
+  NOT_AVAILABLE (-1);
+#endif
+}
+
+int
+do_aug_clear (const char *path)
+{
+#ifdef HAVE_AUGEAS
+  int r;
+
+  NEED_AUG (-1);
+
+  r = aug_set (aug, path, NULL);
+  if (r == -1) {
+    reply_with_error ("Augeas clear failed");
+    return -1;
+  }
+
+  return 0;
+#else
+  NOT_AVAILABLE (-1);
 #endif
 }
 
@@ -218,8 +245,7 @@ do_aug_insert (const char *path, const char *label, int before)
 
   return 0;
 #else
-  reply_with_error ("%s is not available", __func__);
-  return -1;
+  NOT_AVAILABLE (-1);
 #endif
 }
 
@@ -239,8 +265,7 @@ do_aug_rm (const char *path)
 
   return r;
 #else
-  reply_with_error ("%s is not available", __func__);
-  return -1;
+  NOT_AVAILABLE (-1);
 #endif
 }
 
@@ -260,8 +285,7 @@ do_aug_mv (const char *src, const char *dest)
 
   return 0;
 #else
-  reply_with_error ("%s is not available", __func__);
-  return -1;
+  NOT_AVAILABLE (-1);
 #endif
 }
 
@@ -295,8 +319,7 @@ do_aug_match (const char *path)
 
   return matches;		/* Caller frees. */
 #else
-  reply_with_error ("%s is not available", __func__);
-  return NULL;
+  NOT_AVAILABLE (NULL);
 #endif
 }
 
@@ -313,8 +336,7 @@ do_aug_save (void)
 
   return 0;
 #else
-  reply_with_error ("%s is not available", __func__);
-  return -1;
+  NOT_AVAILABLE (-1);
 #endif
 }
 
@@ -331,8 +353,7 @@ do_aug_load (void)
 
   return 0;
 #else
-  reply_with_error ("%s is not available", __func__);
-  return -1;
+  NOT_AVAILABLE (-1);
 #endif
 }
 
@@ -347,7 +368,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);
 
@@ -357,9 +380,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);
@@ -379,7 +401,6 @@ do_aug_ls (const char *path)
   sort_strings (matches, count_strings ((void *) matches));
   return matches;		/* Caller frees. */
 #else
-  reply_with_error ("%s is not available", __func__);
-  return NULL;
+  NOT_AVAILABLE (NULL);
 #endif
 }