git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
daemon/Win32: Windows replacement for umask.
[libguestfs.git]
/
daemon
/
augeas.c
diff --git
a/daemon/augeas.c
b/daemon/augeas.c
index
0dbf0e7
..
de325de
100644
(file)
--- a/
daemon/augeas.c
+++ b/
daemon/augeas.c
@@
-1,5
+1,5
@@
/* libguestfs - the guestfsd daemon
/* 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
*
* 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
@@
-29,6
+29,7
@@
#include "daemon.h"
#include "actions.h"
#include "daemon.h"
#include "actions.h"
+#include "optgroups.h"
#ifdef HAVE_AUGEAS
/* The Augeas handle. We maintain a single handle per daemon, which
#ifdef HAVE_AUGEAS
/* The Augeas handle. We maintain a single handle per daemon, which
@@
-36,7
+37,6
@@
* considerably.
*/
static augeas *aug = NULL;
* considerably.
*/
static augeas *aug = NULL;
-#endif
#define NEED_AUG(errcode) \
do { \
#define NEED_AUG(errcode) \
do { \
@@
-47,29
+47,36
@@
static augeas *aug = NULL;
} \
while (0)
} \
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. */
int
do_aug_init (const char *root, int flags)
{
#ifdef HAVE_AUGEAS
char *buf;
/* We need to rewrite the root path so it is based at /sysroot. */
int
do_aug_init (const char *root, int flags)
{
#ifdef HAVE_AUGEAS
char *buf;
- int len;
-
- NEED_ROOT (-1);
- ABS_PATH (root, -1);
if (aug) {
aug_close (aug);
aug = NULL;
}
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;
}
if (!buf) {
reply_with_perror ("malloc");
return -1;
}
- snprintf (buf, len, "/sysroot%s", root);
aug = aug_init (buf, NULL, flags);
free (buf);
aug = aug_init (buf, NULL, flags);
free (buf);
@@
-81,8
+88,7
@@
do_aug_init (const char *root, int flags)
return 0;
#else
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
#endif
}
@@
-97,8
+103,7
@@
do_aug_close (void)
return 0;
#else
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
#endif
}
@@
-117,30
+122,28
@@
do_aug_defvar (const char *name, const char *expr)
}
return r;
#else
}
return r;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
#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
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);
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;
}
reply_with_error ("Augeas defnode failed");
return NULL;
}
- r.
created
= created;
+ r.
b
= created;
return &r;
#else
return &r;
#else
- reply_with_error ("%s is not available", __func__);
- return NULL;
+ NOT_AVAILABLE (NULL);
#endif
}
#endif
}
@@
-182,8
+185,7
@@
do_aug_get (const char *path)
return v; /* Caller frees. */
#else
return v; /* Caller frees. */
#else
- reply_with_error ("%s is not available", __func__);
- return NULL;
+ NOT_AVAILABLE (NULL);
#endif
}
#endif
}
@@
-203,8
+205,7
@@
do_aug_set (const char *path, const char *val)
return 0;
#else
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
#endif
}
@@
-224,8
+225,7
@@
do_aug_insert (const char *path, const char *label, int before)
return 0;
#else
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
#endif
}
@@
-245,8
+245,7
@@
do_aug_rm (const char *path)
return r;
#else
return r;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
#endif
}
@@
-266,8
+265,7
@@
do_aug_mv (const char *src, const char *dest)
return 0;
#else
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
#endif
}
@@
-301,8
+299,7
@@
do_aug_match (const char *path)
return matches; /* Caller frees. */
#else
return matches; /* Caller frees. */
#else
- reply_with_error ("%s is not available", __func__);
- return NULL;
+ NOT_AVAILABLE (NULL);
#endif
}
#endif
}
@@
-319,8
+316,7
@@
do_aug_save (void)
return 0;
#else
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
#endif
}
@@
-337,8
+333,7
@@
do_aug_load (void)
return 0;
#else
return 0;
#else
- reply_with_error ("%s is not available", __func__);
- return -1;
+ NOT_AVAILABLE (-1);
#endif
}
#endif
}
@@
-353,7
+348,7
@@
do_aug_ls (const char *path)
NEED_AUG (NULL);
NEED_AUG (NULL);
- ABS_PATH (path, NULL);
+ ABS_PATH (path,
return
NULL);
len = strlen (path);
len = strlen (path);
@@
-382,10
+377,9
@@
do_aug_ls (const char *path)
if (matches == NULL)
return NULL; /* do_aug_match has already sent the error */
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
return matches; /* Caller frees. */
#else
- reply_with_error ("%s is not available", __func__);
- return NULL;
+ NOT_AVAILABLE (NULL);
#endif
}
#endif
}