X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=libuci.c;h=1cfe4ec87e6cd2aafe79f0e95f7c4c033d878dfd;hp=569a67688e0941d4d2fcef78dc28ab39be0fbea2;hb=a7b730e73b1714c7522283924174340877228748;hpb=96d35364c9159c96b164369d0d0c5147b0c73a24

diff --git a/libuci.c b/libuci.c
index 569a676..1cfe4ec 100644
--- a/libuci.c
+++ b/libuci.c
@@ -23,7 +23,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "uci.h"
-#include "err.h"
 
 static const char *uci_confdir = UCI_CONFDIR;
 static const char *uci_savedir = UCI_SAVEDIR;
@@ -39,8 +38,12 @@ static const char *uci_errstr[] = {
 	[UCI_ERR_UNKNOWN] =   "Unknown error",
 };
 
+static void uci_cleanup(struct uci_context *ctx);
+
+#include "uci_internal.h"
 #include "util.c"
 #include "list.c"
+#include "history.c"
 #include "file.c"
 
 /* exported functions */
@@ -52,11 +55,15 @@ struct uci_context *uci_alloc_context(void)
 	memset(ctx, 0, sizeof(struct uci_context));
 	uci_list_init(&ctx->root);
 	uci_list_init(&ctx->history_path);
-	ctx->flags = UCI_FLAG_STRICT;
+	uci_list_init(&ctx->backends);
+	ctx->flags = UCI_FLAG_STRICT | UCI_FLAG_SAVED_HISTORY;
 
 	ctx->confdir = (char *) uci_confdir;
 	ctx->savedir = (char *) uci_savedir;
 
+	uci_list_add(&ctx->backends, &uci_file_backend.e.list);
+	ctx->backend = &uci_file_backend;
+
 	return ctx;
 }
 
@@ -69,8 +76,8 @@ void uci_free_context(struct uci_context *ctx)
 	if (ctx->savedir != uci_savedir)
 		free(ctx->savedir);
 
-	UCI_TRAP_SAVE(ctx, ignore);
 	uci_cleanup(ctx);
+	UCI_TRAP_SAVE(ctx, ignore);
 	uci_foreach_element_safe(&ctx->root, tmp, e) {
 		struct uci_package *p = uci_to_package(e);
 		uci_free_package(&p);
@@ -78,25 +85,13 @@ void uci_free_context(struct uci_context *ctx)
 	uci_foreach_element_safe(&ctx->history_path, tmp, e) {
 		uci_free_element(e);
 	}
-	free(ctx);
 	UCI_TRAP_RESTORE(ctx);
+	free(ctx);
 
 ignore:
 	return;
 }
 
-int uci_add_history_path(struct uci_context *ctx, const char *dir)
-{
-	struct uci_element *e;
-
-	UCI_HANDLE_ERR(ctx);
-	UCI_ASSERT(ctx, dir != NULL);
-	e = uci_alloc_generic(ctx, UCI_TYPE_PATH, dir, sizeof(struct uci_element));
-	uci_list_add(&ctx->history_path, &e->list);
-
-	return 0;
-}
-
 int uci_set_confdir(struct uci_context *ctx, const char *dir)
 {
 	char *cdir;
@@ -111,25 +106,28 @@ int uci_set_confdir(struct uci_context *ctx, const char *dir)
 	return 0;
 }
 
-int uci_set_savedir(struct uci_context *ctx, const char *dir)
+static void uci_cleanup(struct uci_context *ctx)
 {
-	char *sdir;
+	struct uci_parse_context *pctx;
 
-	UCI_HANDLE_ERR(ctx);
-	UCI_ASSERT(ctx, dir != NULL);
+	if (ctx->buf) {
+		free(ctx->buf);
+		ctx->buf = NULL;
+		ctx->bufsz = 0;
+	}
 
-	sdir = uci_strdup(ctx, dir);
-	if (ctx->savedir != uci_savedir)
-		free(ctx->savedir);
-	ctx->savedir = sdir;
-	return 0;
-}
+	pctx = ctx->pctx;
+	if (!pctx)
+		return;
 
