X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=libuci.c;h=5b5db54718a5bb6dc20fc52ade8404397aa6a9f3;hp=50c17f92bb6bd19cc7fa763ff8e8ff0d6ce1d1d6;hb=8032b67176854a7dcd37d3ded33a37e8e87c08bf;hpb=53726f5dd57ab09a206c96108a71db25e7517caa diff --git a/libuci.c b/libuci.c index 50c17f9..5b5db54 100644 --- a/libuci.c +++ b/libuci.c @@ -23,7 +23,6 @@ #include #include #include "uci.h" -#include "err.h" static const char *uci_confdir = UCI_CONFDIR; static const char *uci_savedir = UCI_SAVEDIR; @@ -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;