X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=file.c;h=ae0008f40f0185cd3e2d4916002c95453f079df2;hp=29ff3189a4c0c7c93c39de8bcb4b98914adf48a2;hb=976e6db54ee86c7198e68b48cea2f9f1db9c3425;hpb=53726f5dd57ab09a206c96108a71db25e7517caa diff --git a/file.c b/file.c index 29ff318..ae0008f 100644 --- a/file.c +++ b/file.c @@ -35,6 +35,7 @@ static void assert_eol(struct uci_context *ctx, char **str) { char *tmp; + skip_whitespace(ctx, str); tmp = next_arg(ctx, str, false, false); if (*tmp && (ctx->flags & UCI_FLAG_STRICT)) uci_parse_error(ctx, *str, "too many arguments"); @@ -122,11 +123,12 @@ static void uci_parse_config(struct uci_context *ctx, char **str) if (pctx->merge) { UCI_TRAP_SAVE(ctx, error); - uci_set(ctx, pctx->package, name, NULL, type, NULL); + if (uci_set(ctx, pctx->package, name, NULL, type, NULL) != UCI_OK) + goto error; UCI_TRAP_RESTORE(ctx); return; error: - UCI_THROW(ctx, ctx->errno); + UCI_THROW(ctx, ctx->err); } else pctx->section = uci_alloc_section(pctx->package, type, name); } @@ -156,7 +158,7 @@ static void uci_parse_option(struct uci_context *ctx, char **str) UCI_TRAP_RESTORE(ctx); return; error: - UCI_THROW(ctx, ctx->errno); + UCI_THROW(ctx, ctx->err); } else uci_alloc_option(pctx->section, name, value); } @@ -168,38 +170,44 @@ error: static void uci_parse_line(struct uci_context *ctx, bool single) { struct uci_parse_context *pctx = ctx->pctx; - char *word, *brk = NULL; - - for (word = strtok_r(pctx->buf, ";", &brk); - word; - word = strtok_r(NULL, ";", &brk)) { - - char *pbrk = NULL; - word = strtok_r(word, " \t", &pbrk); + char *word, *brk; + word = pctx->buf; + do { + brk = NULL; + word = strtok_r(word, " \t", &brk); if (!word) - continue; + return; switch(word[0]) { + case 0: case '#': return; case 'p': if ((word[1] == 0) || !strcmp(word + 1, "ackage")) uci_parse_package(ctx, &word, single); + else + goto invalid; break; case 'c': if ((word[1] == 0) || !strcmp(word + 1, "onfig")) uci_parse_config(ctx, &word); + else + goto invalid; break; case 'o': if ((word[1] == 0) || !strcmp(word + 1, "ption")) uci_parse_option(ctx, &word); + else + goto invalid; break; default: - uci_parse_error(ctx, word, "unterminated command"); - break; + goto invalid; } - } + continue; +invalid: + uci_parse_error(ctx, word, "invalid command"); + } while (1); } /* max number of characters that escaping adds to the string */ @@ -208,42 +216,47 @@ static void uci_parse_line(struct uci_context *ctx, bool single) /* * escape an uci string for export */ -static char *uci_escape(struct uci_context *ctx, char *str) +static char *uci_escape(struct uci_context *ctx, const char *str) { - char *s, *p; - int pos = 0; + const char *end; + int ofs = 0; if (!ctx->buf) { ctx->bufsz = LINEBUF; ctx->buf = malloc(LINEBUF); } - s = str; - p = strchr(str, '\''); - if (!p) - return str; + while (1) { + int len; - do { - int len = p - s; - if (len > 0) { - if (p + sizeof(UCI_QUOTE_ESCAPE) - str >= ctx->bufsz) { - ctx->bufsz *= 2; - ctx->buf = realloc(ctx->buf, ctx->bufsz); - if (!ctx->buf) - UCI_THROW(ctx, UCI_ERR_MEM); - } - memcpy(&ctx->buf[pos], s, len); - pos += len; + end = strchr(str, '\''); + if (!end) + end = str + strlen(str); + len = end - str; + + /* make sure that we have enough room in the buffer */ + while (ofs + len + sizeof(UCI_QUOTE_ESCAPE) + 1 > ctx->bufsz) { + ctx->bufsz *= 2; + ctx->buf = uci_realloc(ctx, ctx->buf, ctx->bufsz); } - strcpy(&ctx->buf[pos], UCI_QUOTE_ESCAPE); - pos += sizeof(UCI_QUOTE_ESCAPE); - s = p + 1; - } while ((p = strchr(s, '\''))); + /* copy the string until the character before the quote */ + memcpy(&ctx->buf[ofs], str, len); + ofs += len; + + /* end of string? return the buffer */ + if (*end == 0) + break; + + memcpy(&ctx->buf[ofs], UCI_QUOTE_ESCAPE, sizeof(UCI_QUOTE_ESCAPE)); + ofs += strlen(&ctx->buf[ofs]); + str = end + 1; + } + + ctx->buf[ofs] = 0; return ctx->buf; } - /* * export a single config package to a file stream */ @@ -309,7 +322,7 @@ int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u * NB: the config file can still override the package name */ if (name) { - UCI_ASSERT(ctx, uci_validate_name(name)); + UCI_ASSERT(ctx, uci_validate_str(name, false)); pctx->name = name; } @@ -323,12 +336,14 @@ int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u error: if (ctx->flags & UCI_FLAG_PERROR) uci_perror(ctx, NULL); - if ((ctx->errno != UCI_ERR_PARSE) || + if ((ctx->err != UCI_ERR_PARSE) || (ctx->flags & UCI_FLAG_STRICT)) - UCI_THROW(ctx, ctx->errno); + UCI_THROW(ctx, ctx->err); } uci_fixup_section(ctx, ctx->pctx->section); + if (!pctx->package && name) + uci_switch_config(ctx); if (package) *package = pctx->package; if (pctx->merge) @@ -348,7 +363,7 @@ static char *uci_config_path(struct uci_context *ctx, const char *name) { char *filename; - UCI_ASSERT(ctx, uci_validate_name(name)); + UCI_ASSERT(ctx, uci_validate_str(name, false)); filename = uci_malloc(ctx, strlen(name) + strlen(ctx->confdir) + 2); sprintf(filename, "%s/%s", ctx->confdir, name); @@ -419,8 +434,8 @@ done: if (path) free(path); uci_close_stream(f); - if (ctx->errno) - UCI_THROW(ctx, ctx->errno); + if (ctx->err) + UCI_THROW(ctx, ctx->err); } @@ -474,6 +489,9 @@ static char **uci_list_config_files(struct uci_context *ctx) if (!p) continue; + if (!uci_validate_name(p)) + continue; + configs[i] = buf; strcpy(buf, p); buf += strlen(buf) + 1; @@ -509,7 +527,7 @@ static struct uci_package *uci_file_load(struct uci_context *ctx, const char *na } file = uci_open_stream(ctx, filename, SEEK_SET, false, false); - ctx->errno = 0; + ctx->err = 0; UCI_TRAP_SAVE(ctx, done); UCI_INTERNAL(uci_import, ctx, file, name, &package, true); UCI_TRAP_RESTORE(ctx); @@ -522,8 +540,8 @@ static struct uci_package *uci_file_load(struct uci_context *ctx, const char *na done: uci_close_stream(file); - if (ctx->errno) - UCI_THROW(ctx, ctx->errno); + if (ctx->err) + UCI_THROW(ctx, ctx->err); return package; }