* 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.
*/
/*
#define _GNU_SOURCE
#include <sys/types.h>
+#include <sys/stat.h>
#include <sys/file.h>
#include <stdbool.h>
#include <unistd.h>
#include "uci_internal.h"
#define LINEBUF 32
-#define LINEBUF_MAX 4096
/*
* Fetch a new line from the input stream and resize buffer if necessary
pctx->buf = uci_malloc(ctx, LINEBUF);
pctx->bufsz = LINEBUF;
}
+ /* It takes 2 slots for fgets to read 1 char. */
+ if (offset >= pctx->bufsz - 1) {
+ pctx->bufsz *= 2;
+ pctx->buf = uci_realloc(ctx, pctx->buf, pctx->bufsz);
+ }
ofs = offset;
do {
p = &pctx->buf[ofs];
- p[ofs] = 0;
+ p[0] = 0;
p = fgets(p, pctx->bufsz - ofs, pctx->file);
if (!p || !*p)
ofs += strlen(p);
if (pctx->buf[ofs - 1] == '\n') {
pctx->line++;
- pctx->buf[ofs - 1] = 0;
return;
}
- 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);
} while (1);
}
-
/*
* parse a character escaped by '\'
* returns true if the escaped character is to be parsed
* returns false if the escaped character is to be ignored
*/
-static inline bool parse_backslash(struct uci_context *ctx, char **str)
+static bool parse_backslash(struct uci_context *ctx)
{
+ struct uci_parse_context *pctx = ctx->pctx;
+
/* skip backslash */
- *str += 1;
+ pctx->pos += 1;
/* undecoded backslash at the end of line, fetch the next line */
- if (!**str) {
- *str += 1;
- uci_getln(ctx, *str - ctx->pctx->buf);
+ if (!pctx_cur_char(pctx) ||
+ pctx_cur_char(pctx) == '\n' ||
+ (pctx_cur_char(pctx) == '\r' &&
+ pctx_char(pctx, pctx_pos(pctx) + 1) == '\n' &&
+ !pctx_char(pctx, pctx_pos(pctx) + 2))) {
+ uci_getln(ctx, pctx->pos);
return false;
}
* move the string pointer forward until a non-whitespace character or
* EOL is reached
*/
-static void skip_whitespace(struct uci_context *ctx, char **str)
+static void skip_whitespace(struct uci_context *ctx)
{
-restart:
- while (**str && isspace(**str))
- *str += 1;
+ struct uci_parse_context *pctx = ctx->pctx;
- if (**str == '\\') {
- if (!parse_backslash(ctx, str))
- goto restart;
- }
+ while (pctx_cur_char(pctx) && isspace(pctx_cur_char(pctx)))
+ pctx->pos += 1;
}
-static inline void addc(char **dest, char **src)
+static inline void addc(struct uci_context *ctx, int *pos_dest, int *pos_src)
{
- **dest = **src;
- *dest += 1;
- *src += 1;
+ struct uci_parse_context *pctx = ctx->pctx;
+
+ pctx_char(pctx, *pos_dest) = pctx_char(pctx, *pos_src);
+ *pos_dest += 1;
+ *pos_src += 1;
}
/*
* parse a double quoted string argument from the command line
*/
-static void parse_double_quote(struct uci_context *ctx, char **str, char **target)
+static void parse_double_quote(struct uci_context *ctx, int *target)
{
+ struct uci_parse_context *pctx = ctx->pctx;
char c;
/* skip quote character */
- *str += 1;
+ pctx->pos += 1;
- while ((c = **str)) {
+ while (1) {
+ c = pctx_cur_char(pctx);
switch(c) {
case '"':
- **target = 0;
- *str += 1;
+ pctx->pos += 1;
return;
+ case 0:
+ /* Multi-line str value */
+ uci_getln(ctx, pctx->pos);
+ if (!pctx_cur_char(pctx)) {
+ uci_parse_error(ctx, "EOF with unterminated \"");
+ }
+ break;
case '\\':
- if (!parse_backslash(ctx, str))
+ if (!parse_backslash(ctx))
continue;
/* fall through */
default:
- addc(target, str);
+ addc(ctx, target, &pctx->pos);
break;
}
}
- uci_parse_error(ctx, *str, "unterminated \"");
}
/*
* parse a single quoted string argument from the command line
*/
-static void parse_single_quote(struct uci_context *ctx, char **str, char **target)
+static void parse_single_quote(struct uci_context *ctx, int *target)
{
+ struct uci_parse_context *pctx = ctx->pctx;
char c;
/* skip quote character */
- *str += 1;
+ pctx->pos += 1;
- while ((c = **str)) {
+ while (1) {
+ c = pctx_cur_char(pctx);
switch(c) {
case '\'':
- **target = 0;
- *str += 1;
+ pctx->pos += 1;
return;
+ case 0:
+ /* Multi-line str value */
+ uci_getln(ctx, pctx->pos);
+ if (!pctx_cur_char(pctx))
+ uci_parse_error(ctx, "EOF with unterminated '");
+
+ break;
default:
- addc(target, str);
+ addc(ctx, target, &pctx->pos);
}
}
- uci_parse_error(ctx, *str, "unterminated '");
}
/*
* parse a string from the command line and detect the quoting style
*/
-static void parse_str(struct uci_context *ctx, char **str, char **target)
+static void parse_str(struct uci_context *ctx, int *target)
{
+ struct uci_parse_context *pctx = ctx->pctx;
bool next = true;
do {
- switch(**str) {
+ switch(pctx_cur_char(pctx)) {
case '\'':
- parse_single_quote(ctx, str, target);
+ parse_single_quote(ctx, target);
break;
case '"':
- parse_double_quote(ctx, str, target);
+ parse_double_quote(ctx, target);
break;
case '#':
- **str = 0;
+ pctx_cur_char(pctx) = 0;
/* fall through */
case 0:
goto done;
next = false;
goto done;
case '\\':
- if (!parse_backslash(ctx, str))
+ if (!parse_backslash(ctx))
continue;
/* fall through */
default:
- addc(target, str);
+ addc(ctx, target, &pctx->pos);
break;
}
- } while (**str && !isspace(**str));
+ } while (pctx_cur_char(pctx) && !isspace(pctx_cur_char(pctx)));
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 && next)
- *str += 1;
+ if (pctx_cur_char(pctx) && next)
+ pctx->pos += 1;
/* terminate the parsed string */
- **target = 0;
+ pctx_char(pctx, *target) = 0;
}
/*
* extract the next argument from the command line
*/
-static char *next_arg(struct uci_context *ctx, char **str, bool required, bool name)
+static int next_arg(struct uci_context *ctx, bool required, bool name, bool package)
{
- char *val;
- char *ptr;
-
- val = ptr = *str;
- skip_whitespace(ctx, str);
- if(*str[0] == ';') {
- *str[0] = 0;
- *str += 1;
+ struct uci_parse_context *pctx = ctx->pctx;
+ int val, ptr;
+
+ skip_whitespace(ctx);
+ val = ptr = pctx_pos(pctx);
+ if (pctx_cur_char(pctx) == ';') {
+ pctx_cur_char(pctx) = 0;
+ pctx->pos += 1;
} else {
- parse_str(ctx, str, &ptr);
+ parse_str(ctx, &ptr);
}
- if (!*val) {
+ if (!pctx_char(pctx, val)) {
if (required)
- uci_parse_error(ctx, *str, "insufficient arguments");
+ uci_parse_error(ctx, "insufficient arguments");
goto done;
}
- if (name && !uci_validate_name(val))
- uci_parse_error(ctx, val, "invalid character in field");
+ if (name && !uci_validate_str(pctx_str(pctx, val), name, package))
+ uci_parse_error(ctx, "invalid character in name field");
done:
return val;
int uci_parse_argument(struct uci_context *ctx, FILE *stream, char **str, char **result)
{
+ int ofs_result;
+
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, str != NULL);
UCI_ASSERT(ctx, result != NULL);
uci_alloc_parse_context(ctx);
ctx->pctx->file = stream;
-
if (!*str) {
+ ctx->pctx->pos = 0;
uci_getln(ctx, 0);
- *str = ctx->pctx->buf;
}
- *result = next_arg(ctx, str, false, false);
+ ofs_result = next_arg(ctx, false, false, false);
+ *result = pctx_str(ctx->pctx, ofs_result);
+ *str = pctx_cur_str(ctx->pctx);
return 0;
}
* 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)
+static void assert_eol(struct uci_context *ctx)
{
char *tmp;
+ int ofs_tmp;
- skip_whitespace(ctx, str);
- tmp = next_arg(ctx, str, false, false);
+ skip_whitespace(ctx);
+ ofs_tmp = next_arg(ctx, false, false, false);
+ tmp = pctx_str(ctx->pctx, ofs_tmp);
if (*tmp && (ctx->flags & UCI_FLAG_STRICT))
- uci_parse_error(ctx, *str, "too many arguments");
+ uci_parse_error(ctx, "too many arguments");
}
-/*
+/*
* switch to a different config, either triggered by uci_load, or by a
* 'package <...>' statement in the import file
*/
if (!name)
return;
- /*
+ /*
* if an older config under the same name exists, unload it
* ignore errors here, e.g. if the config was not found
*/
/*
* parse the 'package' uci command (next config package)
*/
-static void uci_parse_package(struct uci_context *ctx, char **str, bool single)
+static void uci_parse_package(struct uci_context *ctx, bool single)
{
- char *name = NULL;
+ struct uci_parse_context *pctx = ctx->pctx;
+ int ofs_name;
+ char *name;
/* command string null-terminated by strtok */
- *str += strlen(*str) + 1;
+ pctx->pos += strlen(pctx_cur_str(pctx)) + 1;
- name = next_arg(ctx, str, true, true);
- assert_eol(ctx, str);
+ ofs_name = next_arg(ctx, true, true, true);
+ name = pctx_str(pctx, ofs_name);
+ assert_eol(ctx);
if (single)
return;
/*
* parse the 'config' uci command (open a section)
*/
-static void uci_parse_config(struct uci_context *ctx, char **str)
+static void uci_parse_config(struct uci_context *ctx)
{
struct uci_parse_context *pctx = ctx->pctx;
struct uci_element *e;
struct uci_ptr ptr;
- char *name = NULL;
- char *type = NULL;
+ int ofs_name, ofs_type;
+ char *name;
+ char *type;
- uci_fixup_section(ctx, ctx->pctx->section);
if (!ctx->pctx->package) {
if (!ctx->pctx->name)
- uci_parse_error(ctx, *str, "attempting to import a file without a package name");
+ uci_parse_error(ctx, "attempting to import a file without a package name");
uci_switch_config(ctx);
}
/* command string null-terminated by strtok */
- *str += strlen(*str) + 1;
+ pctx->pos += strlen(pctx_cur_str(pctx)) + 1;
- type = next_arg(ctx, str, true, false);
+ ofs_type = next_arg(ctx, true, false, false);
+ type = pctx_str(pctx, ofs_type);
if (!uci_validate_type(type))
- uci_parse_error(ctx, type, "invalid character in field");
- name = next_arg(ctx, str, false, true);
- assert_eol(ctx, str);
+ uci_parse_error(ctx, "invalid character in type field");
+
+ ofs_name = next_arg(ctx, false, true, false);
+ type = pctx_str(pctx, ofs_type);
+ name = pctx_str(pctx, ofs_name);
+ assert_eol(ctx);
- if (!name) {
+ if (!name || !name[0]) {
ctx->internal = !pctx->merge;
UCI_NESTED(uci_add_section, ctx, pctx->package, type, &pctx->section);
} else {
uci_fill_ptr(ctx, &ptr, &pctx->package->e);
e = uci_lookup_list(&pctx->package->sections, name);
- if (e)
+ if (e) {
ptr.s = uci_to_section(e);
+
+ if ((ctx->flags & UCI_FLAG_STRICT) && strcmp(ptr.s->type, type))
+ uci_parse_error(ctx, "section of different type overwrites prior section with same name");
+ }
+
ptr.section = name;
ptr.value = type;
/*
* parse the 'option' uci command (open a value)
*/
-static void uci_parse_option(struct uci_context *ctx, char **str, bool list)
+static void uci_parse_option(struct uci_context *ctx, bool list)
{
struct uci_parse_context *pctx = ctx->pctx;
struct uci_element *e;
struct uci_ptr ptr;
+ int ofs_name, ofs_value;
char *name = NULL;
char *value = NULL;
if (!pctx->section)
- uci_parse_error(ctx, *str, "option/list command found before the first section");
+ uci_parse_error(ctx, "option/list command found before the first section");
/* command string null-terminated by strtok */
- *str += strlen(*str) + 1;
+ pctx->pos += strlen(pctx_cur_str(pctx)) + 1;
- name = next_arg(ctx, str, true, true);
- value = next_arg(ctx, str, false, false);
- assert_eol(ctx, str);
+ ofs_name = next_arg(ctx, true, true, false);
+ ofs_value = next_arg(ctx, false, false, false);
+ name = pctx_str(pctx, ofs_name);
+ value = pctx_str(pctx, ofs_value);
+ assert_eol(ctx);
uci_fill_ptr(ctx, &ptr, &pctx->section->e);
e = uci_lookup_list(&pctx->section->options, name);
static void uci_parse_line(struct uci_context *ctx, bool single)
{
struct uci_parse_context *pctx = ctx->pctx;
- char *word, *brk;
+ char *word;
- word = pctx->buf;
+ /* Skip whitespace characters at the start of line */
+ skip_whitespace(ctx);
do {
- brk = NULL;
- word = strtok_r(word, " \t", &brk);
+ word = strtok(pctx_cur_str(pctx), " \t");
if (!word)
return;
return;
case 'p':
if ((word[1] == 0) || !strcmp(word + 1, "ackage"))
- uci_parse_package(ctx, &word, single);
+ uci_parse_package(ctx, single);
else
goto invalid;
break;
case 'c':
if ((word[1] == 0) || !strcmp(word + 1, "onfig"))
- uci_parse_config(ctx, &word);
+ uci_parse_config(ctx);
else
goto invalid;
break;
case 'o':
if ((word[1] == 0) || !strcmp(word + 1, "ption"))
- uci_parse_option(ctx, &word, false);
+ uci_parse_option(ctx, false);
else
goto invalid;
break;
case 'l':
if ((word[1] == 0) || !strcmp(word + 1, "ist"))
- uci_parse_option(ctx, &word, true);
+ uci_parse_option(ctx, true);
else
goto invalid;
break;
}
continue;
invalid:
- uci_parse_error(ctx, word, "invalid command");
+ uci_parse_error(ctx, "invalid command");
} while (1);
}
/*
* escape an uci string for export
*/
-static char *uci_escape(struct uci_context *ctx, const char *str)
+static const char *uci_escape(struct uci_context *ctx, const char *str)
{
const char *end;
int ofs = 0;
if (!ctx->buf) {
ctx->bufsz = LINEBUF;
ctx->buf = malloc(LINEBUF);
+
+ if (!ctx->buf)
+ return str;
}
while (1) {
struct uci_element *s, *o, *i;
if (header)
- fprintf(stream, "package '%s'\n", uci_escape(ctx, p->e.name));
+ 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));
+ fprintf(stream, "\nconfig %s", uci_escape(ctx, sec->type));
if (!sec->anonymous || (ctx->flags & UCI_FLAG_EXPORT_NAME))
fprintf(stream, " '%s'", uci_escape(ctx, sec->e.name));
fprintf(stream, "\n");
struct uci_option *opt = uci_to_option(o);
switch(opt->type) {
case UCI_TYPE_STRING:
- fprintf(stream, "\toption '%s'", uci_escape(ctx, opt->e.name));
+ fprintf(stream, "\toption %s", uci_escape(ctx, opt->e.name));
fprintf(stream, " '%s'\n", uci_escape(ctx, opt->v.string));
break;
case UCI_TYPE_LIST:
uci_foreach_element(&opt->v.list, i) {
- fprintf(stream, "\tlist '%s'", uci_escape(ctx, opt->e.name));
+ fprintf(stream, "\tlist %s", uci_escape(ctx, opt->e.name));
fprintf(stream, " '%s'\n", uci_escape(ctx, i->name));
}
break;
uci_alloc_parse_context(ctx);
pctx = ctx->pctx;
pctx->file = stream;
- if (*package && single) {
+ if (package && *package && single) {
pctx->package = *package;
pctx->merge = true;
}
}
while (!feof(pctx->file)) {
+ pctx->pos = 0;
uci_getln(ctx, 0);
UCI_TRAP_SAVE(ctx, error);
if (pctx->buf[0])
UCI_THROW(ctx, ctx->err);
}
- uci_fixup_section(ctx, ctx->pctx->section);
if (!pctx->package && name)
uci_switch_config(ctx);
if (package)
return filename;
}
-void uci_file_commit(struct uci_context *ctx, struct uci_package **package, bool overwrite)
+static void uci_file_commit(struct uci_context *ctx, struct uci_package **package, bool overwrite)
{
struct uci_package *p = *package;
- FILE *f = NULL;
+ FILE *f1, *f2 = NULL;
char *name = NULL;
char *path = NULL;
+ char *filename = NULL;
+ struct stat statbuf;
+ bool do_rename = false;
if (!p->path) {
if (overwrite)
UCI_THROW(ctx, UCI_ERR_INVAL);
}
+ if ((asprintf(&filename, "%s/.%s.uci-XXXXXX", ctx->confdir, p->e.name) < 0) || !filename)
+ UCI_THROW(ctx, UCI_ERR_MEM);
+
/* open the config file for writing now, so that it is locked */
- f = uci_open_stream(ctx, p->path, SEEK_SET, true, true);
+ f1 = uci_open_stream(ctx, p->path, NULL, SEEK_SET, true, true);
/* flush unsaved changes and reload from delta file */
UCI_TRAP_SAVE(ctx, done);
if (!uci_list_empty(&p->delta))
UCI_INTERNAL(uci_save, ctx, p);
- /*
- * other processes might have modified the config
- * as well. dump and reload
+ /*
+ * other processes might have modified the config
+ * as well. dump and reload
*/
uci_free_package(&p);
uci_cleanup(ctx);
- UCI_INTERNAL(uci_import, ctx, f, name, &p, true);
+ UCI_INTERNAL(uci_import, ctx, f1, name, &p, true);
p->path = path;
p->has_delta = true;
goto done;
}
- rewind(f);
- if (ftruncate(fileno(f), 0) < 0)
+ if (!mktemp(filename))
+ *filename = 0;
+
+ if (!*filename) {
+ free(filename);
UCI_THROW(ctx, UCI_ERR_IO);
+ }
+
+ if ((stat(filename, &statbuf) == 0) && ((statbuf.st_mode & S_IFMT) != S_IFREG))
+ UCI_THROW(ctx, UCI_ERR_IO);
+
+ f2 = uci_open_stream(ctx, filename, p->path, SEEK_SET, true, true);
+ uci_export(ctx, f2, p, false);
+
+ fflush(f2);
+ fsync(fileno(f2));
+ uci_close_stream(f2);
+
+ do_rename = true;
- uci_export(ctx, f, p, false);
UCI_TRAP_RESTORE(ctx);
done:
- if (name)
- free(name);
- if (path)
+ free(name);
+ free(path);
+ uci_close_stream(f1);
+ if (do_rename) {
+ path = realpath(p->path, NULL);
+ if (!path || rename(filename, path)) {
+ unlink(filename);
+ UCI_THROW(ctx, UCI_ERR_IO);
+ }
free(path);
- uci_close_stream(f);
+ }
+ free(filename);
if (ctx->err)
UCI_THROW(ctx, ctx->err);
}
-/*
+/*
* This function returns the filename by returning the string
* after the last '/' character. By checking for a non-'\0'
* character afterwards, directories are ignored (glob marks
{
char **configs;
glob_t globbuf;
- int size, i;
+ int size, i, j, skipped;
char *buf;
char *dir;
}
size = sizeof(char *) * (globbuf.gl_pathc + 1);
+ skipped = 0;
for(i = 0; i < globbuf.gl_pathc; i++) {
char *p;
p = get_filename(globbuf.gl_pathv[i]);
- if (!p)
+ if (!p) {
+ skipped++;
continue;
+ }
size += strlen(p) + 1;
}
- configs = uci_malloc(ctx, size);
- buf = (char *) &configs[globbuf.gl_pathc + 1];
+ configs = uci_malloc(ctx, size - skipped);
+ buf = (char *) &configs[globbuf.gl_pathc + 1 - skipped];
+ j = 0;
for(i = 0; i < globbuf.gl_pathc; i++) {
char *p;
if (!uci_validate_package(p))
continue;
- configs[i] = buf;
+ configs[j++] = buf;
strcpy(buf, p);
buf += strlen(buf) + 1;
}
break;
}
- file = uci_open_stream(ctx, filename, SEEK_SET, false, false);
- ctx->err = 0;
UCI_TRAP_SAVE(ctx, done);
+ file = uci_open_stream(ctx, filename, NULL, SEEK_SET, false, false);
+ ctx->err = 0;
UCI_INTERNAL(uci_import, ctx, file, name, &package, true);
UCI_TRAP_RESTORE(ctx);
done:
uci_close_stream(file);
- if (ctx->err)
+ if (ctx->err) {
+ free(filename);
UCI_THROW(ctx, ctx->err);
+ }
return package;
}
projects / project / uci.git / blobdiff