add feature flags for the build process, improve automatic rebuild

[project/uci.git] / util.c

diff --git a/util.c b/util.c
index 1d71335..35aa2b6 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>
@@ -59,6 +59,22 @@ 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)
@@ -103,15 +119,15 @@ int uci_parse_tuple(struct uci_context *ctx, char *str, char **package, char **s
                last++;
        }
 
-       *package = strtok(str, ".");
+       *package = strsep(&str, ".");
        if (!*package || !uci_validate_name(*package))
                goto error;
 
-       *section = strtok(NULL, ".");
+       *section = strsep(&str, ".");
        if (!*section)
                goto lastval;
 
-       *option = strtok(NULL, ".");
+       *option = strsep(&str, ".");
        if (!*option)
                goto lastval;
 
@@ -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;
@@ -355,7 +371,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 {