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

diff --git a/libuci.c b/libuci.c
index 4c2bf96..a9e70e8 100644
--- a/libuci.c
+++ b/libuci.c
@@ -37,8 +37,6 @@ static const char *uci_errstr[] = {
 	[UCI_ERR_UNKNOWN] =   "Unknown error",
 };
 
-static void uci_unload_plugin(struct uci_context *ctx, struct uci_plugin *p);
-
 #include "uci_internal.h"
 #include "list.c"
 
@@ -58,12 +56,11 @@ struct uci_context *uci_alloc_context(void)
 	uci_list_init(&ctx->root);
 	uci_list_init(&ctx->delta_path);
 	uci_list_init(&ctx->backends);
-	uci_list_init(&ctx->hooks);
-	uci_list_init(&ctx->plugins);
 	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;
@@ -90,9 +87,6 @@ void uci_free_context(struct uci_context *ctx)
 		uci_free_element(e);
 	}
 	UCI_TRAP_RESTORE(ctx);
-	uci_foreach_element_safe(&ctx->root, tmp, e) {
-		uci_unload_plugin(ctx, uci_to_plugin(e));
-	}
 	free(ctx);
 
 ignore:
@@ -216,72 +210,16 @@ int uci_commit(struct uci_context *ctx, struct uci_package **package, bool overw
 int uci_load(struct uci_context *ctx, const char *name, struct uci_package **package)
 {
 	struct uci_package *p;
-	struct uci_element *e;
 
 	UCI_HANDLE_ERR(ctx);
 	UCI_ASSERT(ctx, ctx->backend && ctx->backend->load);
 	p = ctx->backend->load(ctx, name);
-	uci_foreach_element(&ctx->hooks, e) {
-		struct uci_hook *h = uci_to_hook(e);
-		if (h->ops->load)
-			h->ops->load(h->ops, p);
-	}
 	if (package)
 		*package = p;
 
 	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;
@@ -294,95 +232,3 @@ int uci_set_backend(struct uci_context *ctx, const char *name)
 	ctx->backend = uci_to_backend(e);
 	return 0;
 }
-
-int uci_add_hook(struct uci_context *ctx, const struct uci_hook_ops *ops)
-{
-	struct uci_element *e;
-	struct uci_hook *h;
-
-	UCI_HANDLE_ERR(ctx);
-
-	/* check for duplicate elements */
-	uci_foreach_element(&ctx->hooks, e) {
-		h = uci_to_hook(e);
-		if (h->ops == ops)
-			return UCI_ERR_INVAL;
-	}
-
-	h = uci_alloc_element(ctx, hook, "", 0);
-	h->ops = ops;
-	uci_list_init(&h->e.list);
-	uci_list_add(&ctx->hooks, &h->e.list);
-
-	return 0;
-}
-
-int uci_remove_hook(struct uci_context *ctx, const struct uci_hook_ops *ops)
-{
-	struct uci_element *e;
-
-	uci_foreach_element(&ctx->hooks, e) {
-		struct uci_hook *h = uci_to_hook(e);
-		if (h->ops == ops) {
-			uci_list_del(&e->list);
-			uci_free_element(e);
-			return 0;
-		}
-	}
-	return UCI_ERR_NOTFOUND;
-}
-
-int uci_load_plugin(struct uci_context *ctx, const char *filename)
-{
-	struct uci_plugin *p;
-	const struct uci_plugin_ops *ops;
-	void *dlh;
-
-	UCI_HANDLE_ERR(ctx);
-	dlh = dlopen(filename, RTLD_GLOBAL|RTLD_NOW);
-	if (!dlh)
-		UCI_THROW(ctx, UCI_ERR_NOTFOUND);
-
-	ops = dlsym(dlh, "uci_plugin");
-	if (!ops || !ops->attach || (ops->attach(ctx) != 0)) {
-		if (!ops)
-			fprintf(stderr, "No ops\n");
-		else if (!ops->attach)
-			fprintf(stderr, "No attach\n");
-		else
-			fprintf(stderr, "Other weirdness\n");
-		dlclose(dlh);
-		UCI_THROW(ctx, UCI_ERR_INVAL);
-	}
-
-	p = uci_alloc_element(ctx, plugin, filename, 0);
-	p->dlh = dlh;
-	p->ops = ops;
-	uci_list_add(&ctx->plugins, &p->e.list);
-
-	return 0;
-}
-
-static void uci_unload_plugin(struct uci_context *ctx, struct uci_plugin *p)
-{
-	if (p->ops->detach)
-		p->ops->detach(ctx);
-	dlclose(p->dlh);
-	uci_free_element(&p->e);
-}
-
-int uci_load_plugins(struct uci_context *ctx, const char *pattern)
-{
-	glob_t gl;
-	int i;
-
-	if (!pattern)
-		pattern = UCI_PREFIX "/lib/uci_*.so";
-
-	memset(&gl, 0, sizeof(gl));
-	glob(pattern, 0, NULL, &gl);
-	for (i = 0; i < gl.gl_pathc; i++)
-		uci_load_plugin(ctx, gl.gl_pathv[i]);
-
-	return 0;
-}