X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=util.c;h=e56992e71b8b0f73aef6247b9f458462933e1a42;hb=5dc61312c1ffc80e730be0bca0bf780a44c55d51;hp=eb50b89c30792ac6983a736cc8cf2581d5616e9c;hpb=735792ded03a83f100638e52a727cbce1753291a;p=project%2Fuci.git diff --git a/util.c b/util.c index eb50b89..e56992e 100644 --- a/util.c +++ b/util.c @@ -13,8 +13,8 @@ */ /* - * This file contains wrappers to standard functions, which - * throw exceptions upon failure. + * This file contains misc utility functions and wrappers to standard + * functions, which throw exceptions upon failure. */ #include #include @@ -27,7 +27,7 @@ #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; @@ -39,7 +39,7 @@ static void *uci_malloc(struct uci_context *ctx, size_t size) 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) @@ -48,7 +48,7 @@ static void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size) 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; @@ -59,12 +59,28 @@ static char *uci_strdup(struct uci_context *ctx, const char *str) return ptr; } +/* Based on an efficient hash function published by D. J. Bernstein */ +static unsigned int djbhash(unsigned int hash, char *str) +{ + int len = strlen(str); + int i; + + /* initial value */ + if (hash == ~0) + hash = 5381; + + for(i = 0; i < len; i++) { + hash = ((hash << 5) + hash) + str[i]; + } + return (hash & 0x7FFFFFFF); +} + /* * validate strings for names and types, reject special 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; @@ -80,63 +96,93 @@ static bool uci_validate_str(const char *str, bool name) 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) { + 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_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 && !uci_validate_name(*section)) + tmp = strsep(&str, "."); + if (tmp) goto error; - if (*option && !uci_validate_name(*option)) + +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 (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; } @@ -287,6 +333,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) { + bool next = true; do { switch(**str) { case '\'': @@ -300,6 +347,9 @@ static void parse_str(struct uci_context *ctx, char **str, char **target) /* fall through */ case 0: goto done; + case ';': + next = false; + goto done; case '\\': if (!parse_backslash(ctx, str)) continue; @@ -316,7 +366,7 @@ done: * 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 */ @@ -333,7 +383,12 @@ static char *next_arg(struct uci_context *ctx, char **str, bool required, bool n 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"); @@ -353,15 +408,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) { - ctx->internal = true; - 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;