* 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>
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);
}
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) {
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_TRAP_SAVE(ctx, done);
f = uci_open_stream(ctx, filename, SEEK_SET, flush, false);
- uci_parse_history(ctx, f, p);
+ if (p)
+ uci_parse_history(ctx, f, p);
UCI_TRAP_RESTORE(ctx);
done:
}
+static char *uci_config_path(struct uci_context *ctx, const char *name)
+{
+ char *filename;
+
+ 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);
+
+ 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, name != NULL);
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);
+ UCI_ASSERT(ctx, uci_validate_name(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;
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);
+ 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);
+ } else {
+ /* flush history */
+ uci_load_history(ctx, NULL, true);
+ }
}
rewind(f);