X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=libuci.c;h=29dab12e585fb2741529c75c7c6e397870e1663f;hp=da2d15e708d7a171f0a39a3d363f169da064abb6;hb=493cf35e3fd4771e538fc230a478c417e7810ed4;hpb=c90d9cb8ba073d1c98e61591303aa96300750940

diff --git a/libuci.c b/libuci.c
index da2d15e..29dab12 100644
--- a/libuci.c
+++ b/libuci.c
@@ -23,7 +23,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "uci.h"
-#include "err.h"
 
 static const char *uci_confdir = UCI_CONFDIR;
 static const char *uci_savedir = UCI_SAVEDIR;
@@ -57,7 +56,7 @@ struct uci_context *uci_alloc_context(void)
 	uci_list_init(&ctx->root);
 	uci_list_init(&ctx->history_path);
 	uci_list_init(&ctx->backends);
-	ctx->flags = UCI_FLAG_STRICT;
+	ctx->flags = UCI_FLAG_STRICT | UCI_FLAG_SAVED_HISTORY;
 
 	ctx->confdir = (char *) uci_confdir;
 	ctx->savedir = (char *) uci_savedir;
@@ -86,8 +85,8 @@ void uci_free_context(struct uci_context *ctx)
 	uci_foreach_element_safe(&ctx->history_path, tmp, e) {
 		uci_free_element(e);
 	}
-	free(ctx);
 	UCI_TRAP_RESTORE(ctx);
+	free(ctx);
 
 ignore:
 	return;
@@ -131,34 +130,55 @@ static void uci_cleanup(struct uci_context *ctx)
 	free(pctx);
 }
 
-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\n"; /* 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), " (%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)
+		asprintf(dest, format,
+			(prefix ? prefix : ""), (prefix ? ": " : ""),
+			(ctx->func ? ctx->func : ""), (ctx->func ? ": " : ""),
+			uci_errstr[err],
+			error_info);
+	else
+		fprintf(stderr, format,
+			(prefix ? prefix : ""), (prefix ? ": " : ""),
+			(ctx->func ? ctx->func : ""), (ctx->func ? ": " : ""),
+			uci_errstr[err],
+			error_info);
 }
 
 int uci_list_configs(struct uci_context *ctx, char ***list)
@@ -172,11 +192,13 @@ int uci_list_configs(struct uci_context *ctx, char ***list)
 
 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);
-	UCI_ASSERT(ctx, *package != NULL);
-	UCI_ASSERT(ctx, ctx->backend && ctx->backend->commit);
-	ctx->backend->commit(ctx, package, overwrite);
+	p = *package;
+	UCI_ASSERT(ctx, p != NULL);
+	UCI_ASSERT(ctx, p->backend && p->backend->commit);
+	p->backend->commit(ctx, package, overwrite);
 	return 0;
 }
 
@@ -192,4 +214,65 @@ int uci_load(struct uci_context *ctx, const char *name, struct uci_package **pac
 	return 0;
 }
 
+#ifdef UCI_PLUGIN_SUPPORT
+
+__plugin int uci_add_backend(struct uci_context *ctx, struct uci_backend *b)
+{
+	struct uci_element *e;
+	UCI_HANDLE_ERR(ctx);
+
+	e = uci_lookup_list(&ctx->backends, b->e.name);
+	if (e)
+		UCI_THROW(ctx, UCI_ERR_DUPLICATE);
+
+	e = uci_malloc(ctx, sizeof(struct uci_backend));
+	memcpy(e, b, sizeof(struct uci_backend));
+
+	uci_list_add(&ctx->backends, &e->list);
+	return 0;
+}
+
+__plugin int uci_del_backend(struct uci_context *ctx, struct uci_backend *b)
+{
+	struct uci_element *e, *tmp;
 
+	UCI_HANDLE_ERR(ctx);
+
+	e = uci_lookup_list(&ctx->backends, b->e.name);
+	if (!e || uci_to_backend(e)->ptr != b->ptr)
+		UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+	b = uci_to_backend(e);
+
+	if (ctx->backend && ctx->backend->ptr == b->ptr)
+		ctx->backend = &uci_file_backend;
+
+	uci_foreach_element_safe(&ctx->root, tmp, e) {
+		struct uci_package *p = uci_to_package(e);
+
+		if (!p->backend)
+			continue;
+
+		if (p->backend->ptr == b->ptr)
+			UCI_INTERNAL(uci_unload, ctx, p);
+	}
+
+	uci_list_del(&b->e.list);
+	free(b);
+
+	return 0;
+}
+
+#endif
+
+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;
+}