X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=libuci.c;h=a503699bd1bbf5298a2b994c7c6d030ca6194ada;hp=a22019969e9de825d6f9bb8777774baf701e62a5;hb=406d259cd1faab6de1ee2b817970c9f71d7945a2;hpb=80e2e58f4e4c0d8ff492281fa998d550a85b4d92 diff --git a/libuci.c b/libuci.c index a220199..a503699 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; @@ -56,10 +55,13 @@ struct uci_context *uci_alloc_context(void) memset(ctx, 0, sizeof(struct uci_context)); uci_list_init(&ctx->root); uci_list_init(&ctx->history_path); + uci_list_init(&ctx->backends); ctx->flags = UCI_FLAG_STRICT; ctx->confdir = (char *) uci_confdir; ctx->savedir = (char *) uci_savedir; + + uci_list_add(&ctx->backends, &uci_file_backend.e.list); ctx->backend = &uci_file_backend; return ctx; @@ -169,11 +171,13 @@ int uci_list_configs(struct uci_context *ctx, char ***list) int uci_commit(struct uci_context *ctx, struct uci_package **package, bool overwrite) { + struct uci_package *p; UCI_HANDLE_ERR(ctx); UCI_ASSERT(ctx, package != NULL); - UCI_ASSERT(ctx, *package != NULL); - UCI_ASSERT(ctx, ctx->backend && ctx->backend->commit); - ctx->backend->commit(ctx, package, overwrite); + p = *package; + UCI_ASSERT(ctx, p != NULL); + UCI_ASSERT(ctx, p->backend && p->backend->commit); + p->backend->commit(ctx, package, overwrite); return 0; } @@ -189,4 +193,27 @@ 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) +{ + 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); + return 0; +} + +int uci_set_backend(struct uci_context *ctx, const char *name) +{ + struct uci_element *e; + UCI_HANDLE_ERR(ctx); + UCI_ASSERT(ctx, name != NULL); + e = uci_lookup_list(&ctx->backends, name); + if (!e) + UCI_THROW(ctx, UCI_ERR_NOTFOUND); + ctx->backend = uci_to_backend(e); + return 0; +}