add initial work for option datatype abstraction

[project/uci.git] / util.c

diff --git a/util.c b/util.c
index 3358cdf..dde7bfc 100644 (file)
--- a/util.c
+++ b/util.c
@@ -101,12 +101,13 @@ static inline bool uci_validate_name(const char *str)
        return uci_validate_str(str, true);
 }
 
-static inline bool uci_validate_text(const char *str)
+bool uci_validate_text(const char *str)
 {
        while (*str) {
                if ((*str == '\r') || (*str == '\n') ||
                        ((*str < 32) && (*str != '\t')))
                        return false;
+               str++;
        }
        return true;
 }
@@ -119,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);
@@ -135,7 +137,8 @@ int uci_parse_tuple(struct uci_context *ctx, char *str, char **package, char **s
 
        *section = strsep(&str, ".");
        *option = NULL;
-       *value = NULL;
+       if (value)
+               *value = NULL;
        if (!*section)
                goto lastval;
 
@@ -153,11 +156,11 @@ 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 && !uci_validate_text(*value))
+       if (value && *value && !uci_validate_text(*value))
                goto error;
 
        goto done;