X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=libuci.c;h=b86c976b9daee96bba9ad775f07b49d0c42285ef;hp=c6335d5d8bbfa3333de04fe8e6c52b47a2a0401f;hb=c228bf838c82cc7cda868ac75f80d8aab203ca1a;hpb=8a3154a1db5078cf211c3ea76171956ba076dd76

diff --git a/libuci.c b/libuci.c
index c6335d5..b86c976 100644
--- a/libuci.c
+++ b/libuci.c
@@ -16,96 +16,89 @@
  * This file contains some common code for the uci library
  */
 
+#define _GNU_SOURCE
 #include <sys/types.h>
 #include <stdbool.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include "uci.h"
-
-#define DEBUG
 #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",
-	[UCI_ERR_INVAL] =    "Invalid argument",
-	[UCI_ERR_NOTFOUND] = "Entry not found",
-	[UCI_ERR_IO] =       "I/O error",
-	[UCI_ERR_PARSE] =    "Parse error",
-	[UCI_ERR_UNKNOWN] =  "Unknown error",
+	[UCI_OK] =            "Success",
+	[UCI_ERR_MEM] =       "Out of memory",
+	[UCI_ERR_INVAL] =     "Invalid argument",
+	[UCI_ERR_NOTFOUND] =  "Entry not found",
+	[UCI_ERR_IO] =        "I/O error",
+	[UCI_ERR_PARSE] =     "Parse error",
+	[UCI_ERR_DUPLICATE] = "Duplicate entry",
+	[UCI_ERR_UNKNOWN] =   "Unknown error",
 };
 
-
-/*
- * UCI wrapper for malloc, which uses exception handling
- */
-static void *uci_malloc(struct uci_context *ctx, size_t size)
-{
-	void *ptr;
-
-	ptr = malloc(size);
-	if (!ptr)
-		UCI_THROW(ctx, UCI_ERR_MEM);
-	memset(ptr, 0, size);
-
-	return ptr;
-}
-
-/*
- * UCI wrapper for realloc, which uses exception handling
- */
-static void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size)
-{
-	ptr = realloc(ptr, size);
-	if (!ptr)
-		UCI_THROW(ctx, UCI_ERR_MEM);
-
-	return ptr;
-}
-
-/*
- * UCI wrapper for strdup, which uses exception handling
- */
-static char *uci_strdup(struct uci_context *ctx, const char *str)
-{
-	char *ptr;
-
-	ptr = strdup(str);
-	if (!ptr)
-		UCI_THROW(ctx, UCI_ERR_MEM);
-
-	return ptr;
-}
-
+#include "util.c"
 #include "list.c"
 #include "file.c"
 
-/* externally visible functions */
-
-struct uci_context *uci_alloc(void)
+/* exported functions */
+struct uci_context *uci_alloc_context(void)
 {
 	struct uci_context *ctx;
 
 	ctx = (struct uci_context *) malloc(sizeof(struct uci_context));
 	memset(ctx, 0, sizeof(struct uci_context));
 	uci_list_init(&ctx->root);
+	ctx->flags = UCI_FLAG_STRICT;
+
+	ctx->confdir = (char *) uci_confdir;
+	ctx->savedir = (char *) uci_savedir;
 
 	return ctx;
 }
 
-void uci_free(struct uci_context *ctx)
+void uci_free_context(struct uci_context *ctx)
 {
-	struct uci_package *package;
+	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_entry(package, &ctx->root, package) {
-		uci_drop_config(package);
+	uci_foreach_element_safe(&ctx->root, tmp, e) {
+		struct uci_package *p = uci_to_package(e);
+		uci_free_package(&p);
 	}
 	free(ctx);
+	UCI_TRAP_RESTORE(ctx);
+
+ignore:
 	return;
 }
 
+int uci_set_confdir(struct uci_context *ctx, char *dir)
+{
+	dir = uci_strdup(ctx, dir);
+	if (ctx->confdir != uci_confdir)
+		free(ctx->confdir);
+	ctx->confdir = dir;
+	return 0;
+}
+
+int uci_set_savedir(struct uci_context *ctx, char *dir)
+{
+	dir = uci_strdup(ctx, dir);
+	if (ctx->savedir != uci_savedir)
+		free(ctx->savedir);
+	ctx->savedir = dir;
+	return 0;
+}
+
 int uci_cleanup(struct uci_context *ctx)
 {
 	UCI_HANDLE_ERR(ctx);
@@ -113,7 +106,7 @@ int uci_cleanup(struct uci_context *ctx)
 	return 0;
 }
 
-void uci_perror(struct uci_context *ctx, const char *str)
+void uci_perror(struct uci_context *ctx, const char *prefix)
 {
 	int err;
 
@@ -125,15 +118,20 @@ void uci_perror(struct uci_context *ctx, const char *str)
 	if ((err < 0) || (err >= UCI_ERR_LAST))
 		err = UCI_ERR_UNKNOWN;
 
+	if (prefix)
+		fprintf(stderr, "%s: ", prefix);
+	if (ctx->func)
+		fprintf(stderr, "%s: ", ctx->func);
+
 	switch (err) {
 	case UCI_ERR_PARSE:
 		if (ctx->pctx) {
-			fprintf(stderr, "%s: %s (%s) at line %d, byte %d\n", str, uci_errstr[err], (ctx->pctx->reason ? ctx->pctx->reason : "unknown"), ctx->pctx->line, ctx->pctx->byte);
+			fprintf(stderr, "%s (%s) at line %d, byte %d\n", uci_errstr[err], (ctx->pctx->reason ? ctx->pctx->reason : "unknown"), ctx->pctx->line, ctx->pctx->byte);
 			break;
 		}
 		/* fall through */
 	default:
-		fprintf(stderr, "%s: %s\n", str, uci_errstr[err]);
+		fprintf(stderr, "%s\n", uci_errstr[err]);
 		break;
 	}
 }