* 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;
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)
{
char *last = NULL;
+ bool internal = ctx->internal;
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, str && package && section && option);
}
*package = strsep(&str, ".");
- if (!*package || !uci_validate_name(*package))
+ if (!*package || !uci_validate_str(*package, false))
goto error;
*section = strsep(&str, ".");
+ *option = NULL;
+ if (value)
+ *value = NULL;
if (!*section)
goto lastval;
*value = last;
}
- if (*section && *section[0] && !uci_validate_name(*section))
+ if (*section && *section[0] && !internal && !uci_validate_name(*section))
goto error;
if (*option && !uci_validate_name(*option))
goto error;
+ if (value && *value && !uci_validate_text(*value))
+ goto error;
goto done;
*/
static void parse_str(struct uci_context *ctx, char **str, char **target)
{
+ bool next = true;
do {
switch(**str) {
case '\'':
/* fall through */
case 0:
goto done;
+ case ';':
+ next = false;
+ goto done;
case '\\':
if (!parse_backslash(ctx, str))
continue;
* 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 */
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");