X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=uci.h;h=29cd07d0410e7e8c75d79717b87a402dfb2b844a;hp=8f4fa7125ac66edf0bbc0a832d4f25ed5e1e2605;hb=4e55f6b3829420be74d35db2e55bafb18ac8ce21;hpb=9f540f2106dcf724e4b8c41489d4bda6ccfe65d8

diff --git a/uci.h b/uci.h
index 8f4fa71..29cd07d 100644
--- a/uci.h
+++ b/uci.h
@@ -63,6 +63,7 @@ struct uci_section;
 struct uci_option;
 struct uci_history;
 struct uci_context;
+struct uci_backend;
 struct uci_parse_context;
 
 
@@ -136,13 +137,6 @@ extern int uci_load(struct uci_context *ctx, const char *name, struct uci_packag
 extern int uci_unload(struct uci_context *ctx, struct uci_package *p);
 
 /**
- * uci_cleanup: Clean up after an error
- *
- * @ctx: uci context
- */
-extern int uci_cleanup(struct uci_context *ctx);
-
-/**
  * uci_lookup: Look up an uci element
  *
  * @ctx: uci context
@@ -234,6 +228,8 @@ extern int uci_commit(struct uci_context *ctx, struct uci_package **p, bool over
 /**
  * uci_list_configs: List available uci config files
  * @ctx: uci context
+ *
+ * caller is responsible for freeing the allocated memory behind list
  */
 extern int uci_list_configs(struct uci_context *ctx, char ***list);
 
@@ -279,13 +275,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 {
@@ -302,6 +308,14 @@ struct uci_element
 	char *name;
 };
 
+struct uci_backend
+{
+	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 */
@@ -310,6 +324,10 @@ struct uci_context
 	/* parser context, use for error handling only */
 	struct uci_parse_context *pctx;
 
+	/* backend for import and export */
+	struct uci_backend *backend;
+	struct uci_list backends;
+
 	/* uci runtime flags */
 	enum uci_flags flags;
 
@@ -333,10 +351,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;
@@ -373,6 +393,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)
@@ -393,9 +425,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)
 
@@ -438,6 +467,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
@@ -446,6 +476,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",
@@ -466,12 +497,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)