X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Faugeas.c;h=79d41a46bcdc2b38fd39525f6886cb197c6eb419;hp=9b45f976922d9263437c25948d6e2223cba67ebb;hb=25c4b0190c22e3bdc5594aff994c8e8f99db5ab3;hpb=887290e949d54c6ac4c9b787231e588f84f2367c

diff --git a/daemon/augeas.c b/daemon/augeas.c
index 9b45f97..79d41a4 100644
--- a/daemon/augeas.c
+++ b/daemon/augeas.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
@@ -53,7 +53,6 @@ do_aug_init (char *root, int flags)
 {
 #ifdef HAVE_AUGEAS
   char *buf;
-  int len;
 
   NEED_ROOT (-1);
   ABS_PATH (root, -1);
@@ -63,13 +62,11 @@ do_aug_init (char *root, int flags)
     aug = NULL;
   }
 
-  len = strlen (root) + 9;
-  buf = malloc (len);
+  buf = sysroot_path (root);
   if (!buf) {
     reply_with_perror ("malloc");
     return -1;
   }
-  snprintf (buf, len, "/sysroot%s", root);
 
   aug = aug_init (buf, NULL, flags);
   free (buf);
@@ -122,21 +119,21 @@ do_aug_defvar (char *name, char *expr)
 #endif
 }
 
-guestfs_aug_defnode_ret *
+guestfs_int_int_bool *
 do_aug_defnode (char *name, char *expr, char *val)
 {
 #ifdef HAVE_AUG_DEFNODE
-  static guestfs_aug_defnode_ret r;
+  static guestfs_int_int_bool r;
   int created;
 
   NEED_AUG (NULL);
 
-  r.nrnodes = aug_defnode (aug, name, expr, val, &created);
-  if (r.nrnodes == -1) {
+  r.i = aug_defnode (aug, name, expr, val, &created);
+  if (r.i == -1) {
     reply_with_error ("Augeas defnode failed");
     return NULL;
   }
-  r.created = created;
+  r.b = created;
   return &r;
 #else
   reply_with_error ("%s is not available", __func__);