X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=parse.c;h=31756d9a01ec5c27667b8169634390cb91694f8b;hp=a0a3ec83d36a8ac553903e819b0ba33dfac93d61;hb=3db7aea5f1e65b8b97b8a73ee19ae907e75a4b48;hpb=7952092949fb0dccd126d5ff6f73807feb4211b8 diff --git a/parse.c b/parse.c index a0a3ec8..31756d9 100644 --- a/parse.c +++ b/parse.c @@ -16,6 +16,10 @@ * This file contains the code for parsing uci config files */ +#include +#include +#include +#include #include #define LINEBUF 128 @@ -52,6 +56,7 @@ static void uci_getln(struct uci_context *ctx) } if (pctx->bufsz > LINEBUF_MAX/2) { + pctx->reason = "line too long"; pctx->byte = LINEBUF_MAX; UCI_THROW(ctx, UCI_ERR_PARSE); } @@ -94,62 +99,109 @@ static void skip_whitespace(char **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 char *parse_double_quote(char **str) +static void parse_double_quote(struct uci_context *ctx, char **str, char **target) { - char *val; + char c; + /* skip quote character */ *str += 1; - val = *str; - while (**str) { - /* skip escaped characters */ - if (**str == '\\') { - *str += 2; + while ((c = **str)) { + switch(c) { + case '\\': + parse_backslash(str, target); continue; - } - - /* check for the end of the quoted string */ - if (**str == '"') { - **str = 0; + case '"': + **target = 0; *str += 1; - return val; + return; + default: + addc(target, str); + break; } - *str += 1; } - - return NULL; + 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 char *parse_single_quote(char **str) +static void parse_single_quote(struct uci_context *ctx, char **str, char **target) { - /* TODO: implement */ - return NULL; + char c; + /* skip quote character */ + *str += 1; + + 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); } /* - * extract the next word from the command line (unquoted argument) + * parse a string from the command line and detect the quoting style */ -static char *parse_unquoted(char **str) +static void parse_str(struct uci_context *ctx, char **str, char **target) { - char *val; - - val = *str; - - while (**str && !isspace(**str)) - *str += 1; - - if (**str) { - **str = 0; + 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; - } - return val; + /* terminate the parsed string */ + **target = 0; } /* @@ -158,25 +210,18 @@ static char *parse_unquoted(char **str) static char *next_arg(struct uci_context *ctx, char **str, bool required) { char *val; + char *ptr; + val = ptr = *str; skip_whitespace(str); - switch (**str) { - case '"': - val = parse_double_quote(str); - case '\'': - val = parse_single_quote(str); - case 0: - val = NULL; - default: - val = parse_unquoted(str); - } - - if (required && !val) { + 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); } - return val; + return uci_strdup(ctx, val); } /* @@ -189,6 +234,7 @@ static void assert_eol(struct uci_context *ctx, char **str) 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); } @@ -201,13 +247,9 @@ static void uci_parse_config(struct uci_context *ctx, char **str) { char *type, *name; + /* command string null-terminated by strtok */ *str += strlen(*str) + 1; - if (!*str) { - ctx->pctx->byte = *str - ctx->pctx->buf; - UCI_THROW(ctx, UCI_ERR_PARSE); - } - type = next_arg(ctx, str, true); name = next_arg(ctx, str, false); assert_eol(ctx, str); @@ -222,6 +264,7 @@ static void uci_parse_option(struct uci_context *ctx, char **str) { char *name, *value; + /* command string null-terminated by strtok */ *str += strlen(*str) + 1; name = next_arg(ctx, str, true); @@ -256,6 +299,7 @@ static void uci_parse_line(struct uci_context *ctx) uci_parse_option(ctx, &word); break; default: + pctx->reason = "unterminated command"; pctx->byte = word - pctx->buf; UCI_THROW(ctx, UCI_ERR_PARSE); break; @@ -263,9 +307,12 @@ static void uci_parse_line(struct uci_context *ctx) } } -int uci_parse(struct uci_context *ctx, const char *name) +int uci_load(struct uci_context *ctx, const char *name) { struct uci_parse_context *pctx; + struct stat statbuf; + char *filename; + bool confpath; UCI_HANDLE_ERR(ctx); UCI_ASSERT(ctx, name != NULL); @@ -276,16 +323,36 @@ int uci_parse(struct uci_context *ctx, const char *name) pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context)); ctx->pctx = pctx; - /* TODO: use /etc/config/ */ - pctx->file = fopen(name, "r"); - if (!pctx->file) + 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); + pctx->cfg = uci_alloc_file(ctx, name); while (!feof(pctx->file)) { uci_getln(ctx); - if (*(pctx->buf)) + if (pctx->buf[0]) uci_parse_line(ctx); } @@ -293,10 +360,9 @@ int uci_parse(struct uci_context *ctx, const char *name) uci_list_add(&ctx->root, &pctx->cfg->list); pctx->cfg = NULL; - /* if no error happened, we can get rid of the parser context now */ + /* no error happened, we can get rid of the parser context now */ uci_parse_cleanup(ctx); return 0; } -