projects
/
project
/
uci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
filter out duplicate changes when using uci_set to change option values
[project/uci.git]
/
util.c
diff --git
a/util.c
b/util.c
index
ac7b8cb
..
d5bcd8a
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-80,7
+80,7
@@
static unsigned int djbhash(unsigned int hash, char *str)
* for names, only alphanum and _ is allowed (shell compatibility)
* for types, we allow more 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;
{
if (!*str)
return false;
@@
-101,58
+101,73
@@
static inline bool uci_validate_name(const char *str)
return uci_validate_str(str, true);
}
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));
}
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;
UCI_HANDLE_ERR(ctx);
{
char *last = NULL;
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++;
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;
goto error;
- *section = strsep(&str, ".");
- if (!*section)
+ ptr->section = strsep(&str, ".");
+ if (!ptr->section) {
+ ptr->target = UCI_TYPE_PACKAGE;
goto lastval;
goto lastval;
+ }
- *option = strsep(&str, ".");
- if (!*option)
+ ptr->option = strsep(&str, ".");
+ if (!ptr->option) {
+ ptr->target = UCI_TYPE_SECTION;
goto lastval;
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))
+lastval:
+ if (ptr->package && !uci_validate_str(ptr->package, false))
goto error;
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 error;
-
goto done
;
+
return 0
;
error:
error:
+ memset(ptr, 0, sizeof(struct uci_ptr));
UCI_THROW(ctx, UCI_ERR_PARSE);
UCI_THROW(ctx, UCI_ERR_PARSE);
-
-done:
- return 0;
}
}
@@
-303,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)
{
*/
static void parse_str(struct uci_context *ctx, char **str, char **target)
{
+ bool next = true;
do {
switch(**str) {
case '\'':
do {
switch(**str) {
case '\'':
@@
-316,6
+332,9
@@
static void parse_str(struct uci_context *ctx, char **str, char **target)
/* fall through */
case 0:
goto done;
/* fall through */
case 0:
goto done;
+ case ';':
+ next = false;
+ goto done;
case '\\':
if (!parse_backslash(ctx, str))
continue;
case '\\':
if (!parse_backslash(ctx, str))
continue;
@@
-332,7
+351,7
@@
done:
* character, skip to the next one, because the whitespace will
* be overwritten by a null byte here
*/
* 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 */
*str += 1;
/* terminate the parsed string */
@@
-349,7
+368,12
@@
static char *next_arg(struct uci_context *ctx, char **str, bool required, bool n
val = ptr = *str;
skip_whitespace(ctx, str);
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");
if (!*val) {
if (required)
uci_parse_error(ctx, *str, "insufficient arguments");