X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=libuci.c;h=1cfe4ec87e6cd2aafe79f0e95f7c4c033d878dfd;hp=50c17f92bb6bd19cc7fa763ff8e8ff0d6ce1d1d6;hb=12c5b22102873e303e540f886489831461d54ea9;hpb=53726f5dd57ab09a206c96108a71db25e7517caa

diff --git a/libuci.c b/libuci.c
index 50c17f9..1cfe4ec 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;
@@ -138,7 +137,7 @@ void uci_perror(struct uci_context *ctx, const char *prefix)
 	if (!ctx)
 		err = UCI_ERR_INVAL;
 	else
-		err = ctx->errno;
+		err = ctx->err;
 
 	if ((err < 0) || (err >= UCI_ERR_LAST))
 		err = UCI_ERR_UNKNOWN;
@@ -194,6 +193,56 @@ 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;