add history search path

[project/uci.git] / libuci.c

diff --git a/libuci.c b/libuci.c
index ada75c0..569a676 100644 (file)
--- a/libuci.c
+++ b/libuci.c
@@ -16,104 +16,123 @@
  * This file contains some common code for the uci library
  */
 
+#define _GNU_SOURCE
 #include <sys/types.h>
 #include <stdbool.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include "uci.h"
-
-#define DEBUG
 #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 "file.c"
 
-/*
- * UCI wrapper for malloc, which uses exception handling
- */
-static void *uci_malloc(struct uci_context *ctx, size_t size)
+/* exported functions */
+struct uci_context *uci_alloc_context(void)
 {
-       void *ptr;
+       struct uci_context *ctx;
 
-       ptr = malloc(size);
-       if (!ptr)
-               UCI_THROW(ctx, UCI_ERR_MEM);
-       memset(ptr, 0, size);
+       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;
 
-       return ptr;
+       ctx->confdir = (char *) uci_confdir;
+       ctx->savedir = (char *) uci_savedir;
+
+       return ctx;
 }
 
-/*
- * UCI wrapper for realloc, which uses exception handling
- */
-static void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size)
+void uci_free_context(struct uci_context *ctx)
 {
-       ptr = realloc(ptr, size);
-       if (!ptr)
-               UCI_THROW(ctx, UCI_ERR_MEM);
+       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);
+       uci_cleanup(ctx);
+       uci_foreach_element_safe(&ctx->root, tmp, 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);
 
-       return ptr;
+ignore:
+       return;
 }
 
-/*
- * UCI wrapper for strdup, which uses exception handling
- */
-static char *uci_strdup(struct uci_context *ctx, const char *str)
+int uci_add_history_path(struct uci_context *ctx, const char *dir)
 {
-       char *ptr;
+       struct uci_element *e;
 
-       ptr = strdup(str);
-       if (!ptr)
-               UCI_THROW(ctx, UCI_ERR_MEM);
+       UCI_HANDLE_ERR(ctx);
+       UCI_ASSERT(ctx, dir != NULL);
+       e = uci_alloc_generic(ctx, UCI_TYPE_PATH, dir, sizeof(struct uci_element));
+       uci_list_add(&ctx->history_path, &e->list);
 
-       return ptr;
+       return 0;
 }
 
-#include "list.c"
-#include "parse.c"
-
-/* externally visible functions */
-
-struct uci_context *uci_alloc(void)
+int uci_set_confdir(struct uci_context *ctx, const char *dir)
 {
-       struct uci_context *ctx;
+       char *cdir;
 
-       ctx = (struct uci_context *) malloc(sizeof(struct uci_context));
-       memset(ctx, 0, sizeof(struct uci_context));
-       uci_list_init(&ctx->root);
+       UCI_HANDLE_ERR(ctx);
+       UCI_ASSERT(ctx, dir != NULL);
 
-       return ctx;
+       cdir = uci_strdup(ctx, dir);
+       if (ctx->confdir != uci_confdir)
+               free(ctx->confdir);
+       ctx->confdir = cdir;
+       return 0;
 }
 
-void uci_free(struct uci_context *ctx)
+int uci_set_savedir(struct uci_context *ctx, const char *dir)
 {
-       struct uci_config *cfg;
+       char *sdir;
 
-       uci_cleanup(ctx);
-       uci_foreach_entry(config, &ctx->root, cfg) {
-               uci_drop_config(cfg);
-       }
-       free(ctx);
-       return;
+       UCI_HANDLE_ERR(ctx);
+       UCI_ASSERT(ctx, dir != NULL);
+
+       sdir = uci_strdup(ctx, dir);
+       if (ctx->savedir != uci_savedir)
+               free(ctx->savedir);
+       ctx->savedir = sdir;
+       return 0;
 }
 
 int uci_cleanup(struct uci_context *ctx)
 {
        UCI_HANDLE_ERR(ctx);
-       uci_parse_cleanup(ctx);
+       uci_file_cleanup(ctx);
        return 0;
 }
 
-void uci_perror(struct uci_context *ctx, const char *str)
+void uci_perror(struct uci_context *ctx, const char *prefix)
 {
        int err;
 
@@ -125,15 +144,20 @@ void uci_perror(struct uci_context *ctx, const char *str)
        if ((err < 0) || (err >= UCI_ERR_LAST))
                err = UCI_ERR_UNKNOWN;
 
+       if (prefix)
+               fprintf(stderr, "%s: ", prefix);
+       if (ctx->func)
+               fprintf(stderr, "%s: ", ctx->func);
+
        switch (err) {
        case UCI_ERR_PARSE:
                if (ctx->pctx) {
-                       fprintf(stderr, "%s: %s (%s) at line %d, byte %d\n", str, uci_errstr[err], (ctx->pctx->reason ? ctx->pctx->reason : "unknown"), ctx->pctx->line, ctx->pctx->byte);
+                       fprintf(stderr, "%s (%s) at line %d, byte %d\n", uci_errstr[err], (ctx->pctx->reason ? ctx->pctx->reason : "unknown"), ctx->pctx->line, ctx->pctx->byte);
                        break;
                }
                /* fall through */
        default:
-               fprintf(stderr, "%s: %s\n", str, uci_errstr[err]);
+               fprintf(stderr, "%s\n", uci_errstr[err]);
                break;
        }
 }