-int uci_cleanup(struct uci_context *ctx)
-{
-	UCI_HANDLE_ERR(ctx);
-	uci_file_cleanup(ctx);
-	return 0;
+	ctx->pctx = NULL;
+	if (pctx->package)
+		uci_free_package(&pctx->package);
+
+	if (pctx->buf)
+		free(pctx->buf);
+
+	free(pctx);
 }
 
 void uci_perror(struct uci_context *ctx, const char *prefix)
@@ -139,7 +137,7 @@ void uci_perror(struct uci_context *ctx, const char *prefix)
 	if (!ctx)
 		err = UCI_ERR_INVAL;
 	else
-		err = ctx->errno;
+		err = ctx->err;
 
 	if ((err < 0) || (err >= UCI_ERR_LAST))
 		err = UCI_ERR_UNKNOWN;
@@ -162,4 +160,98 @@ void uci_perror(struct uci_context *ctx, const char *prefix)
 	}
 }
 
+int uci_list_configs(struct uci_context *ctx, char ***list)
+{
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, list != NULL);
+	UCI_ASSERT(ctx, ctx->backend && ctx->backend->list_configs);
+	*list = ctx->backend->list_configs(ctx);
+	return 0;
+}
+
+int uci_commit(struct uci_context *ctx, struct uci_package **package, bool overwrite)
+{
+	struct uci_package *p;
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, package != NULL);
+	p = *package;
+	UCI_ASSERT(ctx, p != NULL);
+	UCI_ASSERT(ctx, p->backend && p->backend->commit);
+	p->backend->commit(ctx, package, overwrite);
+	return 0;
+}
+
+int uci_load(struct uci_context *ctx, const char *name, struct uci_package **package)
+{
+	struct uci_package *p;
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, ctx->backend && ctx->backend->load);
+	p = ctx->backend->load(ctx, name);
+	if (package)
+		*package = p;
+
+	return 0;
+}
+
+#ifdef UCI_PLUGIN_SUPPORT
+
+__plugin int uci_add_backend(struct uci_context *ctx, struct uci_backend *b)
+{
+	struct uci_element *e;
+	UCI_HANDLE_ERR(ctx);
+
+	e = uci_lookup_list(&ctx->backends, b->e.name);
+	if (e)
+		UCI_THROW(ctx, UCI_ERR_DUPLICATE);
+
+	e = uci_malloc(ctx, sizeof(struct uci_backend));
+	memcpy(e, b, sizeof(struct uci_backend));
+
+	uci_list_add(&ctx->backends, &e->list);
+	return 0;
+}
+
+__plugin int uci_del_backend(struct uci_context *ctx, struct uci_backend *b)
+{
+	struct uci_element *e, *tmp;
+
+	UCI_HANDLE_ERR(ctx);
+
+	e = uci_lookup_list(&ctx->backends, b->e.name);
+	if (!e || uci_to_backend(e)->ptr != b->ptr)
+		UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+	b = uci_to_backend(e);
+
+	if (ctx->backend && ctx->backend->ptr == b->ptr)
+		ctx->backend = &uci_file_backend;
+
+	uci_foreach_element_safe(&ctx->root, tmp, e) {
+		struct uci_package *p = uci_to_package(e);
+
+		if (!p->backend)
+			continue;
+
+		if (p->backend->ptr == b->ptr)
+			UCI_INTERNAL(uci_unload, ctx, p);
+	}
+
+	uci_list_del(&b->e.list);
+	free(b);
+
+	return 0;
+}
+
+#endif
 
+int uci_set_backend(struct uci_context *ctx, const char *name)
+{
+	struct uci_element *e;
+
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, name != NULL);
+	e = uci_lookup_list(&ctx->backends, name);
+	if (!e)
+		UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+	ctx->backend = uci_to_backend(e);
+	return 0;
+}