add list support

[project/uci.git] / util.c

diff --git a/util.c b/util.c
index 35aa2b6..dde7bfc 100644 (file)
--- a/util.c
+++ b/util.c
@@ -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;
 
@@ -80,7 +80,7 @@ static unsigned int djbhash(unsigned int hash, char *str)
  * 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;
@@ -101,6 +101,17 @@ static inline bool uci_validate_name(const char *str)
        return uci_validate_str(str, true);
 }
 
+bool uci_validate_text(const char *str)
+{
+       while (*str) {
+               if ((*str == '\r') || (*str == '\n') ||
+                       ((*str < 32) && (*str != '\t')))
+                       return false;
+               str++;
+       }
+       return true;
+}
+
 static void uci_alloc_parse_context(struct uci_context *ctx)
 {
        ctx->pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context));
@@ -109,6 +120,7 @@ static void uci_alloc_parse_context(struct uci_context *ctx)
 int uci_parse_tuple(struct uci_context *ctx, char *str, char **package, char **section, char **option, char **value)
 {
        char *last = NULL;
+       bool internal = ctx->internal;
 
        UCI_HANDLE_ERR(ctx);
        UCI_ASSERT(ctx, str && package && section && option);
@@ -120,10 +132,13 @@ int uci_parse_tuple(struct uci_context *ctx, char *str, char **package, char **s
        }
 
        *package = strsep(&str, ".");
-       if (!*package || !uci_validate_name(*package))
+       if (!*package || !uci_validate_str(*package, false))
                goto error;
 
        *section = strsep(&str, ".");
+       *option = NULL;
+       if (value)
+               *value = NULL;
        if (!*section)
                goto lastval;
 
@@ -141,10 +156,12 @@ lastval:
                *value = last;
        }
 
-       if (*section && *section[0] && !uci_validate_name(*section))
+       if (*section && *section[0] && !internal && !uci_validate_name(*section))
                goto error;
        if (*option && !uci_validate_name(*option))
                goto error;
+       if (value && *value && !uci_validate_text(*value))
+               goto error;
 
        goto done;
 
@@ -303,6 +320,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 '\'':
@@ -316,6 +334,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;
@@ -332,7 +353,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 */
@@ -349,7 +370,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");