load the saved history by default to make things easier for the lua binding

[project/uci.git] / libuci.c

diff --git a/libuci.c b/libuci.c
index a220199..5872ae4 100644 (file)
--- a/libuci.c
+++ b/libuci.c
@@ -23,7 +23,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #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);
-       ctx->flags = UCI_FLAG_STRICT;
+       uci_list_init(&ctx->backends);
+       ctx->flags = UCI_FLAG_STRICT | UCI_FLAG_SAVED_HISTORY;
 
        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;
@@ -135,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;
@@ -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,65 @@ 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;
+
+       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;
+}