{
#ifdef HAVE_AUGEAS
char *buf;
- int len;
- NEED_ROOT (-1);
- ABS_PATH (root, -1);
+ NEED_ROOT (return -1);
+ ABS_PATH (root, return -1);
if (aug) {
aug_close (aug);
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);
#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__);
NEED_AUG (NULL);
- ABS_PATH (path, NULL);
+ ABS_PATH (path, return NULL);
len = strlen (path);