X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=util.c;h=c0d46a21ead6b5abb851abfcd7e9483313c11628;hp=1d71335f7384d4e2149013686143048784784916;hb=d65c93f0d05fae484d687ff03b6fd982142b98e1;hpb=12bdbcd95d42509f3b9f06bc7e811c1781635417

diff --git a/util.c b/util.c
index 1d71335..c0d46a2 100644
--- 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;
@@ -85,6 +101,17 @@ static inline bool uci_validate_name(const char *str)
 	return uci_validate_str(str, true);
 }
 
+static inline 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));
@@ -103,15 +130,17 @@ int uci_parse_tuple(struct uci_context *ctx, char *str, char **package, char **s
 		last++;
 	}
 
-	*package = strtok(str, ".");
-	if (!*package || !uci_validate_name(*package))
+	*package = strsep(&str, ".");
+	if (!*package || !uci_validate_str(*package, false))
 		goto error;
 
-	*section = strtok(NULL, ".");
+	*section = strsep(&str, ".");
+	*option = NULL;
+	*value = NULL;
 	if (!*section)
 		goto lastval;
 
-	*option = strtok(NULL, ".");
+	*option = strsep(&str, ".");
 	if (!*option)
 		goto lastval;
 
@@ -125,10 +154,12 @@ 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;
+	if (*value && !uci_validate_text(*value))
+		goto error;
 
 	goto done;
 
@@ -287,6 +318,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 +332,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 +351,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 +368,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 +395,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 {