return false;
while (*str) {
- char c = *str;
+ unsigned char c = *str;
if (!isalnum(c) && c != '_') {
if (name || (c < 33) || (c > 126))
return false;
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 = strsep(&str, ".");
- if (!*package || !uci_validate_name(*package))
+ 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;
+
+lastval:
+ if (ptr->package && !uci_validate_package(ptr->package))
+ 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 (*option && !uci_validate_name(*option))
+ 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;
}
*/
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");
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;
if (!stream)
return;
+ fflush(stream);
fd = fileno(stream);
flock(fd, LOCK_UN);
fclose(stream);