X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=libuci.c;h=da2d15e708d7a171f0a39a3d363f169da064abb6;hp=7805d746f01197582e2d7c453471616212a83394;hb=c90d9cb8ba073d1c98e61591303aa96300750940;hpb=14654223268133b5e74ee1748cec2374664ac5bf;ds=sidebyside

diff --git a/libuci.c b/libuci.c
index 7805d74..da2d15e 100644
--- a/libuci.c
+++ b/libuci.c
@@ -39,6 +39,8 @@ 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"
@@ -54,11 +56,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);
+	uci_list_init(&ctx->backends);
 	ctx->flags = UCI_FLAG_STRICT;
 
 	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;
 }
 
@@ -71,9 +77,8 @@ void uci_free_context(struct uci_context *ctx)
 	if (ctx->savedir != uci_savedir)
 		free(ctx->savedir);
 
-	UCI_TRAP_SAVE(ctx, ignore);
-	ctx->internal = true;
 	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);
@@ -102,11 +107,28 @@ int uci_set_confdir(struct uci_context *ctx, const char *dir)
 	return 0;
 }
 
-int uci_cleanup(struct uci_context *ctx)
+static void uci_cleanup(struct uci_context *ctx)
 {
-	UCI_HANDLE_ERR(ctx);
-	uci_file_cleanup(ctx);
-	return 0;
+	struct uci_parse_context *pctx;
+
+	if (ctx->buf) {
+		free(ctx->buf);
+		ctx->buf = NULL;
+		ctx->bufsz = 0;
+	}
+
+	pctx = ctx->pctx;
+	if (!pctx)
+		return;
+
+	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,4 +161,35 @@ 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)
+{
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, package != NULL);
+	UCI_ASSERT(ctx, *package != NULL);
+	UCI_ASSERT(ctx, ctx->backend && ctx->backend->commit);
+	ctx->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;
+}
+