improved parser

[project/uci.git] / libuci.c

diff --git a/libuci.c b/libuci.c
index c3a8fc0..262ca69 100644 (file)
--- a/libuci.c
+++ b/libuci.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "libuci.h"
+#include "uci.h"
 
 #define DEBUG
 #include "err.h"
@@ -31,6 +31,7 @@ static const char *uci_errstr[] = {
        [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",
 };
@@ -42,7 +43,7 @@ static const char *uci_errstr[] = {
 static void *uci_malloc(struct uci_context *ctx, size_t size)
 {
        void *ptr;
-       
+
        ptr = malloc(size);
        if (!ptr)
                UCI_THROW(ctx, UCI_ERR_MEM);
@@ -63,6 +64,20 @@ static void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size)
        return ptr;
 }
 
+/*
+ * UCI wrapper for strdup, which uses exception handling
+ */
+static char *uci_strdup(struct uci_context *ctx, const char *str)
+{
+       char *ptr;
+
+       ptr = strdup(str);
+       if (!ptr)
+               UCI_THROW(ctx, UCI_ERR_MEM);
+
+       return ptr;
+}
+
 #include "list.c"
 #include "parse.c"
 
@@ -71,10 +86,11 @@ static void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size)
 struct uci_context *uci_alloc(void)
 {
        struct uci_context *ctx;
-       
+
        ctx = (struct uci_context *) malloc(sizeof(struct uci_context));
        memset(ctx, 0, sizeof(struct uci_context));
-       
+       uci_list_init(&ctx->root);
+
        return ctx;
 }
 
@@ -93,7 +109,7 @@ void uci_perror(struct uci_context *ctx, const char *str)
                err = UCI_ERR_INVAL;
        else
                err = ctx->errno;
-       
+
        if ((err < 0) || (err >= UCI_ERR_LAST))
                err = UCI_ERR_UNKNOWN;