X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=libuci.c;h=a22019969e9de825d6f9bb8777774baf701e62a5;hp=0dd81fe3ba0f19bd2c28757ddb9aa2a95e398668;hb=7ca5c675d7dc21fa7767b64a42a1705bb800fc86;hpb=b7c461d025b6db1f9c3e0ce137863d9f912cdbfa

diff --git a/libuci.c b/libuci.c
index 0dd81fe..a220199 100644
--- a/libuci.c
+++ b/libuci.c
@@ -16,6 +16,7 @@
  * This file contains some common code for the uci library
  */
 
+#define _GNU_SOURCE
 #include <sys/types.h>
 #include <stdbool.h>
 #include <string.h>
@@ -24,6 +25,9 @@
 #include "uci.h"
 #include "err.h"
 
+static const char *uci_confdir = UCI_CONFDIR;
+static const char *uci_savedir = UCI_SAVEDIR;
+
 static const char *uci_errstr[] = {
 	[UCI_OK] =            "Success",
 	[UCI_ERR_MEM] =       "Out of memory",
@@ -35,8 +39,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 */
@@ -47,8 +55,13 @@ struct uci_context *uci_alloc_context(void)
 	ctx = (struct uci_context *) malloc(sizeof(struct uci_context));
 	memset(ctx, 0, sizeof(struct uci_context));
 	uci_list_init(&ctx->root);
+	uci_list_init(&ctx->history_path);
 	ctx->flags = UCI_FLAG_STRICT;
 
+	ctx->confdir = (char *) uci_confdir;
+	ctx->savedir = (char *) uci_savedir;
+	ctx->backend = &uci_file_backend;
+
 	return ctx;
 }
 
@@ -56,10 +69,19 @@ void uci_free_context(struct uci_context *ctx)
 {
 	struct uci_element *e, *tmp;
 
-	UCI_TRAP_SAVE(ctx, ignore);
+	if (ctx->confdir != uci_confdir)
+		free(ctx->confdir);
+	if (ctx->savedir != uci_savedir)
+		free(ctx->savedir);
+
 	uci_cleanup(ctx);
+	UCI_TRAP_SAVE(ctx, ignore);
 	uci_foreach_element_safe(&ctx->root, tmp, e) {
-		uci_free_package(uci_to_package(e));
+		struct uci_package *p = uci_to_package(e);
+		uci_free_package(&p);
+	}
+	uci_foreach_element_safe(&ctx->history_path, tmp, e) {
+		uci_free_element(e);
 	}
 	free(ctx);
 	UCI_TRAP_RESTORE(ctx);
@@ -68,13 +90,44 @@ ignore:
 	return;
 }
 
-int uci_cleanup(struct uci_context *ctx)
+int uci_set_confdir(struct uci_context *ctx, const char *dir)
 {
+	char *cdir;
+
 	UCI_HANDLE_ERR(ctx);
-	uci_file_cleanup(ctx);
+	UCI_ASSERT(ctx, dir != NULL);
+
+	cdir = uci_strdup(ctx, dir);
+	if (ctx->confdir != uci_confdir)
+		free(ctx->confdir);
+	ctx->confdir = cdir;
 	return 0;
 }
 
+static void uci_cleanup(struct uci_context *ctx)
+{
+	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)
 {
 	int err;
@@ -105,4 +158,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;
+}
+