X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=parse.c;h=838a8353e509f02151c1ecc9dcff00d05e47bd25;hp=5158028bb68bdbf93455bbb78a3f319d7f845b17;hb=2e90d2637abcbea12f5f4070be7a158fb4637604;hpb=c23a3abdef11d7307e67f790e7a1d59c8bc1e07d diff --git a/parse.c b/parse.c index 5158028..838a835 100644 --- a/parse.c +++ b/parse.c @@ -2,364 +2,129 @@ * libuci - Library for the Unified Configuration Interface * Copyright (C) 2008 Felix Fietkau * - * this program is free software; you can redistribute it and/or modify - * it under the terms of the gnu lesser general public license version 2.1 - * as published by the free software foundation + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 2.1 + * as published by the Free Software Foundation * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Lesser General Public License for more details. */ -/* - * This file contains the code for parsing uci config files - */ - -#include -#include -#include -#include -#include +#include +#include -#define LINEBUF 128 -#define LINEBUF_MAX 4096 +#include "uci.h" -/* - * Fetch a new line from the input stream and resize buffer if necessary - */ -static void uci_getln(struct uci_context *ctx) +void uci_parse_section(struct uci_section *s, const struct uci_parse_option *opts, + int n_opts, struct uci_option **tb) { - struct uci_parse_context *pctx = ctx->pctx; - char *p; - int ofs; - - if (pctx->buf == NULL) { - pctx->buf = uci_malloc(ctx, LINEBUF); - pctx->bufsz = LINEBUF; - } + struct uci_element *e; - ofs = 0; - do { - p = &pctx->buf[ofs]; - p[ofs] = 0; + memset(tb, 0, n_opts * sizeof(*tb)); - p = fgets(p, pctx->bufsz - ofs, pctx->file); - if (!p || !p[ofs]) - return; + uci_foreach_element(&s->options, e) { + struct uci_option *o = uci_to_option(e); + int i; - ofs += strlen(p); - if (pctx->buf[ofs - 1] == '\n') { - pctx->line++; - pctx->buf[ofs - 1] = 0; - return; - } + for (i = 0; i < n_opts; i++) { + if (tb[i]) + continue; - if (pctx->bufsz > LINEBUF_MAX/2) { - pctx->reason = "line too long"; - pctx->byte = LINEBUF_MAX; - UCI_THROW(ctx, UCI_ERR_PARSE); - } + if (strcmp(opts[i].name, o->e.name) != 0) + continue; - pctx->bufsz *= 2; - pctx->buf = uci_realloc(ctx, pctx->buf, pctx->bufsz); - } while (1); -} + if (opts[i].type >= 0 && opts[i].type != o->type) + continue; -/* - * Clean up all extra memory used by the parser - */ -static void uci_parse_cleanup(struct uci_context *ctx) -{ - struct uci_parse_context *pctx; - - pctx = ctx->pctx; - if (!pctx) - return; - - ctx->pctx = NULL; - if (pctx->cfg) { - uci_list_del(&pctx->cfg->list); - uci_drop_file(pctx->cfg); - } - if (pctx->buf) - free(pctx->buf); - if (pctx->file) - fclose(pctx->file); - - free(pctx); -} - -/* - * move the string pointer forward until a non-whitespace character or - * EOL is reached - */ -static void skip_whitespace(char **str) -{ - while (**str && isspace(**str)) - *str += 1; -} - -static inline void addc(char **dest, char **src) -{ - **dest = **src; - *dest += 1; - *src += 1; -} - -static inline void parse_backslash(char **str, char **target) -{ - /* skip backslash */ - *str += 1; - /* FIXME: decode escaped characters? */ - addc(target, str); -} - -/* - * parse a double quoted string argument from the command line - */ -static void parse_double_quote(struct uci_context *ctx, char **str, char **target) -{ - char c; - - /* skip quote character */ - *str += 1; - - while ((c = **str)) { - switch(c) { - case '\\': - parse_backslash(str, target); - continue; - case '"': - **target = 0; - *str += 1; - return; - default: - addc(target, str); + /* match found */ + tb[i] = o; break; } } - ctx->pctx->reason = "unterminated \""; - ctx->pctx->byte = *str - ctx->pctx->buf; - UCI_THROW(ctx, UCI_ERR_PARSE); } -/* - * parse a single quoted string argument from the command line - */ -static void parse_single_quote(struct uci_context *ctx, char **str, char **target) -{ - char c; - /* skip quote character */ - *str += 1; +//----------------------------------------------------------------------------- +// MurmurHashNeutral2, by Austin Appleby - while ((c = **str)) { - switch(c) { - case '\'': - **target = 0; - *str += 1; - return; - default: - addc(target, str); - } - } - ctx->pctx->reason = "unterminated '"; - ctx->pctx->byte = *str - ctx->pctx->buf; - UCI_THROW(ctx, UCI_ERR_PARSE); -} - -/* - * parse a string from the command line and detect the quoting style - */ -static void parse_str(struct uci_context *ctx, char **str, char **target) +// Same as MurmurHash2, but endian- and alignment-neutral. +static uint32_t hash_murmur2(uint32_t h, const void * key, int len) { - do { - switch(**str) { - case '\\': - parse_backslash(str, target); - continue; - case '\'': - parse_single_quote(ctx, str, target); - break; - case '"': - parse_double_quote(ctx, str, target); - break; - case 0: - goto done; - default: - addc(target, str); - break; - } - } while (**str && !isspace(**str)); -done: - - /* - * if the string was unquoted and we've stopped at a whitespace - * character, skip to the next one, because the whitespace will - * be overwritten by a null byte here - */ - if (**str) - *str += 1; + const unsigned char * data = key; + const uint32_t m = 0x5bd1e995; + const int r = 24; - /* terminate the parsed string */ - **target = 0; -} + while(len >= 4) + { + unsigned int k; -/* - * extract the next argument from the command line - */ -static char *next_arg(struct uci_context *ctx, char **str, bool required) -{ - char *val; - char *ptr; + k = data[0]; + k |= data[1] << 8; + k |= data[2] << 16; + k |= data[3] << 24; - val = ptr = *str; - skip_whitespace(str); - parse_str(ctx, str, &ptr); - if (required && !*val) { - ctx->pctx->reason = "insufficient arguments"; - ctx->pctx->byte = *str - ctx->pctx->buf; - UCI_THROW(ctx, UCI_ERR_PARSE); - } + k *= m; + k ^= k >> r; + k *= m; - return uci_strdup(ctx, val); -} + h *= m; + h ^= k; -/* - * verify that the end of the line or command is reached. - * throw an error if extra arguments are given on the command line - */ -static void assert_eol(struct uci_context *ctx, char **str) -{ - char *tmp; - - tmp = next_arg(ctx, str, false); - if (tmp && *tmp) { - ctx->pctx->reason = "too many arguments"; - ctx->pctx->byte = tmp - ctx->pctx->buf; - UCI_THROW(ctx, UCI_ERR_PARSE); + data += 4; + len -= 4; } -} -/* - * parse the 'config' uci command (open a section) - */ -static void uci_parse_config(struct uci_context *ctx, char **str) -{ - char *type, *name; + switch(len) + { + case 3: h ^= data[2] << 16; + case 2: h ^= data[1] << 8; + case 1: h ^= data[0]; + h *= m; + }; - /* command string null-terminated by strtok */ - *str += strlen(*str) + 1; + h ^= h >> 13; + h *= m; + h ^= h >> 15; - type = next_arg(ctx, str, true); - name = next_arg(ctx, str, false); - assert_eol(ctx, str); + return h; } -/* - * parse the 'option' uci command (open a value) - */ -static void uci_parse_option(struct uci_context *ctx, char **str) +static uint32_t uci_hash_list(uint32_t h, const struct uci_list *list) { - char *name, *value; - - /* command string null-terminated by strtok */ - *str += strlen(*str) + 1; + const struct uci_element *e; - name = next_arg(ctx, str, true); - value = next_arg(ctx, str, true); - assert_eol(ctx, str); -} - -/* - * parse a complete input line, split up combined commands by ';' - */ -static void uci_parse_line(struct uci_context *ctx) -{ - struct uci_parse_context *pctx = ctx->pctx; - char *word, *brk; - - for (word = strtok_r(pctx->buf, ";", &brk); - word; - word = strtok_r(NULL, ";", &brk)) { - - char *pbrk; - word = strtok_r(word, " \t", &pbrk); - - switch(word[0]) { - case 'c': - if ((word[1] == 0) || !strcmp(word + 1, "onfig")) - uci_parse_config(ctx, &word); - break; - case 'o': - if ((word[1] == 0) || !strcmp(word + 1, "ption")) - uci_parse_option(ctx, &word); - break; - default: - pctx->reason = "unterminated command"; - pctx->byte = word - pctx->buf; - UCI_THROW(ctx, UCI_ERR_PARSE); - break; - } + uci_foreach_element(list, e) { + h = hash_murmur2(h, e->name, strlen(e->name) + 1); } + return h; } -int uci_load(struct uci_context *ctx, const char *name) +uint32_t uci_hash_options(struct uci_option **tb, int n_opts) { - struct uci_parse_context *pctx; - struct stat statbuf; - char *filename; - bool confpath; - - UCI_HANDLE_ERR(ctx); - UCI_ASSERT(ctx, name != NULL); - - /* make sure no memory from previous parse attempts is leaked */ - uci_parse_cleanup(ctx); + uint32_t h = 0xdeadc0de; + int i; - pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context)); - ctx->pctx = pctx; + for (i = 0; i < n_opts; i++) { + const struct uci_option *o = tb[i]; - switch (name[0]) { - case '.': - case '/': - /* absolute/relative path outside of /etc/config */ - filename = (char *) name; - confpath = false; - break; - default: - filename = uci_malloc(ctx, strlen(name) + sizeof(UCI_CONFDIR) + 2); - sprintf(filename, UCI_CONFDIR "/%s", name); - confpath = true; - break; - } - - if ((stat(filename, &statbuf) < 0) || - ((statbuf.st_mode & S_IFMT) != S_IFREG)) - UCI_THROW(ctx, UCI_ERR_NOTFOUND); - - pctx->file = fopen(filename, "r"); - if (filename != name) - free(filename); - - if (!pctx->file) - UCI_THROW(ctx, UCI_ERR_IO); + if (!tb[i]) + continue; - pctx->cfg = uci_alloc_file(ctx, name); + h = hash_murmur2(h, o->e.name, strlen(o->e.name) + 1); + h = hash_murmur2(h, &o->type, sizeof(o->type)); - while (!feof(pctx->file)) { - uci_getln(ctx); - if (pctx->buf[0]) - uci_parse_line(ctx); + switch (tb[i]->type) { + case UCI_TYPE_STRING: + h = hash_murmur2(h, o->v.string, strlen(o->v.string) + 1); + break; + case UCI_TYPE_LIST: + h = uci_hash_list(h, &o->v.list); + break; + } } - /* add to main config file list */ - uci_list_add(&ctx->root, &pctx->cfg->list); - pctx->cfg = NULL; - - /* no error happened, we can get rid of the parser context now */ - uci_parse_cleanup(ctx); - - return 0; + return h; } +