X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=util.c;h=177bd1408d3fa24ce4a33b38917644b9e6bfa632;hp=8542359da59fdb29234d47916540e6f4043606b6;hb=c0d8661d7ec87bd2cf06a496a0c4e50e61106747;hpb=6c020def580232b9188232f044184c575a716cda

diff --git a/util.c b/util.c
index 8542359..177bd14 100644
--- a/util.c
+++ b/util.c
@@ -101,58 +101,78 @@ static inline bool uci_validate_name(const char *str)
 	return uci_validate_str(str, true);
 }
 
+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));
 }
 
-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_str(*package, false))
+	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;
-	if (*option && !uci_validate_name(*option))
+
+lastval:
+	if (ptr->package && !uci_validate_str(ptr->package, false))
+		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 (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;
 }
 
 
@@ -378,14 +398,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;