X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=libuci.c;h=7805d746f01197582e2d7c453471616212a83394;hp=66b702d6da81cb24a0252d29f898a7c35f6368c4;hb=031b620e1f3a16078da45ce00352508764902786;hpb=d5b661a39ea9320c58f44cb4b32691deffc7cb30

diff --git a/libuci.c b/libuci.c
index 66b702d..7805d74 100644
--- a/libuci.c
+++ b/libuci.c
@@ -16,118 +16,100 @@
  * This file contains some common code for the uci library
  */
 
+#define _GNU_SOURCE
 #include <sys/types.h>
-#include <stdio.h>
+#include <stdbool.h>
 #include <string.h>
 #include <stdlib.h>
-#include "libuci.h"
-
-#define DEBUG
-
-#ifdef DEBUG
-#define DPRINTF(...) fprintf(stderr, __VA_ARGS__)
-#else
-#define DPRINTF(...)
-#endif
-/* 
- * throw an uci exception and store the error number
- * in the context.
- */
-#define UCI_THROW(ctx, err) do { 	\
-	longjmp(ctx->trap, err); 	\
-} while (0)
-
-/*
- * store the return address for handling exceptions
- * needs to be called in every externally visible library function
- *
- * NB: this does not handle recursion at all. Calling externally visible
- * functions from other uci functions is only allowed at the end of the
- * calling function.
- */
-#define UCI_HANDLE_ERR(ctx) do { 		\
-	int __val;			\
-	if (!ctx)			\
-		return UCI_ERR_INVAL;	\
-	__val = setjmp(ctx->trap);	\
-	if (__val) {			\
-		ctx->errno = __val;	\
-		return __val;		\
-	}				\
-} while (0)
-
-/*
- * check the specified condition.
- * throw an invalid argument exception if it's false
- */
-#define UCI_ASSERT(ctx, expr) do {	\
-	if (!(expr)) {			\
-		DPRINTF("[%s:%d] Assertion failed\n", __FILE__, __LINE__); \
-		UCI_THROW(ctx, UCI_ERR_INVAL);	\
-	}				\
-} while (0)
-
-
-static 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_PARSE] =    "Parse error",
-	[UCI_ERR_UNKNOWN] =  "Unknown error",
+#include <stdio.h>
+#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",
+	[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",
 };
 
+#include "uci_internal.h"
+#include "util.c"
+#include "list.c"
+#include "history.c"
+#include "file.c"
 
-/*
- * UCI wrapper for malloc, which uses exception handling
- */
-static void *uci_malloc(struct uci_context *ctx, size_t size)
+/* exported functions */
+struct uci_context *uci_alloc_context(void)
 {
-	void *ptr;
-	
-	ptr = malloc(size);
-	if (!ptr)
-		UCI_THROW(ctx, UCI_ERR_MEM);
-	memset(ptr, 0, size);
-
-	return ptr;
+	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);
+	uci_list_init(&ctx->history_path);
+	ctx->flags = UCI_FLAG_STRICT;
+
+	ctx->confdir = (char *) uci_confdir;
+	ctx->savedir = (char *) uci_savedir;
+
+	return ctx;
 }
 
-/*
- * UCI wrapper for realloc, which uses exception handling
- */
-static void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size)
+void uci_free_context(struct uci_context *ctx)
 {
-	ptr = realloc(ptr, size);
-	if (!ptr)
-		UCI_THROW(ctx, UCI_ERR_MEM);
+	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);
+	ctx->internal = true;
+	uci_cleanup(ctx);
+	uci_foreach_element_safe(&ctx->root, tmp, 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);
 
-	return ptr;
+ignore:
+	return;
 }
 
-#include "hash.c"
-#include "parse.c"
+int uci_set_confdir(struct uci_context *ctx, const char *dir)
+{
+	char *cdir;
 
-/* externally visible functions */
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, dir != NULL);
 
-struct uci_context *uci_alloc(void)
-{
-	struct uci_context *ctx;
-	
-	ctx = (struct uci_context *) malloc(sizeof(struct uci_context));
-	memset(ctx, 0, sizeof(struct uci_context));
-	
-	return ctx;
+	cdir = uci_strdup(ctx, dir);
+	if (ctx->confdir != uci_confdir)
+		free(ctx->confdir);
+	ctx->confdir = cdir;
+	return 0;
 }
 
 int uci_cleanup(struct uci_context *ctx)
 {
 	UCI_HANDLE_ERR(ctx);
-	uci_parse_cleanup(ctx);
+	uci_file_cleanup(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;
 
@@ -135,19 +117,24 @@ void uci_perror(struct uci_context *ctx, const char *str)
 		err = UCI_ERR_INVAL;
 	else
 		err = ctx->errno;
-	
+
 	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 at line %d, byte %d\n", str, uci_errstr[err], 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;
 	}
 }