X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=util.c;h=f0b2094810bcd8c75cb6097b62a76dbaabbc45da;hp=4713c74befe6eab5935c2d6be48033c95f64204a;hb=fa40c4e16644da1f7c87cbd5a25d3fa8be4e0594;hpb=c394d8787defccf5f127f75f7f999d0a8ddff514

diff --git a/util.c b/util.c
index 4713c74..f0b2094 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>
@@ -23,11 +23,12 @@
 #include <unistd.h>
 #include <ctype.h>
 #include <fcntl.h>
+#include <errno.h>
 
 #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 +40,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 +49,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,18 +60,34 @@ 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;
 
 	while (*str) {
-		char c = *str;
+		unsigned char c = *str;
 		if (!isalnum(c) && c != '_') {
 			if (name || (c < 33) || (c > 126))
 				return false;
@@ -80,64 +97,94 @@ static 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 = strtok(str, ".");
-	if (!*package || !uci_validate_name(*package))
+	ptr->package = strsep(&str, ".");
+	if (!ptr->package)
 		goto error;
 
-	last = *package;
-	*section = strtok(NULL, ".");
-	if (!*section)
+	ptr->section = strsep(&str, ".");
+	if (!ptr->section) {
+		ptr->target = UCI_TYPE_PACKAGE;
 		goto lastval;
+	}
 
-	last = *section;
-	*option = strtok(NULL, ".");
-	if (!*option)
+	ptr->option = strsep(&str, ".");
+	if (!ptr->option) {
+		ptr->target = UCI_TYPE_SECTION;
 		goto lastval;
+	} else {
+		ptr->target = UCI_TYPE_OPTION;
+	}
 
-	last = *option;
+	tmp = strsep(&str, ".");
+	if (tmp)
+		goto error;
 
 lastval:
-	last = strchr(last, '=');
-	if (last) {
-		if (!value)
-			goto error;
-
-		*last = 0;
-		last++;
-		if (!*last)
-			goto error;
-		*value = last;
-	}
-
-	if (*section && !uci_validate_name(*section))
+	if (ptr->package && !uci_validate_package(ptr->package))
 		goto error;
-	if (*option && !uci_validate_name(*option))
+	if (ptr->section && !uci_validate_name(ptr->section))
+		ptr->flags |= UCI_LOOKUP_EXTENDED;
+	if (ptr->option && !uci_validate_name(ptr->option))
+		goto error;
+	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;
 }
 
 
@@ -288,6 +335,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 '\'':
@@ -301,6 +349,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;
@@ -317,7 +368,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 */
@@ -334,7 +385,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");
@@ -354,15 +410,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) {
-			ctx->internal = true;
-			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;
@@ -396,10 +451,11 @@ static FILE *uci_open_stream(struct uci_context *ctx, const char *filename, int
 	}
 
 	fd = open(filename, mode, UCI_FILEMODE);
-	if (fd <= 0)
+	if (fd < 0)
 		goto error;
 
-	if (flock(fd, (write ? LOCK_EX : LOCK_SH)) < 0)
+	ret = flock(fd, (write ? LOCK_EX : LOCK_SH));
+	if ((ret < 0) && (errno != ENOSYS))
 		goto error;
 
 	ret = lseek(fd, 0, pos);
@@ -424,6 +480,7 @@ static void uci_close_stream(FILE *stream)
 	if (!stream)
 		return;
 
+	fflush(stream);
 	fd = fileno(stream);
 	flock(fd, LOCK_UN);
 	fclose(stream);