X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=libuci.c;h=5b5db54718a5bb6dc20fc52ade8404397aa6a9f3;hp=a503699bd1bbf5298a2b994c7c6d030ca6194ada;hb=f1ae2ddc4ff16e541c46f595073bf277cd8f778a;hpb=68ced4fb649dd492c3f9af7119d00a4a638a32cb diff --git a/libuci.c b/libuci.c index a503699..5b5db54 100644 --- a/libuci.c +++ b/libuci.c @@ -137,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; @@ -193,18 +193,56 @@ int uci_load(struct uci_context *ctx, const char *name, struct uci_package **pac return 0; } -int uci_add_backend(struct uci_context *ctx, struct uci_backend *b) +#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); - uci_list_add(&ctx->backends, &b->e.list); + 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;