X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=libuci.c;h=a9e70e883ee3d55009bc3fe01edc87ae24733194;hp=cb0bc360ab442ee1b0cc4617c6b3674d945df212;hb=021fd65643a7932dc67ebeb2291264e308432428;hpb=a1ce94eed364952e8998def4e964ecb6b33b977d

diff --git a/libuci.c b/libuci.c
index cb0bc36..a9e70e8 100644
--- a/libuci.c
+++ b/libuci.c
@@ -9,106 +9,151 @@
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
  */
 
 /*
  * 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 <dlfcn.h>
+#include <glob.h>
 #include "uci.h"
 
-#define DEBUG
-#include "err.h"
-
 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",
 };
 
+#include "uci_internal.h"
+#include "list.c"
 
-/*
- * UCI wrapper for malloc, which uses exception handling
- */
-static void *uci_malloc(struct uci_context *ctx, size_t size)
+__private const char *uci_confdir = UCI_CONFDIR;
+__private const char *uci_savedir = UCI_SAVEDIR;
+
+/* exported functions */
+struct uci_context *uci_alloc_context(void)
 {
-	void *ptr;
+	struct uci_context *ctx;
 
-	ptr = malloc(size);
-	if (!ptr)
-		UCI_THROW(ctx, UCI_ERR_MEM);
-	memset(ptr, 0, size);
+	ctx = (struct uci_context *) malloc(sizeof(struct uci_context));
+	if (!ctx)
+		return NULL;
 
-	return ptr;
+	memset(ctx, 0, sizeof(struct uci_context));
+	uci_list_init(&ctx->root);
+	uci_list_init(&ctx->delta_path);
+	uci_list_init(&ctx->backends);
+	ctx->flags = UCI_FLAG_STRICT | UCI_FLAG_SAVED_DELTA;
+
+	ctx->confdir = (char *) uci_confdir;
+	ctx->savedir = (char *) uci_savedir;
+	uci_add_delta_path(ctx, uci_savedir);
+
+	uci_list_add(&ctx->backends, &uci_file_backend.e.list);
+	ctx->backend = &uci_file_backend;
+
+	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_cleanup(ctx);
+	UCI_TRAP_SAVE(ctx, ignore);
+	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->delta_path, tmp, e) {
+		uci_free_element(e);
+	}
+	UCI_TRAP_RESTORE(ctx);
+	free(ctx);
 
-	return ptr;
+ignore:
+	return;
 }
 
-/*
- * UCI wrapper for strdup, which uses exception handling
- */
-static char *uci_strdup(struct uci_context *ctx, const char *str)
+int uci_set_confdir(struct uci_context *ctx, const char *dir)
 {
-	char *ptr;
+	char *cdir;
 
-	ptr = strdup(str);
-	if (!ptr)
-		UCI_THROW(ctx, UCI_ERR_MEM);
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, dir != NULL);
 
-	return ptr;
+	cdir = uci_strdup(ctx, dir);
+	if (ctx->confdir != uci_confdir)
+		free(ctx->confdir);
+	ctx->confdir = cdir;
+	return 0;
 }
 
-#include "list.c"
-#include "parse.c"
+__private void uci_cleanup(struct uci_context *ctx)
+{
+	struct uci_parse_context *pctx;
 
-/* externally visible functions */
+	if (ctx->buf) {
+		free(ctx->buf);
+		ctx->buf = NULL;
+		ctx->bufsz = 0;
+	}
 
-struct uci_context *uci_alloc(void)
-{
-	struct uci_context *ctx;
+	pctx = ctx->pctx;
+	if (!pctx)
+		return;
 
-	ctx = (struct uci_context *) malloc(sizeof(struct uci_context));
-	memset(ctx, 0, sizeof(struct uci_context));
-	uci_list_init(&ctx->root);
+	ctx->pctx = NULL;
+	if (pctx->package)
+		uci_free_package(&pctx->package);
 
-	return ctx;
+	if (pctx->buf)
+		free(pctx->buf);
+
+	free(pctx);
 }
 
-int uci_cleanup(struct uci_context *ctx)
+void
+uci_perror(struct uci_context *ctx, const char *str)
 {
-	UCI_HANDLE_ERR(ctx);
-	uci_parse_cleanup(ctx);
-	return 0;
+	uci_get_errorstr(ctx, NULL, str);
 }
 
-void uci_perror(struct uci_context *ctx, const char *str)
+void
+uci_get_errorstr(struct uci_context *ctx, char **dest, const char *prefix)
 {
+	static char error_info[128];
 	int err;
+	const char *format =
+		"%s%s" /* prefix */
+		"%s%s" /* function */
+		"%s" /* error */
+		"%s"; /* details */
+
+	error_info[0] = 0;
 
 	if (!ctx)
 		err = UCI_ERR_INVAL;
 	else
-		err = ctx->errno;
+		err = ctx->err;
 
 	if ((err < 0) || (err >= UCI_ERR_LAST))
 		err = UCI_ERR_UNKNOWN;
@@ -116,14 +161,74 @@ void uci_perror(struct uci_context *ctx, const char *str)
 	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);
+			snprintf(error_info, sizeof(error_info) - 1, " (%s) at line %d, byte %d", (ctx->pctx->reason ? ctx->pctx->reason : "unknown"), ctx->pctx->line, ctx->pctx->byte);
 			break;
 		}
-		/* fall through */
+		break;
 	default:
-		fprintf(stderr, "%s: %s\n", str, uci_errstr[err]);
 		break;
 	}
+	if (dest) {
+		err = asprintf(dest, format,
+			(prefix ? prefix : ""), (prefix ? ": " : ""),
+			(ctx && ctx->func ? ctx->func : ""), (ctx && ctx->func ? ": " : ""),
+			uci_errstr[err],
+			error_info);
+		if (err < 0)
+			*dest = NULL;
+	} else {
+		strcat(error_info, "\n");
+		fprintf(stderr, format,
+			(prefix ? prefix : ""), (prefix ? ": " : ""),
+			(ctx && ctx->func ? ctx->func : ""), (ctx && ctx->func ? ": " : ""),
+			uci_errstr[err],
+			error_info);
+	}
 }
 
+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)
+{
+	struct uci_package *p;
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, package != NULL);
+	p = *package;
+	UCI_ASSERT(ctx, p != NULL);
+	UCI_ASSERT(ctx, p->backend && p->backend->commit);
+	p->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;
+}
+
+int uci_set_backend(struct uci_context *ctx, const char *name)
+{
+	struct uci_element *e;
+
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, name != NULL);
+	e = uci_lookup_list(&ctx->backends, name);
+	if (!e)
+		UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+	ctx->backend = uci_to_backend(e);
+	return 0;
+}