X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=file.c;h=e6722b256314e2a819cfdc438159d0c62604c7c2;hp=6eaa5ecb3589be5b3393d34f55417655bd50f2c3;hb=12d129092611181c85a534c2ff37e439be8f8b1f;hpb=7e840cf19ac6c867b9708257efd93e4a7efaa97e diff --git a/file.c b/file.c index 6eaa5ec..e6722b2 100644 --- a/file.c +++ b/file.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -26,6 +27,15 @@ #define LINEBUF 32 #define LINEBUF_MAX 4096 +static void uci_parse_error(struct uci_context *ctx, char *pos, char *reason) +{ + struct uci_parse_context *pctx = ctx->pctx; + + pctx->reason = reason; + pctx->byte = pos - pctx->buf; + UCI_THROW(ctx, UCI_ERR_PARSE); +} + /* * Fetch a new line from the input stream and resize buffer if necessary */ @@ -56,11 +66,8 @@ static void uci_getln(struct uci_context *ctx, int offset) return; } - if (pctx->bufsz > LINEBUF_MAX/2) { - pctx->reason = "line too long"; - pctx->byte = LINEBUF_MAX; - UCI_THROW(ctx, UCI_ERR_PARSE); - } + if (pctx->bufsz > LINEBUF_MAX/2) + uci_parse_error(ctx, p, "line too long"); pctx->bufsz *= 2; pctx->buf = uci_realloc(ctx, pctx->buf, pctx->bufsz); @@ -165,9 +172,7 @@ static void parse_double_quote(struct uci_context *ctx, char **str, char **targe break; } } - ctx->pctx->reason = "unterminated \""; - ctx->pctx->byte = *str - ctx->pctx->buf; - UCI_THROW(ctx, UCI_ERR_PARSE); + uci_parse_error(ctx, *str, "unterminated \""); } /* @@ -189,9 +194,7 @@ static void parse_single_quote(struct uci_context *ctx, char **str, char **targe addc(target, str); } } - ctx->pctx->reason = "unterminated '"; - ctx->pctx->byte = *str - ctx->pctx->buf; - UCI_THROW(ctx, UCI_ERR_PARSE); + uci_parse_error(ctx, *str, "unterminated '"); } /* @@ -235,7 +238,7 @@ done: /* * extract the next argument from the command line */ -static char *next_arg(struct uci_context *ctx, char **str, bool required) +static char *next_arg(struct uci_context *ctx, char **str, bool required, bool name) { char *val; char *ptr; @@ -243,11 +246,10 @@ static char *next_arg(struct uci_context *ctx, char **str, bool required) val = ptr = *str; skip_whitespace(ctx, 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); - } + if (required && !*val) + uci_parse_error(ctx, *str, "insufficient arguments"); + if (name && !uci_validate_name(val)) + uci_parse_error(ctx, val, "invalid character in field"); return val; } @@ -260,12 +262,9 @@ 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); - } + tmp = next_arg(ctx, str, false, false); + if (tmp && *tmp) + uci_parse_error(ctx, *str, "too many arguments"); } /* @@ -296,29 +295,27 @@ static void uci_switch_config(struct uci_context *ctx) * if an older config under the same name exists, unload it * ignore errors here, e.g. if the config was not found */ - UCI_TRAP_SAVE(ctx, ignore); e = uci_lookup_list(ctx, &ctx->root, name); if (e) - uci_unload(ctx, uci_to_package(e)); - UCI_TRAP_RESTORE(ctx); -ignore: - ctx->errno = 0; - + UCI_THROW(ctx, UCI_ERR_DUPLICATE); pctx->package = uci_alloc_package(ctx, name); } /* * parse the 'package' uci command (next config package) */ -static void uci_parse_package(struct uci_context *ctx, char **str) +static void uci_parse_package(struct uci_context *ctx, char **str, bool single) { char *name = NULL; /* command string null-terminated by strtok */ *str += strlen(*str) + 1; - name = next_arg(ctx, str, true); + name = next_arg(ctx, str, true, true); assert_eol(ctx, str); + if (single) + return; + ctx->pctx->name = name; uci_switch_config(ctx); } @@ -332,19 +329,17 @@ static void uci_parse_config(struct uci_context *ctx, char **str) char *type = NULL; if (!ctx->pctx->package) { - if (!ctx->pctx->name) { - ctx->pctx->byte = *str - ctx->pctx->buf; - ctx->pctx->reason = "attempting to import a file without a package name"; - UCI_THROW(ctx, UCI_ERR_PARSE); - } + if (!ctx->pctx->name) + uci_parse_error(ctx, *str, "attempting to import a file without a package name"); + uci_switch_config(ctx); } /* command string null-terminated by strtok */ *str += strlen(*str) + 1; - type = next_arg(ctx, str, true); - name = next_arg(ctx, str, false); + type = next_arg(ctx, str, true, true); + name = next_arg(ctx, str, false, true); assert_eol(ctx, str); ctx->pctx->section = uci_alloc_section(ctx->pctx->package, type, name); } @@ -357,16 +352,14 @@ static void uci_parse_option(struct uci_context *ctx, char **str) char *name = NULL; char *value = NULL; - if (!ctx->pctx->section) { - ctx->pctx->byte = *str - ctx->pctx->buf; - ctx->pctx->reason = "option command found before the first section"; - UCI_THROW(ctx, UCI_ERR_PARSE); - } + if (!ctx->pctx->section) + uci_parse_error(ctx, *str, "option command found before the first section"); + /* command string null-terminated by strtok */ *str += strlen(*str) + 1; - name = next_arg(ctx, str, true); - value = next_arg(ctx, str, true); + name = next_arg(ctx, str, true, true); + value = next_arg(ctx, str, true, false); assert_eol(ctx, str); uci_alloc_option(ctx->pctx->section, name, value); } @@ -375,7 +368,7 @@ static void uci_parse_option(struct uci_context *ctx, char **str) /* * parse a complete input line, split up combined commands by ';' */ -static void uci_parse_line(struct uci_context *ctx) +static void uci_parse_line(struct uci_context *ctx, bool single) { struct uci_parse_context *pctx = ctx->pctx; char *word, *brk = NULL; @@ -390,7 +383,7 @@ static void uci_parse_line(struct uci_context *ctx) switch(word[0]) { case 'p': if ((word[1] == 0) || !strcmp(word + 1, "ackage")) - uci_parse_package(ctx, &word); + uci_parse_package(ctx, &word, single); break; case 'c': if ((word[1] == 0) || !strcmp(word + 1, "onfig")) @@ -401,16 +394,14 @@ 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); + uci_parse_error(ctx, word, "unterminated command"); break; } } } /* max number of characters that escaping adds to the string */ -#define UCI_QUOTE_ESCAPE "'\\'" +#define UCI_QUOTE_ESCAPE "'\\''" /* * escape an uci string for export @@ -454,12 +445,13 @@ static char *uci_escape(struct uci_context *ctx, char *str) /* * export a single config package to a file stream */ -static void uci_export_package(struct uci_package *p, FILE *stream) +static void uci_export_package(struct uci_package *p, FILE *stream, bool header) { struct uci_context *ctx = p->ctx; struct uci_element *s, *o; - fprintf(stream, "package '%s'\n", uci_escape(ctx, p->e.name)); + if (header) + fprintf(stream, "package '%s'\n", uci_escape(ctx, p->e.name)); uci_foreach_element(&p->sections, s) { struct uci_section *sec = uci_to_section(s); fprintf(stream, "\nconfig '%s'", uci_escape(ctx, sec->type)); @@ -473,26 +465,25 @@ static void uci_export_package(struct uci_package *p, FILE *stream) fprintf(stream, "\n"); } -int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *package) +int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *package, bool header) { struct uci_element *e; UCI_HANDLE_ERR(ctx); UCI_ASSERT(ctx, stream != NULL); - if (package) { - uci_export_package(package, stream); - goto done; + if (package) + uci_export_package(package, stream, header); + else { + uci_foreach_element(&ctx->root, e) { + uci_export_package(uci_to_package(e), stream, header); + } } - uci_foreach_element(&ctx->root, e) { - uci_export_package(uci_to_package(e), stream); - } -done: return 0; } -int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_package **package) +int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_package **package, bool single) { struct uci_parse_context *pctx; @@ -514,7 +505,7 @@ int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u while (!feof(pctx->file)) { uci_getln(ctx, 0); if (pctx->buf[0]) - uci_parse_line(ctx); + uci_parse_line(ctx, single); } if (package) @@ -567,14 +558,16 @@ int uci_load(struct uci_context *ctx, const char *name, struct uci_package **pac if (fd <= 0) UCI_THROW(ctx, UCI_ERR_IO); - flock(fd, LOCK_SH); + if (flock(fd, LOCK_SH) < 0) + UCI_THROW(ctx, UCI_ERR_IO); + file = fdopen(fd, "r"); if (!file) UCI_THROW(ctx, UCI_ERR_IO); ctx->errno = 0; UCI_TRAP_SAVE(ctx, done); - uci_import(ctx, file, name, package); + uci_import(ctx, file, name, package, true); UCI_TRAP_RESTORE(ctx); if (*package) { @@ -588,6 +581,46 @@ done: return ctx->errno; } +int uci_commit(struct uci_context *ctx, struct uci_package *p) +{ + FILE *f = NULL; + int fd = 0; + int err = UCI_ERR_IO; + + UCI_HANDLE_ERR(ctx); + UCI_ASSERT(ctx, p != NULL); + UCI_ASSERT(ctx, p->path != NULL); + + fd = open(p->path, O_RDWR); + if (fd < 0) + goto done; + + if (flock(fd, LOCK_EX) < 0) + goto done; + + ftruncate(fd, 0); + f = fdopen(fd, "w"); + if (!f) + goto done; + + UCI_TRAP_SAVE(ctx, done); + uci_export(ctx, f, p, false); + UCI_TRAP_RESTORE(ctx); + +done: + if (f) + fclose(f); + else if (fd > 0) + close(fd); + + if (ctx->errno) + UCI_THROW(ctx, ctx->errno); + if (err) + UCI_THROW(ctx, UCI_ERR_IO); + return 0; +} + + /* * This function returns the filename by returning the string * after the last '/' character. By checking for a non-'\0'