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

diff --git a/libuci.c b/libuci.c
index 0dd81fe..569a676 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",
@@ -47,8 +51,12 @@ 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;
+
 	return ctx;
 }
 
@@ -56,10 +64,19 @@ void uci_free_context(struct uci_context *ctx)
 {
 	struct uci_element *e, *tmp;
 
+	if (ctx->confdir != uci_confdir)
+		free(ctx->confdir);
+	if (ctx->savedir != uci_savedir)
+		free(ctx->savedir);
+
 	UCI_TRAP_SAVE(ctx, ignore);
 	uci_cleanup(ctx);
 	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,6 +85,46 @@ 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;
+
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, dir != NULL);
+
+	cdir = uci_strdup(ctx, dir);
+	if (ctx->confdir != uci_confdir)
+		free(ctx->confdir);
+	ctx->confdir = cdir;
+	return 0;
+}
+
+int uci_set_savedir(struct uci_context *ctx, const char *dir)
+{
+	char *sdir;
+
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, dir != NULL);
+
+	sdir = uci_strdup(ctx, dir);
+	if (ctx->savedir != uci_savedir)
+		free(ctx->savedir);
+	ctx->savedir = sdir;
+	return 0;
+}
+
 int uci_cleanup(struct uci_context *ctx)
 {
 	UCI_HANDLE_ERR(ctx);