add missing fflush() on close - fixes a bug in the lock/unlock order (thx, Cyrus)

[project/uci.git] / util.c

diff --git a/util.c b/util.c
index cba69c3..9843058 100644 (file)
--- a/util.c
+++ b/util.c
@@ -86,7 +86,7 @@ __plugin bool uci_validate_str(const char *str, bool name)
                return false;
 
        while (*str) {
-               char c = *str;
+               unsigned char c = *str;
                if (!isalnum(c) && c != '_') {
                        if (name || (c < 33) || (c > 126))
                                return false;
@@ -96,63 +96,94 @@ __plugin bool uci_validate_str(const char *str, bool name)
        return true;
 }
 
+static inline bool uci_validate_package(const char *str)
+{
+       return uci_validate_str(str, false);
+}
+
+static inline bool uci_validate_type(const char *str)
+{
+       return uci_validate_str(str, false);
+}
+
 static inline bool uci_validate_name(const char *str)
 {
        return uci_validate_str(str, true);
 }
 
+bool uci_validate_text(const char *str)
+{
+       while (*str) {
+               unsigned char c = *str;
+               if ((c == '\r') || (c == '\n') ||
+                       ((c < 32) && (c != '\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));
 }
 
-int uci_parse_tuple(struct uci_context *ctx, char *str, char **package, char **section, char **option, char **value)
+int uci_parse_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str)
 {
        char *last = NULL;
+       char *tmp;
 
        UCI_HANDLE_ERR(ctx);
-       UCI_ASSERT(ctx, str && package && section && option);
+       UCI_ASSERT(ctx, str);
+       UCI_ASSERT(ctx, ptr);
 
+       memset(ptr, 0, sizeof(struct uci_ptr));
+
+       /* value */
        last = strchr(str, '=');
        if (last) {
                *last = 0;
                last++;
+               ptr->value = last;
        }
 
-       *package = strsep(&str, ".");
-       if (!*package || !uci_validate_name(*package))
+       ptr->package = strsep(&str, ".");
+       if (!ptr->package)
                goto error;
 
-       *section = strsep(&str, ".");
-       if (!*section)
+       ptr->section = strsep(&str, ".");
+       if (!ptr->section) {
+               ptr->target = UCI_TYPE_PACKAGE;
                goto lastval;
+       }
 
-       *option = strsep(&str, ".");
-       if (!*option)
+       ptr->option = strsep(&str, ".");
+       if (!ptr->option) {
+               ptr->target = UCI_TYPE_SECTION;
                goto lastval;
-
-lastval:
-       if (last) {
-               if (!value)
-                       goto error;
-
-               if (!*last)
-                       goto error;
-               *value = last;
+       } else {
+               ptr->target = UCI_TYPE_OPTION;
        }
 
-       if (*section && *section[0] && !uci_validate_name(*section))
+       tmp = strsep(&str, ".");
+       if (tmp)
+               goto error;
+
+lastval:
+       if (ptr->package && !uci_validate_package(ptr->package))
+               goto error;
+       if (ptr->section && !uci_validate_name(ptr->section))
+               ptr->flags |= UCI_LOOKUP_EXTENDED;
+       if (ptr->option && !uci_validate_name(ptr->option))
                goto error;
-       if (*option && !uci_validate_name(*option))
+       if (ptr->value && !uci_validate_text(ptr->value))
                goto error;
 
-       goto done;
+       return 0;
 
 error:
+       memset(ptr, 0, sizeof(struct uci_ptr));
        UCI_THROW(ctx, UCI_ERR_PARSE);
-
-done:
-       return 0;
 }
 
 
@@ -303,6 +334,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 +348,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 +367,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 +384,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");
@@ -369,14 +409,14 @@ int uci_parse_argument(struct uci_context *ctx, FILE *stream, char **str, char *
        UCI_ASSERT(ctx, str != NULL);
        UCI_ASSERT(ctx, result != NULL);
 
-       if (ctx->pctx) {
-               if (ctx->pctx->file != stream) {
-                       uci_cleanup(ctx);
-               }
-       } else {
+       if (ctx->pctx && (ctx->pctx->file != stream))
+               uci_cleanup(ctx);
+
+       if (!ctx->pctx)
                uci_alloc_parse_context(ctx);
-               ctx->pctx->file = stream;
-       }
+
+       ctx->pctx->file = stream;
+
        if (!*str) {
                uci_getln(ctx, 0);
                *str = ctx->pctx->buf;
@@ -438,6 +478,7 @@ static void uci_close_stream(FILE *stream)
        if (!stream)
                return;
 
+       fflush(stream);
        fd = fileno(stream);
        flock(fd, LOCK_UN);
        fclose(stream);