X-Git-Url: http://git.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=libuci.c;h=4c2bf96f227ee427bce32266814d18178d8f4fc9;hp=947b029e970299fa99acabeb3f07ee6d9cc5ee6e;hb=11b494045cff856fee2acf109bcbe79e919e3aaa;hpb=c60702b55cf8efe9dcd359fc9aa8e9c7cd421ada diff --git a/libuci.c b/libuci.c index 947b029..4c2bf96 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,10 @@ #include #include #include +#include +#include #include "uci.h" -static const char *uci_confdir = UCI_CONFDIR; -static const char *uci_savedir = UCI_SAVEDIR; - static const char *uci_errstr[] = { [UCI_OK] = "Success", [UCI_ERR_MEM] = "Out of memory", @@ -38,13 +37,13 @@ static const char *uci_errstr[] = { [UCI_ERR_UNKNOWN] = "Unknown error", }; -static void uci_cleanup(struct uci_context *ctx); +static void uci_unload_plugin(struct uci_context *ctx, struct uci_plugin *p); #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) @@ -52,11 +51,16 @@ 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); + uci_list_init(&ctx->delta_path); uci_list_init(&ctx->backends); - ctx->flags = UCI_FLAG_STRICT | UCI_FLAG_SAVED_HISTORY; + 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; @@ -82,10 +86,13 @@ void uci_free_context(struct uci_context *ctx) 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); } UCI_TRAP_RESTORE(ctx); + uci_foreach_element_safe(&ctx->root, tmp, e) { + uci_unload_plugin(ctx, uci_to_plugin(e)); + } free(ctx); ignore: @@ -106,7 +113,7 @@ int uci_set_confdir(struct uci_context *ctx, const char *dir) return 0; } -static void uci_cleanup(struct uci_context *ctx) +__private void uci_cleanup(struct uci_context *ctx) { struct uci_parse_context *pctx; @@ -170,7 +177,7 @@ uci_get_errorstr(struct uci_context *ctx, char **dest, const char *prefix) if (dest) { err = asprintf(dest, format, (prefix ? prefix : ""), (prefix ? ": " : ""), - (ctx->func ? ctx->func : ""), (ctx->func ? ": " : ""), + (ctx && ctx->func ? ctx->func : ""), (ctx && ctx->func ? ": " : ""), uci_errstr[err], error_info); if (err < 0) @@ -179,7 +186,7 @@ uci_get_errorstr(struct uci_context *ctx, char **dest, const char *prefix) strcat(error_info, "\n"); fprintf(stderr, format, (prefix ? prefix : ""), (prefix ? ": " : ""), - (ctx->func ? ctx->func : ""), (ctx->func ? ": " : ""), + (ctx && ctx->func ? ctx->func : ""), (ctx && ctx->func ? ": " : ""), uci_errstr[err], error_info); } @@ -209,9 +216,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; @@ -280,3 +294,95 @@ 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; +}