rename ctx->errno to ctx->err to avoid conflicts with a #define errno in the system...

[project/uci.git] / util.c

diff --git a/util.c b/util.c
index eb50b89..a85ec9b 100644 (file)
--- a/util.c
+++ b/util.c
@@ -13,8 +13,8 @@
  */
 
 /*
- * This file contains wrappers to standard functions, which
- * throw exceptions upon failure.
+ * This file contains misc utility functions and wrappers to standard
+ * functions, which throw exceptions upon failure.
  */
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -27,7 +27,7 @@
 #define LINEBUF        32
 #define LINEBUF_MAX    4096
 
-static void *uci_malloc(struct uci_context *ctx, size_t size)
+__plugin void *uci_malloc(struct uci_context *ctx, size_t size)
 {
        void *ptr;
 
@@ -39,7 +39,7 @@ static void *uci_malloc(struct uci_context *ctx, size_t size)
        return ptr;
 }
 
-static void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size)
+__plugin void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size)
 {
        ptr = realloc(ptr, size);
        if (!ptr)
@@ -48,7 +48,7 @@ static void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size)
        return ptr;
 }
 
-static char *uci_strdup(struct uci_context *ctx, const char *str)
+__plugin char *uci_strdup(struct uci_context *ctx, const char *str)
 {
        char *ptr;
 
@@ -59,12 +59,28 @@ static char *uci_strdup(struct uci_context *ctx, const char *str)
        return ptr;
 }
 
+/* Based on an efficient hash function published by D. J. Bernstein */
+static unsigned int djbhash(unsigned int hash, char *str)
+{
+       int len = strlen(str);
+       int i;
+
+       /* initial value */
+       if (hash == ~0)
+               hash = 5381;
+
+       for(i = 0; i < len; i++) {
+               hash = ((hash << 5) + hash) + str[i];
+       }
+       return (hash & 0x7FFFFFFF);
+}
+
 /*
  * validate strings for names and types, reject special characters
  * for names, only alphanum and _ is allowed (shell compatibility)
  * for types, we allow more characters
  */
-static bool uci_validate_str(const char *str, bool name)
+__plugin bool uci_validate_str(const char *str, bool name)
 {
        if (!*str)
                return false;
@@ -125,7 +141,7 @@ lastval:
                *value = last;
        }
 
-       if (*section && !uci_validate_name(*section))
+       if (*section && *section[0] && !uci_validate_name(*section))
                goto error;
        if (*option && !uci_validate_name(*option))
                goto error;
@@ -287,6 +303,7 @@ static void parse_single_quote(struct uci_context *ctx, char **str, char **targe
  */
 static void parse_str(struct uci_context *ctx, char **str, char **target)
 {
+       bool next = true;
        do {
                switch(**str) {
                case '\'':
@@ -300,6 +317,9 @@ static void parse_str(struct uci_context *ctx, char **str, char **target)
                        /* fall through */
                case 0:
                        goto done;
+               case ';':
+                       next = false;
+                       goto done;
                case '\\':
                        if (!parse_backslash(ctx, str))
                                continue;
@@ -316,7 +336,7 @@ done:
         * character, skip to the next one, because the whitespace will
         * be overwritten by a null byte here
         */
-       if (**str)
+       if (**str && next)
                *str += 1;
 
        /* terminate the parsed string */
@@ -333,7 +353,12 @@ static char *next_arg(struct uci_context *ctx, char **str, bool required, bool n
 
        val = ptr = *str;
        skip_whitespace(ctx, str);
-       parse_str(ctx, str, &ptr);
+       if(*str[0] == ';') {
+               *str[0] = 0;
+               *str += 1;
+       } else {
+               parse_str(ctx, str, &ptr);
+       }
        if (!*val) {
                if (required)
                        uci_parse_error(ctx, *str, "insufficient arguments");
@@ -355,7 +380,6 @@ int uci_parse_argument(struct uci_context *ctx, FILE *stream, char **str, char *
 
        if (ctx->pctx) {
                if (ctx->pctx->file != stream) {
-                       ctx->internal = true;
                        uci_cleanup(ctx);
                }
        } else {