#include "uci_internal.h"
#define LINEBUF 32
-#define LINEBUF_MAX 4096
/*
* Fetch a new line from the input stream and resize buffer if necessary
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);
+ if (!pctx->buf)
+ UCI_THROW(ctx, UCI_ERR_MEM);
} while (1);
}
break;
}
}
- uci_parse_error(ctx, "unterminated \"");
}
/*
/* Multi-line str value */
uci_getln(ctx, pctx->pos);
if (!pctx_cur_char(pctx))
- uci_parse_error(ctx, "EOF with unterminated \"");
+ uci_parse_error(ctx, "EOF with unterminated '");
break;
default:
addc(ctx, target, &pctx->pos);
}
}
- uci_parse_error(ctx, "unterminated '");
}
/*
/*
* 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;
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);
return 0;
}
+/*
+ * Fixup sections functions does the fixup of all sections for given package.
+ * It is used as a preprocessing step for fixing up existing anonymous sections
+ * from configurations.
+ *
+ * It uses uci_fixup_section() from list.c and then adds delta changes.
+ */
+static void
+uci_fixup_sections(struct uci_context *ctx, struct uci_package *p)
+{
+ struct uci_element *e;
+ struct uci_section *s;
+
+ uci_foreach_element(&p->sections, e) {
+ s = uci_to_section(e);
+ s->package->name_index++;
+ uci_fixup_section(ctx, s);
+ s->anonymous = false;
+ }
+}
+
static int
uci_fill_ptr(struct uci_context *ctx, struct uci_ptr *ptr, struct uci_element *e)
{
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");
/* command string null-terminated by strtok */
pctx->pos += strlen(pctx_cur_str(pctx)) + 1;
- ofs_name = next_arg(ctx, true, true);
+ ofs_name = next_arg(ctx, true, true, true);
name = pctx_str(pctx, ofs_name);
assert_eol(ctx);
if (single)
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;
- 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);
type = pctx_str(pctx, ofs_type);
name = pctx_str(pctx, ofs_name);
assert_eol(ctx);
} 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;
/* command string null-terminated by strtok */
pctx->pos += strlen(pctx_cur_str(pctx)) + 1;
- 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);
name = pctx_str(pctx, ofs_name);
value = pctx_str(pctx, ofs_value);
assert_eol(ctx);
uci_foreach_element(&p->sections, s) {
struct uci_section *sec = uci_to_section(s);
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, " '%s'", uci_escape(ctx, sec->e.name));
fprintf(stream, "\n");
uci_foreach_element(&sec->options, o) {
struct uci_option *opt = uci_to_option(o);
UCI_THROW(ctx, ctx->err);
}
- uci_fixup_section(ctx, ctx->pctx->section);
if (!pctx->package && name)
uci_switch_config(ctx);
if (package)
if (pctx->merge)
pctx->package = NULL;
+ uci_fixup_sections(ctx, *package);
pctx->name = NULL;
uci_switch_config(ctx);
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);
-
/* 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;
}
+ 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);
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 || 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 *filename;
bool confdir;
FILE *file = NULL;
+ size_t n_change;
switch (name[0]) {
case '.':
if (package) {
package->path = filename;
package->has_delta = confdir;
- uci_load_delta(ctx, package, false);
+ n_change = uci_load_delta(ctx, package, false);
+ package->name_index += n_change;
}
done:
projects / project / uci.git / blobdiff