#include <glob.h>
#include <string.h>
#include <stdlib.h>
+#include <errno.h>
#include "uci.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
*/
-__private void uci_getln(struct uci_context *ctx, int offset)
+__private void uci_getln(struct uci_context *ctx, size_t offset)
{
struct uci_parse_context *pctx = ctx->pctx;
char *p;
- int ofs;
+ size_t ofs;
if (pctx->buf == NULL) {
pctx->buf = uci_malloc(ctx, LINEBUF);
return;
ofs += strlen(p);
+ pctx->buf_filled = ofs;
if (pctx->buf[ofs - 1] == '\n') {
pctx->line++;
return;
}
- if (pctx->bufsz > LINEBUF_MAX/2)
- uci_parse_error(ctx, "line too long");
-
pctx->bufsz *= 2;
pctx->buf = uci_realloc(ctx, pctx->buf, pctx->bufsz);
} while (1);
pctx->pos += 1;
}
-static inline void addc(struct uci_context *ctx, int *pos_dest, int *pos_src)
+static inline void addc(struct uci_context *ctx, size_t *pos_dest, size_t *pos_src)
{
struct uci_parse_context *pctx = ctx->pctx;
*pos_src += 1;
}
+static int uci_increase_pos(struct uci_parse_context *pctx, size_t add)
+{
+ if (pctx->pos + add > pctx->buf_filled)
+ return -EINVAL;
+
+ pctx->pos += add;
+ return 0;
+}
+
/*
* parse a double quoted string argument from the command line
*/
-static void parse_double_quote(struct uci_context *ctx, int *target)
+static void parse_double_quote(struct uci_context *ctx, size_t *target)
{
struct uci_parse_context *pctx = ctx->pctx;
char c;
/*
* parse a single quoted string argument from the command line
*/
-static void parse_single_quote(struct uci_context *ctx, int *target)
+static void parse_single_quote(struct uci_context *ctx, size_t *target)
{
struct uci_parse_context *pctx = ctx->pctx;
char c;
/*
* parse a string from the command line and detect the quoting style
*/
-static void parse_str(struct uci_context *ctx, int *target)
+static void parse_str(struct uci_context *ctx, size_t *target)
{
struct uci_parse_context *pctx = ctx->pctx;
bool next = true;
/*
* extract the next argument from the command line
*/
-static int next_arg(struct uci_context *ctx, bool required, bool name)
+static int next_arg(struct uci_context *ctx, bool required, bool name, bool package)
{
struct uci_parse_context *pctx = ctx->pctx;
- int val, ptr;
+ size_t val, ptr;
skip_whitespace(ctx);
val = ptr = pctx_pos(pctx);
goto done;
}
- if (name && !uci_validate_name(pctx_str(pctx, val)))
+ if (name && !uci_validate_str(pctx_str(pctx, val), name, package))
uci_parse_error(ctx, "invalid character in name field");
done:
uci_alloc_parse_context(ctx);
ctx->pctx->file = stream;
-
if (!*str) {
+ ctx->pctx->pos = 0;
uci_getln(ctx, 0);
- *str = ctx->pctx->buf;
- } else {
- UCI_ASSERT(ctx, ctx->pctx->pos == *str - ctx->pctx->buf);
}
- /*FIXME do we need to skip empty lines? */
- ofs_result = next_arg(ctx, false, false);
+ ofs_result = next_arg(ctx, false, false, false);
*result = pctx_str(ctx->pctx, ofs_result);
*str = pctx_cur_str(ctx->pctx);
int ofs_tmp;
skip_whitespace(ctx);
- ofs_tmp = next_arg(ctx, false, false);
+ 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, "too many arguments");
char *name;
/* command string null-terminated by strtok */
- pctx->pos += strlen(pctx_cur_str(pctx)) + 1;
+ if (uci_increase_pos(pctx, strlen(pctx_cur_str(pctx)) + 1))
+ uci_parse_error(ctx, "package without name");
- ofs_name = next_arg(ctx, true, true);
- name = pctx_str(pctx, ofs_name);
+ ofs_name = next_arg(ctx, true, true, true);
assert_eol(ctx);
+ name = pctx_str(pctx, ofs_name);
if (single)
return;
char *name;
char *type;
- uci_fixup_section(ctx, ctx->pctx->section);
if (!ctx->pctx->package) {
if (!ctx->pctx->name)
uci_parse_error(ctx, "attempting to import a file without a package name");
}
/* command string null-terminated by strtok */
- pctx->pos += strlen(pctx_cur_str(pctx)) + 1;
+ if (uci_increase_pos(pctx, strlen(pctx_cur_str(pctx)) + 1))
+ uci_parse_error(ctx, "config without name");
- ofs_type = next_arg(ctx, 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, "invalid character in type field");
- ofs_name = next_arg(ctx, false, true);
+ ofs_name = next_arg(ctx, false, true, false);
+ assert_eol(ctx);
type = pctx_str(pctx, ofs_type);
name = pctx_str(pctx, ofs_name);
- assert_eol(ctx);
if (!name || !name[0]) {
ctx->internal = !pctx->merge;
} 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;
ctx->internal = !pctx->merge;
UCI_NESTED(uci_set, ctx, &ptr);
- pctx->section = uci_to_section(ptr.last);
+ pctx->section = ptr.s;
}
}
uci_parse_error(ctx, "option/list command found before the first section");
/* command string null-terminated by strtok */
- pctx->pos += strlen(pctx_cur_str(pctx)) + 1;
+ if (uci_increase_pos(pctx, strlen(pctx_cur_str(pctx)) + 1))
+ uci_parse_error(ctx, "option without name");
- ofs_name = next_arg(ctx, true, true);
- ofs_value = next_arg(ctx, false, false);
+ ofs_name = next_arg(ctx, true, true, false);
+ ofs_value = next_arg(ctx, false, false, false);
+ assert_eol(ctx);
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);
len = end - str;
/* make sure that we have enough room in the buffer */
- while (ofs + len + sizeof(UCI_QUOTE_ESCAPE) + 1 > ctx->bufsz) {
+ while (ofs + len + (int) sizeof(UCI_QUOTE_ESCAPE) + 1 > ctx->bufsz) {
ctx->bufsz *= 2;
ctx->buf = uci_realloc(ctx, ctx->buf, ctx->bufsz);
}
UCI_THROW(ctx, ctx->err);
}
- uci_fixup_section(ctx, ctx->pctx->section);
if (!pctx->package && name)
uci_switch_config(ctx);
if (package)
{
struct uci_package *p = *package;
FILE *f1, *f2 = NULL;
- char *name = NULL;
- char *path = NULL;
+ char *volatile name = NULL;
+ char *volatile path = NULL;
char *filename = NULL;
struct stat statbuf;
- bool do_rename = false;
+ volatile bool do_rename = false;
+ int fd, sz;
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);
-
- 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);
+ sz = snprintf(NULL, 0, "%s/.%s.uci-XXXXXX", ctx->confdir, p->e.name);
+ filename = alloca(sz + 1);
+ snprintf(filename, sz + 1, "%s/.%s.uci-XXXXXX", ctx->confdir, p->e.name);
/* open the config file for writing now, so that it is locked */
f1 = uci_open_stream(ctx, p->path, NULL, SEEK_SET, true, true);
goto done;
}
- f2 = uci_open_stream(ctx, filename, p->path, SEEK_SET, true, true);
+ fd = mkstemp(filename);
+ if (fd == -1)
+ UCI_THROW(ctx, UCI_ERR_IO);
+
+ if ((flock(fd, LOCK_EX) < 0) && (errno != ENOSYS))
+ UCI_THROW(ctx, UCI_ERR_IO);
+
+ if (lseek(fd, 0, SEEK_SET) < 0)
+ UCI_THROW(ctx, UCI_ERR_IO);
+
+ f2 = fdopen(fd, "w+");
+ if (!f2)
+ UCI_THROW(ctx, UCI_ERR_IO);
+
uci_export(ctx, f2, p, false);
fflush(f2);
free(name);
free(path);
uci_close_stream(f1);
- if (do_rename && rename(filename, p->path)) {
- unlink(filename);
- UCI_THROW(ctx, UCI_ERR_IO);
+ if (do_rename) {
+ path = realpath(p->path, NULL);
+ if (!path || stat(path, &statbuf) || chmod(filename, statbuf.st_mode) || rename(filename, path)) {
+ unlink(filename);
+ UCI_THROW(ctx, UCI_ERR_IO);
+ }
+ free(path);
}
- free(filename);
- sync();
if (ctx->err)
UCI_THROW(ctx, ctx->err);
}
{
char **configs;
glob_t globbuf;
- int size, i;
+ int size, j, skipped;
+ size_t i;
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;
}
return configs;
}
-static struct uci_package *uci_file_load(struct uci_context *ctx, const char *name)
+static struct uci_package *uci_file_load(struct uci_context *ctx,
+ const char *volatile name)
{
struct uci_package *package = NULL;
char *filename;
bool confdir;
- FILE *file = NULL;
+ FILE *volatile file = NULL;
switch (name[0]) {
case '.':
projects / project / uci.git / blobdiff