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

diff --git a/libuci.c b/libuci.c
index 118289b..a9e70e8 100644
--- a/libuci.c
+++ b/libuci.c
@@ -9,7 +9,7 @@
  * 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.
  */
 
 /*
@@ -22,11 +22,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <dlfcn.h>
+#include <glob.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",
@@ -40,10 +38,10 @@ static const char *uci_errstr[] = {
 };
 
 #include "uci_internal.h"
-#include "util.c"
 #include "list.c"
-#include "history.c"
-#include "file.c"
+
+__private const char *uci_confdir = UCI_CONFDIR;
+__private const char *uci_savedir = UCI_SAVEDIR;
 
 /* exported functions */
 struct uci_context *uci_alloc_context(void)
@@ -51,13 +49,21 @@ struct uci_context *uci_alloc_context(void)
 	struct uci_context *ctx;
 
 	ctx = (struct uci_context *) malloc(sizeof(struct uci_context));
+	if (!ctx)
+		return NULL;
+
 	memset(ctx, 0, sizeof(struct uci_context));
 	uci_list_init(&ctx->root);
-	uci_list_init(&ctx->history_path);
-	ctx->flags = UCI_FLAG_STRICT;
+	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;
 }
@@ -71,18 +77,17 @@ void uci_free_context(struct uci_context *ctx)
 	if (ctx->savedir != uci_savedir)
 		free(ctx->savedir);
 
-	UCI_TRAP_SAVE(ctx, ignore);
-	ctx->internal = true;
 	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->history_path, tmp, e) {
+	uci_foreach_element_safe(&ctx->delta_path, tmp, e) {
 		uci_free_element(e);
 	}
-	free(ctx);
 	UCI_TRAP_RESTORE(ctx);
+	free(ctx);
 
 ignore:
 	return;
@@ -102,10 +107,9 @@ int uci_set_confdir(struct uci_context *ctx, const char *dir)
 	return 0;
 }
 
-int uci_cleanup(struct uci_context *ctx)
+__private void uci_cleanup(struct uci_context *ctx)
 {
 	struct uci_parse_context *pctx;
-	UCI_HANDLE_ERR(ctx);
 
 	if (ctx->buf) {
 		free(ctx->buf);
@@ -115,7 +119,7 @@ int uci_cleanup(struct uci_context *ctx)
 
 	pctx = ctx->pctx;
 	if (!pctx)
-		goto done;
+		return;
 
 	ctx->pctx = NULL;
 	if (pctx->package)
@@ -125,38 +129,106 @@ int uci_cleanup(struct uci_context *ctx)
 		free(pctx->buf);
 
 	free(pctx);
-done:
-	return 0;
 }
 
-void uci_perror(struct uci_context *ctx, const char *prefix)
+void
+uci_perror(struct uci_context *ctx, const char *str)
 {
+	uci_get_errorstr(ctx, NULL, 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;
 
-	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", 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\n", 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;
+}