git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
initrd-cat: Needs ProtocolLimitWarning.
[libguestfs.git]
/
daemon
/
augeas.c
diff --git
a/daemon/augeas.c
b/daemon/augeas.c
index
04c4a7a
..
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
@@
-22,11
+22,16
@@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+
+#ifdef HAVE_AUGEAS
#include <augeas.h>
#include <augeas.h>
+#endif
#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
* is all that is necessary and reduces the complexity of the API
* considerably.
/* The Augeas handle. We maintain a single handle per daemon, which
* is all that is necessary and reduces the complexity of the API
* considerably.
@@
-42,28
+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)
{
/* 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;
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) + 8;
- 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);
@@
-74,22
+87,30
@@
do_aug_init (const char *root, int flags)
}
return 0;
}
return 0;
+#else
+ NOT_AVAILABLE (-1);
+#endif
}
int
do_aug_close (void)
{
}
int
do_aug_close (void)
{
+#ifdef HAVE_AUGEAS
NEED_AUG(-1);
aug_close (aug);
aug = NULL;
return 0;
NEED_AUG(-1);
aug_close (aug);
aug = NULL;
return 0;
+#else
+ NOT_AVAILABLE (-1);
+#endif
}
int
do_aug_defvar (const char *name, const char *expr)
{
}
int
do_aug_defvar (const char *name, const char *expr)
{
+#ifdef HAVE_AUG_DEFVAR
int r;
NEED_AUG (-1);
int r;
NEED_AUG (-1);
@@
-100,28
+121,36
@@
do_aug_defvar (const char *name, const char *expr)
return -1;
}
return r;
return -1;
}
return r;
+#else
+ NOT_AVAILABLE (-1);
+#endif
}
}
-guestfs_
aug_defnode_ret
*
+guestfs_
int_int_bool
*
do_aug_defnode (const char *name, const char *expr, const char *val)
{
do_aug_defnode (const char *name, const char *expr, const char *val)
{
- static guestfs_aug_defnode_ret r;
+#ifdef HAVE_AUG_DEFNODE
+ 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;
return &r;
+#else
+ NOT_AVAILABLE (NULL);
+#endif
}
char *
do_aug_get (const char *path)
{
}
char *
do_aug_get (const char *path)
{
+#ifdef HAVE_AUGEAS
const char *value = NULL;
char *v;
int r;
const char *value = NULL;
char *v;
int r;
@@
-155,11
+184,15
@@
do_aug_get (const char *path)
}
return v; /* Caller frees. */
}
return v; /* Caller frees. */
+#else
+ NOT_AVAILABLE (NULL);
+#endif
}
int
do_aug_set (const char *path, const char *val)
{
}
int
do_aug_set (const char *path, const char *val)
{
+#ifdef HAVE_AUGEAS
int r;
NEED_AUG (-1);
int r;
NEED_AUG (-1);
@@
-171,11
+204,15
@@
do_aug_set (const char *path, const char *val)
}
return 0;
}
return 0;
+#else
+ NOT_AVAILABLE (-1);
+#endif
}
int
do_aug_insert (const char *path, const char *label, int before)
{
}
int
do_aug_insert (const char *path, const char *label, int before)
{
+#ifdef HAVE_AUGEAS
int r;
NEED_AUG (-1);
int r;
NEED_AUG (-1);
@@
-187,11
+224,15
@@
do_aug_insert (const char *path, const char *label, int before)
}
return 0;
}
return 0;
+#else
+ NOT_AVAILABLE (-1);
+#endif
}
int
do_aug_rm (const char *path)
{
}
int
do_aug_rm (const char *path)
{
+#ifdef HAVE_AUGEAS
int r;
NEED_AUG (-1);
int r;
NEED_AUG (-1);
@@
-203,11
+244,15
@@
do_aug_rm (const char *path)
}
return r;
}
return r;
+#else
+ NOT_AVAILABLE (-1);
+#endif
}
int
do_aug_mv (const char *src, const char *dest)
{
}
int
do_aug_mv (const char *src, const char *dest)
{
+#ifdef HAVE_AUGEAS
int r;
NEED_AUG (-1);
int r;
NEED_AUG (-1);
@@
-219,11
+264,15
@@
do_aug_mv (const char *src, const char *dest)
}
return 0;
}
return 0;
+#else
+ NOT_AVAILABLE (-1);
+#endif
}
char **
do_aug_match (const char *path)
{
}
char **
do_aug_match (const char *path)
{
+#ifdef HAVE_AUGEAS
char **matches = NULL;
void *vp;
int r;
char **matches = NULL;
void *vp;
int r;
@@
-249,11
+298,15
@@
do_aug_match (const char *path)
matches[r] = NULL;
return matches; /* Caller frees. */
matches[r] = NULL;
return matches; /* Caller frees. */
+#else
+ NOT_AVAILABLE (NULL);
+#endif
}
int
do_aug_save (void)
{
}
int
do_aug_save (void)
{
+#ifdef HAVE_AUGEAS
NEED_AUG (-1);
if (aug_save (aug) == -1) {
NEED_AUG (-1);
if (aug_save (aug) == -1) {
@@
-262,11
+315,15
@@
do_aug_save (void)
}
return 0;
}
return 0;
+#else
+ NOT_AVAILABLE (-1);
+#endif
}
int
do_aug_load (void)
{
}
int
do_aug_load (void)
{
+#ifdef HAVE_AUG_LOAD
NEED_AUG (-1);
if (aug_load (aug) == -1) {
NEED_AUG (-1);
if (aug_load (aug) == -1) {
@@
-275,19
+332,23
@@
do_aug_load (void)
}
return 0;
}
return 0;
+#else
+ NOT_AVAILABLE (-1);
+#endif
}
/* Simpler version of aug-match, which also sorts the output. */
char **
do_aug_ls (const char *path)
{
}
/* Simpler version of aug-match, which also sorts the output. */
char **
do_aug_ls (const char *path)
{
+#ifdef HAVE_AUGEAS
char **matches;
char *buf;
int len;
NEED_AUG (NULL);
char **matches;
char *buf;
int len;
NEED_AUG (NULL);
- ABS_PATH (path, NULL);
+ ABS_PATH (path,
return
NULL);
len = strlen (path);
len = strlen (path);
@@
-316,6
+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. */
return matches; /* Caller frees. */
+#else
+ NOT_AVAILABLE (NULL);
+#endif
}
}