/* 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
* considerably.
*/
static augeas *aug = NULL;
-#endif
#define NEED_AUG(errcode) \
do { \
} \
} \
while (0)
+#endif
/* We need to rewrite the root path so it is based at /sysroot. */
int
{
#ifdef HAVE_AUGEAS
char *buf;
- int len;
-
- NEED_ROOT (-1);
- ABS_PATH (root, -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 (const char *name, const char *expr, const 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);
if (matches == NULL)
return NULL; /* do_aug_match has already sent the error */
- sort_strings (matches, count_strings (matches));
+ sort_strings (matches, count_strings ((void *) matches));
return matches; /* Caller frees. */
#else
reply_with_error ("%s is not available", __func__);