make the value of an option optional (found by lubek)

[project/uci.git] / libuci.c

diff --git a/libuci.c b/libuci.c
index c0b4ab0..66e6d23 100644 (file)
--- a/libuci.c
+++ b/libuci.c
@@ -16,6 +16,7 @@
  * This file contains some common code for the uci library
  */
 
+#define _GNU_SOURCE
 #include <sys/types.h>
 #include <stdbool.h>
 #include <string.h>
@@ -24,18 +25,23 @@
 #include "uci.h"
 #include "err.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",
-       [UCI_ERR_INVAL] =    "Invalid argument",
-       [UCI_ERR_NOTFOUND] = "Entry not found",
-       [UCI_ERR_IO] =       "I/O error",
-       [UCI_ERR_PARSE] =    "Parse error",
-       [UCI_ERR_UNKNOWN] =  "Unknown error",
+       [UCI_OK] =            "Success",
+       [UCI_ERR_MEM] =       "Out of memory",
+       [UCI_ERR_INVAL] =     "Invalid argument",
+       [UCI_ERR_NOTFOUND] =  "Entry not found",
+       [UCI_ERR_IO] =        "I/O error",
+       [UCI_ERR_PARSE] =     "Parse error",
+       [UCI_ERR_DUPLICATE] = "Duplicate entry",
+       [UCI_ERR_UNKNOWN] =   "Unknown error",
 };
 
 #include "util.c"
 #include "list.c"
+#include "history.c"
 #include "file.c"
 
 /* exported functions */
@@ -46,6 +52,11 @@ struct uci_context *uci_alloc_context(void)
        ctx = (struct uci_context *) malloc(sizeof(struct uci_context));
        memset(ctx, 0, sizeof(struct uci_context));
        uci_list_init(&ctx->root);
+       uci_list_init(&ctx->history_path);
+       ctx->flags = UCI_FLAG_STRICT;
+
+       ctx->confdir = (char *) uci_confdir;
+       ctx->savedir = (char *) uci_savedir;
 
        return ctx;
 }
@@ -54,10 +65,20 @@ void uci_free_context(struct uci_context *ctx)
 {
        struct uci_element *e, *tmp;
 
+       if (ctx->confdir != uci_confdir)
+               free(ctx->confdir);
+       if (ctx->savedir != uci_savedir)
+               free(ctx->savedir);
+
        UCI_TRAP_SAVE(ctx, ignore);
+       ctx->internal = true;
        uci_cleanup(ctx);
        uci_foreach_element_safe(&ctx->root, tmp, e) {
-               uci_free_package(uci_to_package(e));
+               struct uci_package *p = uci_to_package(e);
+               uci_free_package(&p);
+       }
+       uci_foreach_element_safe(&ctx->history_path, tmp, e) {
+               uci_free_element(e);
        }
        free(ctx);
        UCI_TRAP_RESTORE(ctx);
@@ -66,6 +87,20 @@ ignore:
        return;
 }
 
+int uci_set_confdir(struct uci_context *ctx, const char *dir)
+{
+       char *cdir;
+
+       UCI_HANDLE_ERR(ctx);
+       UCI_ASSERT(ctx, dir != NULL);
+
+       cdir = uci_strdup(ctx, dir);
+       if (ctx->confdir != uci_confdir)
+               free(ctx->confdir);
+       ctx->confdir = cdir;
+       return 0;
+}
+
 int uci_cleanup(struct uci_context *ctx)
 {
        UCI_HANDLE_ERR(ctx);