X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=libuci.c;h=47c815a4e9e68480399aaf7e2b63b49ee70e07a3;hp=ccf29b7ca708f5d143bff88ca457acae90ed518a;hb=9487b850844e4fb873b90cf357c2d0367ebc065c;hpb=a652efc7675db8b2c0571899609b42e539162141

diff --git a/libuci.c b/libuci.c
index ccf29b7..47c815a 100644
--- a/libuci.c
+++ b/libuci.c
@@ -21,60 +21,17 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-
-#include "libuci.h"
+#include "uci.h"
 
 #define DEBUG
+#include "err.h"
 
-#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[] = {
+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",
 };
@@ -86,7 +43,7 @@ static char *uci_errstr[] = {
 static void *uci_malloc(struct uci_context *ctx, size_t size)
 {
 	void *ptr;
-	
+
 	ptr = malloc(size);
 	if (!ptr)
 		UCI_THROW(ctx, UCI_ERR_MEM);
@@ -107,25 +64,52 @@ static void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size)
 	return ptr;
 }
 
-#include "hash.c"
-#include "parse.c"
+/*
+ * 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 "list.c"
+#include "file.c"
 
 /* externally visible functions */
 
 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));
-	
+	uci_list_init(&ctx->root);
+
 	return ctx;
 }
 
+void uci_free(struct uci_context *ctx)
+{
+	struct uci_config *cfg;
+
+	uci_cleanup(ctx);
+	uci_foreach_entry(config, &ctx->root, cfg) {
+		uci_drop_config(cfg);
+	}
+	free(ctx);
+	return;
+}
+
 int uci_cleanup(struct uci_context *ctx)
 {
 	UCI_HANDLE_ERR(ctx);
-	uci_parse_cleanup(ctx);
+	uci_file_cleanup(ctx);
 	return 0;
 }
 
@@ -137,14 +121,14 @@ 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;
 
 	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 (%s) at line %d, byte %d\n", str, uci_errstr[err], (ctx->pctx->reason ? ctx->pctx->reason : "unknown"), ctx->pctx->line, ctx->pctx->byte);
 			break;
 		}
 		/* fall through */