* libuci - Library for the Unified Configuration Interface
* Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
*
- * this program is free software; you can redistribute it and/or modify
- * it under the terms of the gnu lesser general public license version 2.1
- * as published by the free software foundation
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1
+ * as published by the Free Software Foundation
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* This file contains the code for parsing uci config files
*/
+#define _GNU_SOURCE
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/file.h>
#include <stdbool.h>
#include <unistd.h>
#include <fcntl.h>
case '"':
parse_double_quote(ctx, str, target);
break;
+ case '#':
+ **str = 0;
+ /* fall through */
case 0:
goto done;
case '\\':
char *tmp;
tmp = next_arg(ctx, str, false, false);
- if (tmp && *tmp)
+ if (tmp && *tmp && (ctx->flags & UCI_FLAG_STRICT))
uci_parse_error(ctx, *str, "too many arguments");
}
static void uci_parse_config(struct uci_context *ctx, char **str)
{
struct uci_parse_context *pctx = ctx->pctx;
- struct uci_section *s;
char *name = NULL;
char *type = NULL;
name = next_arg(ctx, str, false, true);
assert_eol(ctx, str);
- if (pctx->merge)
- UCI_INTERNAL(uci_set, ctx, pctx->package, name, NULL, type);
- else
+ if (pctx->merge) {
+ UCI_TRAP_SAVE(ctx, error);
+ uci_set(ctx, pctx->package, name, NULL, type);
+ UCI_TRAP_RESTORE(ctx);
+ return;
+error:
+ UCI_THROW(ctx, ctx->errno);
+ } else
pctx->section = uci_alloc_section(pctx->package, type, name);
}
value = next_arg(ctx, str, true, false);
assert_eol(ctx, str);
- if (pctx->merge)
- UCI_INTERNAL(uci_set, ctx, pctx->package, pctx->section->e.name, name, value);
- else
+ if (pctx->merge) {
+ UCI_TRAP_SAVE(ctx, error);
+ uci_set(ctx, pctx->package, pctx->section->e.name, name, value);
+ UCI_TRAP_RESTORE(ctx);
+ return;
+error:
+ UCI_THROW(ctx, ctx->errno);
+ } else
uci_alloc_option(pctx->section, name, value);
}
char *pbrk = NULL;
word = strtok_r(word, " \t", &pbrk);
+ if (!word)
+ continue;
+
switch(word[0]) {
+ case '#':
+ return;
case 'p':
if ((word[1] == 0) || !strcmp(word + 1, "ackage"))
uci_parse_package(ctx, &word, single);
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)
+ if (!sec->anonymous || (ctx->flags & UCI_FLAG_EXPORT_NAME))
fprintf(stream, " '%s'", uci_escape(ctx, sec->e.name));
fprintf(stream, "\n");
uci_foreach_element(&sec->options, o) {
* the appropriate 'package <name>' string to specify the config name
* NB: the config file can still override the package name
*/
- if (name)
+ if (name) {
+ UCI_ASSERT(ctx, uci_validate_name(name));
pctx->name = name;
+ }
while (!feof(pctx->file)) {
uci_getln(ctx, 0);
uci_fixup_section(ctx, ctx->pctx->section);
if (package)
*package = pctx->package;
+ if (pctx->merge)
+ pctx->package = NULL;
pctx->name = NULL;
uci_switch_config(ctx);
}
UCI_INTERNAL(uci_parse_tuple, ctx, buf, &package, §ion, &option, &value);
- if (!package || !section || (!delete && !value))
- goto error;
- if (strcmp(package, p->e.name) != 0)
+ if (!package || (strcmp(package, p->e.name) != 0))
goto error;
if (!uci_validate_name(section))
goto error;
if (option && !uci_validate_name(option))
goto error;
+ if ((rename || !delete) && !uci_validate_name(value))
+ goto error;
if (rename)
UCI_INTERNAL(uci_rename, ctx, p, section, option, value);
uci_file_cleanup(ctx);
}
+static void uci_load_history_file(struct uci_context *ctx, struct uci_package *p, char *filename, FILE **f, bool flush)
+{
+ FILE *stream = NULL;
+
+ UCI_TRAP_SAVE(ctx, done);
+ stream = uci_open_stream(ctx, filename, SEEK_SET, flush, false);
+ if (p)
+ uci_parse_history(ctx, stream, p);
+ UCI_TRAP_RESTORE(ctx);
+done:
+ if (f)
+ *f = stream;
+ else if (stream)
+ uci_close_stream(stream);
+}
+
static void uci_load_history(struct uci_context *ctx, struct uci_package *p, bool flush)
{
+ struct uci_element *e;
char *filename = NULL;
FILE *f = NULL;
if (!p->confdir)
return;
- if ((asprintf(&filename, "%s/%s", UCI_SAVEDIR, p->e.name) < 0) || !filename)
- UCI_THROW(ctx, UCI_ERR_MEM);
- UCI_TRAP_SAVE(ctx, done);
- f = uci_open_stream(ctx, filename, SEEK_SET, flush, false);
- uci_parse_history(ctx, f, p);
- UCI_TRAP_RESTORE(ctx);
+ uci_foreach_element(&ctx->history_path, e) {
+ if ((asprintf(&filename, "%s/%s", e->name, p->e.name) < 0) || !filename)
+ UCI_THROW(ctx, UCI_ERR_MEM);
-done:
+ uci_load_history_file(ctx, p, filename, NULL, false);
+ free(filename);
+ }
+
+ if ((asprintf(&filename, "%s/%s", ctx->savedir, p->e.name) < 0) || !filename)
+ UCI_THROW(ctx, UCI_ERR_MEM);
+
+ uci_load_history_file(ctx, p, filename, &f, flush);
if (flush && f) {
rewind(f);
ftruncate(fileno(f), 0);
}
+static char *uci_config_path(struct uci_context *ctx, const char *name)
+{
+ char *filename;
+
+ UCI_ASSERT(ctx, uci_validate_name(name));
+ filename = uci_malloc(ctx, strlen(name) + strlen(ctx->confdir) + 2);
+ sprintf(filename, "%s/%s", ctx->confdir, name);
+
+ return filename;
+}
+
int uci_load(struct uci_context *ctx, const char *name, struct uci_package **package)
{
char *filename;
FILE *file = NULL;
UCI_HANDLE_ERR(ctx);
- UCI_ASSERT(ctx, uci_validate_name(name));
switch (name[0]) {
case '.':
break;
default:
/* config in /etc/config */
- if (strchr(name, '/'))
- UCI_THROW(ctx, UCI_ERR_INVAL);
- filename = uci_malloc(ctx, strlen(name) + sizeof(UCI_CONFDIR) + 2);
- sprintf(filename, UCI_CONFDIR "/%s", name);
+ filename = uci_config_path(ctx, name);
confdir = true;
break;
}
* does not modify the uci_package pointer
*/
if (!p->confdir)
- return uci_commit(ctx, &p);
+ return uci_commit(ctx, &p, false);
if (uci_list_empty(&p->history))
return 0;
- if ((asprintf(&filename, "%s/%s", UCI_SAVEDIR, p->e.name) < 0) || !filename)
+ if ((asprintf(&filename, "%s/%s", ctx->savedir, p->e.name) < 0) || !filename)
UCI_THROW(ctx, UCI_ERR_MEM);
ctx->errno = 0;
return 0;
}
-int uci_commit(struct uci_context *ctx, struct uci_package **package)
+int uci_commit(struct uci_context *ctx, struct uci_package **package, bool overwrite)
{
struct uci_package *p;
FILE *f = NULL;
p = *package;
UCI_ASSERT(ctx, p != NULL);
- UCI_ASSERT(ctx, p->path != NULL);
+ if (!p->path) {
+ if (overwrite)
+ p->path = uci_config_path(ctx, p->e.name);
+ else
+ UCI_THROW(ctx, UCI_ERR_INVAL);
+ }
+
/* open the config file for writing now, so that it is locked */
f = uci_open_stream(ctx, p->path, SEEK_SET, true, true);
/* flush unsaved changes and reload from history file */
UCI_TRAP_SAVE(ctx, done);
if (p->confdir) {
- name = uci_strdup(ctx, p->e.name);
- path = uci_strdup(ctx, p->path);
- if (!uci_list_empty(&p->history))
- UCI_INTERNAL(uci_save, ctx, p);
- uci_free_package(&p);
- uci_file_cleanup(ctx);
- UCI_INTERNAL(uci_import, ctx, f, name, &p, true);
-
- p->path = path;
- p->confdir = true;
- *package = p;
-
- /* freed together with the uci_package */
- path = NULL;
-
- /* check for updated history, just in case */
- uci_load_history(ctx, p, true);
+ if (!overwrite) {
+ name = uci_strdup(ctx, p->e.name);
+ path = uci_strdup(ctx, p->path);
+ /* dump our own changes to the history file */
+ if (!uci_list_empty(&p->history))
+ UCI_INTERNAL(uci_save, ctx, p);
+
+ /*
+ * other processes might have modified the config
+ * as well. dump and reload
+ */
+ uci_free_package(&p);
+ uci_file_cleanup(ctx);
+ UCI_INTERNAL(uci_import, ctx, f, name, &p, true);
+
+ p->path = path;
+ p->confdir = true;
+ *package = p;
+
+ /* freed together with the uci_package */
+ path = NULL;
+
+ /* check for updated history, just in case */
+ uci_load_history(ctx, p, true);
+ } else {
+ /* flush history */
+ uci_load_history(ctx, NULL, true);
+ }
}
rewind(f);
glob_t globbuf;
int size, i;
char *buf;
+ char *dir;
UCI_HANDLE_ERR(ctx);
- if (glob(UCI_CONFDIR "/*", GLOB_MARK, NULL, &globbuf) != 0)
+ dir = uci_malloc(ctx, strlen(ctx->confdir) + 1 + sizeof("/*"));
+ sprintf(dir, "%s/*", ctx->confdir);
+ if (glob(dir, GLOB_MARK, NULL, &globbuf) != 0)
UCI_THROW(ctx, UCI_ERR_NOTFOUND);
size = sizeof(char *) * (globbuf.gl_pathc + 1);
buf += strlen(buf) + 1;
}
*list = configs;
+ free(dir);
return 0;
}