projects
/
project
/
uci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix invocation of uci.commit(), uci.save() without arguments
[project/uci.git]
/
util.c
diff --git
a/util.c
b/util.c
index
35aa2b6
..
8542359
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-27,7
+27,7
@@
#define LINEBUF 32
#define LINEBUF_MAX 4096
#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;
{
void *ptr;
@@
-39,7
+39,7
@@
static void *uci_malloc(struct uci_context *ctx, size_t size)
return ptr;
}
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)
{
ptr = realloc(ptr, size);
if (!ptr)
@@
-48,7
+48,7
@@
static void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size)
return ptr;
}
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;
{
char *ptr;
@@
-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;
@@
-120,7
+120,7
@@
int uci_parse_tuple(struct uci_context *ctx, char *str, char **package, char **s
}
*package = strsep(&str, ".");
}
*package = strsep(&str, ".");
- if (!*package || !uci_validate_
name(*packag
e))
+ if (!*package || !uci_validate_
str(*package, fals
e))
goto error;
*section = strsep(&str, ".");
goto error;
*section = strsep(&str, ".");
@@
-303,6
+303,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
+317,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
+336,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
+353,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");