X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=uci.h;h=674981c8f369685ecc894ef843a34e91c02fc1a6;hp=44f947f615267a6d1dd65fb33909582102cbb16c;hb=406d259cd1faab6de1ee2b817970c9f71d7945a2;hpb=0731533959779889ceff15f068c31031bc77f003

diff --git a/uci.h b/uci.h
index 44f947f..674981c 100644
--- a/uci.h
+++ b/uci.h
@@ -15,6 +15,8 @@
 #ifndef __LIBUCI_H
 #define __LIBUCI_H
 
+#include "uci_config.h"
+
 /*
  * you can use these defines to enable debugging behavior for
  * apps compiled against libuci:
@@ -24,11 +26,6 @@
  *
  */
 
-#ifdef DEBUG_ALL
-#define UCI_DEBUG
-#define UCI_DEBUG_TYPECAST
-#endif
-
 #include <stdbool.h>
 #include <setjmp.h>
 #include <stdio.h>
@@ -275,13 +272,23 @@ extern int uci_revert(struct uci_context *ctx, struct uci_package **p, char *sec
  */
 extern int uci_parse_argument(struct uci_context *ctx, FILE *stream, char **str, char **result);
 
+/**
+ * uci_set_backend: change the default backend
+ * @ctx: uci context
+ * @name: name of the backend
+ *
+ * The default backend is "file", which uses /etc/config for config storage
+ */
+extern int uci_set_backend(struct uci_context *ctx, const char *name);
+
 /* UCI data structures */
 enum uci_type {
 	UCI_TYPE_HISTORY = 0,
 	UCI_TYPE_PACKAGE = 1,
 	UCI_TYPE_SECTION = 2,
 	UCI_TYPE_OPTION = 3,
-	UCI_TYPE_PATH = 4
+	UCI_TYPE_PATH = 4,
+	UCI_TYPE_BACKEND = 5,
 };
 
 enum uci_flags {
@@ -300,13 +307,12 @@ struct uci_element
 
 struct uci_backend
 {
-	const char *name;
+	struct uci_element e;
 	char **(*list_configs)(struct uci_context *ctx);
 	struct uci_package *(*load)(struct uci_context *ctx, const char *name);
 	void (*commit)(struct uci_context *ctx, struct uci_package **p, bool overwrite);
 };
 
-
 struct uci_context
 {
 	/* list of config packages */
@@ -317,6 +323,7 @@ struct uci_context
 
 	/* backend for import and export */
 	struct uci_backend *backend;
+	struct uci_list backends;
 
 	/* uci runtime flags */
 	enum uci_flags flags;
@@ -341,11 +348,12 @@ struct uci_package
 	struct uci_element e;
 	struct uci_list sections;
 	struct uci_context *ctx;
-	bool confdir;
+	bool has_history;
 	char *path;
 
 	/* private: */
 	struct uci_backend *backend;
+	void *priv;
 	int n_section;
 	struct uci_list history;
 	struct uci_list saved_history;
@@ -382,6 +390,18 @@ struct uci_history
 	char *value;
 };
 
+#define UCI_BACKEND(_var, _name, ...)	\
+struct uci_backend _var = {		\
+	.e.list = {			\
+		.next = &_var.e.list,	\
+		.prev = &_var.e.list,	\
+	},				\
+	.e.name = _name,		\
+	.e.type = UCI_TYPE_BACKEND,	\
+	__VA_ARGS__			\
+}
+
+
 /* linked list handling */
 #ifndef offsetof
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
@@ -402,9 +422,6 @@ struct uci_history
  * @_type: config, section or option
  * @_ptr: pointer to the uci_list struct
  */
-#define element_to(type, ptr) \
-	container_of(ptr, struct uci_ ## type, e)
-
 #define list_to_element(ptr) \
 	container_of(ptr, struct uci_element, list)
 
@@ -447,6 +464,7 @@ struct uci_history
 #define uci_list_empty(list) ((list)->next == (list))
 
 /* wrappers for dynamic type handling */
+#define uci_type_backend UCI_TYPE_BACKEND
 #define uci_type_history UCI_TYPE_HISTORY
 #define uci_type_package UCI_TYPE_PACKAGE
 #define uci_type_section UCI_TYPE_SECTION
@@ -455,6 +473,7 @@ struct uci_history
 /* element typecasting */
 #ifdef UCI_DEBUG_TYPECAST
 static const char *uci_typestr[] = {
+	[uci_type_backend] = "backend",
 	[uci_type_history] = "history",
 	[uci_type_package] = "package",
 	[uci_type_section] = "section",
@@ -475,12 +494,14 @@ static void uci_typecast_error(int from, int to)
 		return (struct uci_ ## _type *) e; \
 	}
 
+BUILD_CAST(backend)
 BUILD_CAST(history)
 BUILD_CAST(package)
 BUILD_CAST(section)
 BUILD_CAST(option)
 
 #else
+#define uci_to_backend(ptr) container_of(ptr, struct uci_backend, e)
 #define uci_to_history(ptr) container_of(ptr, struct uci_history, e)
 #define uci_to_package(ptr) container_of(ptr, struct uci_package, e)
 #define uci_to_section(ptr) container_of(ptr, struct uci_section, e)