#include <sys/types.h>
#include <sys/stat.h>
#include <stdbool.h>
+#include <unistd.h>
+#include <fcntl.h>
#include <stdio.h>
#include <ctype.h>
#define LINEBUF 32
#define LINEBUF_MAX 4096
+static void uci_parse_error(struct uci_context *ctx, char *pos, char *reason)
+{
+ struct uci_parse_context *pctx = ctx->pctx;
+
+ pctx->reason = reason;
+ pctx->byte = pos - pctx->buf;
+ UCI_THROW(ctx, UCI_ERR_PARSE);
+}
+
/*
* Fetch a new line from the input stream and resize buffer if necessary
*/
return;
}
- if (pctx->bufsz > LINEBUF_MAX/2) {
- pctx->reason = "line too long";
- pctx->byte = LINEBUF_MAX;
- UCI_THROW(ctx, UCI_ERR_PARSE);
- }
+ 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);
break;
}
}
- ctx->pctx->reason = "unterminated \"";
- ctx->pctx->byte = *str - ctx->pctx->buf;
- UCI_THROW(ctx, UCI_ERR_PARSE);
+ uci_parse_error(ctx, *str, "unterminated \"");
}
/*
addc(target, str);
}
}
- ctx->pctx->reason = "unterminated '";
- ctx->pctx->byte = *str - ctx->pctx->buf;
- UCI_THROW(ctx, UCI_ERR_PARSE);
+ uci_parse_error(ctx, *str, "unterminated '");
}
/*
/*
* extract the next argument from the command line
*/
-static char *next_arg(struct uci_context *ctx, char **str, bool required)
+static char *next_arg(struct uci_context *ctx, char **str, bool required, bool name)
{
char *val;
char *ptr;
val = ptr = *str;
skip_whitespace(ctx, str);
parse_str(ctx, str, &ptr);
- if (required && !*val) {
- ctx->pctx->reason = "insufficient arguments";
- ctx->pctx->byte = *str - ctx->pctx->buf;
- UCI_THROW(ctx, UCI_ERR_PARSE);
- }
+ if (required && !*val)
+ uci_parse_error(ctx, *str, "insufficient arguments");
+ if (name && !uci_validate_name(val))
+ uci_parse_error(ctx, val, "invalid character in field");
return val;
}
{
char *tmp;
- tmp = next_arg(ctx, str, false);
- if (tmp && *tmp) {
- ctx->pctx->reason = "too many arguments";
- ctx->pctx->byte = tmp - ctx->pctx->buf;
- UCI_THROW(ctx, UCI_ERR_PARSE);
- }
+ tmp = next_arg(ctx, str, false, false);
+ if (tmp && *tmp)
+ uci_parse_error(ctx, *str, "too many arguments");
}
/*
static void uci_switch_config(struct uci_context *ctx)
{
struct uci_parse_context *pctx;
+ struct uci_element *e;
const char *name;
pctx = ctx->pctx;
* if an older config under the same name exists, unload it
* ignore errors here, e.g. if the config was not found
*/
- UCI_TRAP_SAVE(ctx, ignore);
- uci_unload(ctx, name);
- UCI_TRAP_RESTORE(ctx);
-ignore:
- ctx->errno = 0;
-
+ e = uci_lookup_list(ctx, &ctx->root, name);
+ if (e)
+ UCI_THROW(ctx, UCI_ERR_DUPLICATE);
pctx->package = uci_alloc_package(ctx, name);
}
/*
* parse the 'package' uci command (next config package)
*/
-static void uci_parse_package(struct uci_context *ctx, char **str)
+static void uci_parse_package(struct uci_context *ctx, char **str, bool single)
{
char *name = NULL;
/* command string null-terminated by strtok */
*str += strlen(*str) + 1;
- name = next_arg(ctx, str, true);
+ name = next_arg(ctx, str, true, true);
assert_eol(ctx, str);
+ if (single)
+ return;
+
ctx->pctx->name = name;
uci_switch_config(ctx);
}
char *type = NULL;
if (!ctx->pctx->package) {
- if (!ctx->pctx->name) {
- ctx->pctx->byte = *str - ctx->pctx->buf;
- ctx->pctx->reason = "attempting to import a file without a package name";
- UCI_THROW(ctx, UCI_ERR_PARSE);
- }
+ if (!ctx->pctx->name)
+ uci_parse_error(ctx, *str, "attempting to import a file without a package name");
+
uci_switch_config(ctx);
}
/* command string null-terminated by strtok */
*str += strlen(*str) + 1;
- type = next_arg(ctx, str, true);
- name = next_arg(ctx, str, false);
+ type = next_arg(ctx, str, true, true);
+ name = next_arg(ctx, str, false, true);
assert_eol(ctx, str);
ctx->pctx->section = uci_alloc_section(ctx->pctx->package, type, name);
}
char *name = NULL;
char *value = NULL;
- if (!ctx->pctx->section) {
- ctx->pctx->byte = *str - ctx->pctx->buf;
- ctx->pctx->reason = "option command found before the first section";
- UCI_THROW(ctx, UCI_ERR_PARSE);
- }
+ if (!ctx->pctx->section)
+ uci_parse_error(ctx, *str, "option command found before the first section");
+
/* command string null-terminated by strtok */
*str += strlen(*str) + 1;
- name = next_arg(ctx, str, true);
- value = next_arg(ctx, str, true);
+ name = next_arg(ctx, str, true, true);
+ value = next_arg(ctx, str, true, false);
assert_eol(ctx, str);
uci_alloc_option(ctx->pctx->section, name, value);
}
/*
* parse a complete input line, split up combined commands by ';'
*/
-static void uci_parse_line(struct uci_context *ctx)
+static void uci_parse_line(struct uci_context *ctx, bool single)
{
struct uci_parse_context *pctx = ctx->pctx;
char *word, *brk = NULL;
switch(word[0]) {
case 'p':
if ((word[1] == 0) || !strcmp(word + 1, "ackage"))
- uci_parse_package(ctx, &word);
+ uci_parse_package(ctx, &word, single);
break;
case 'c':
if ((word[1] == 0) || !strcmp(word + 1, "onfig"))
uci_parse_option(ctx, &word);
break;
default:
- pctx->reason = "unterminated command";
- pctx->byte = word - pctx->buf;
- UCI_THROW(ctx, UCI_ERR_PARSE);
+ uci_parse_error(ctx, word, "unterminated command");
break;
}
}
}
/* max number of characters that escaping adds to the string */
-#define UCI_QUOTE_ESCAPE "'\\'"
+#define UCI_QUOTE_ESCAPE "'\\''"
/*
* escape an uci string for export
/*
* export a single config package to a file stream
*/
-static void uci_export_package(struct uci_package *p, FILE *stream)
+static void uci_export_package(struct uci_package *p, FILE *stream, bool header)
{
struct uci_context *ctx = p->ctx;
struct uci_element *s, *o;
- fprintf(stream, "package '%s'\n", uci_escape(ctx, p->e.name));
+ if (header)
+ 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, "\n");
}
-int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *package)
+int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *package, bool header)
{
struct uci_element *e;
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, stream != NULL);
- if (package) {
- uci_export_package(package, stream);
- goto done;
+ if (package)
+ uci_export_package(package, stream, header);
+ else {
+ uci_foreach_element(&ctx->root, e) {
+ uci_export_package(uci_to_package(e), stream, header);
+ }
}
- uci_foreach_element(&ctx->root, e) {
- uci_export_package(uci_to_package(e), stream);
- }
-done:
return 0;
}
-int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_package **package)
+int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_package **package, bool single)
{
struct uci_parse_context *pctx;
while (!feof(pctx->file)) {
uci_getln(ctx, 0);
if (pctx->buf[0])
- uci_parse_line(ctx);
+ uci_parse_line(ctx, single);
}
if (package)
{
struct stat statbuf;
char *filename;
- bool confpath;
+ bool confdir;
FILE *file;
+ int fd;
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, name != NULL);
switch (name[0]) {
case '.':
+ if (name[1] != '/')
+ UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+ /* fall through */
case '/':
/* absolute/relative path outside of /etc/config */
- filename = (char *) name;
- confpath = false;
+ filename = uci_strdup(ctx, name);
+ name = strrchr(name, '/') + 1;
+ confdir = false;
break;
default:
filename = uci_malloc(ctx, strlen(name) + sizeof(UCI_CONFDIR) + 2);
sprintf(filename, UCI_CONFDIR "/%s", name);
- confpath = true;
+ confdir = true;
break;
}
UCI_THROW(ctx, UCI_ERR_NOTFOUND);
}
- file = fopen(filename, "r");
- if (filename != name)
- free(filename);
+ fd = open(filename, O_RDONLY);
+ if (fd <= 0)
+ UCI_THROW(ctx, UCI_ERR_IO);
+ if (flock(fd, LOCK_SH) < 0)
+ UCI_THROW(ctx, UCI_ERR_IO);
+
+ file = fdopen(fd, "r");
if (!file)
UCI_THROW(ctx, UCI_ERR_IO);
- return uci_import(ctx, file, name, package);
+ ctx->errno = 0;
+ UCI_TRAP_SAVE(ctx, done);
+ uci_import(ctx, file, name, package, true);
+ UCI_TRAP_RESTORE(ctx);
+
+ if (*package) {
+ (*package)->path = filename;
+ (*package)->confdir = confdir;
+ }
+
+done:
+ flock(fd, LOCK_UN);
+ fclose(file);
+ return ctx->errno;
+}
+
+int uci_commit(struct uci_context *ctx, struct uci_package *p)
+{
+ FILE *f = NULL;
+ int fd = 0;
+ int err = UCI_ERR_IO;
+
+ UCI_HANDLE_ERR(ctx);
+ UCI_ASSERT(ctx, p != NULL);
+ UCI_ASSERT(ctx, p->path != NULL);
+
+ fd = open(p->path, O_RDWR);
+ if (fd < 0)
+ goto done;
+
+ if (flock(fd, LOCK_EX) < 0)
+ goto done;
+
+ ftruncate(fd, 0);
+ f = fdopen(fd, "w");
+ if (!f)
+ goto done;
+
+ UCI_TRAP_SAVE(ctx, done);
+ uci_export(ctx, f, p, false);
+ UCI_TRAP_RESTORE(ctx);
+
+done:
+ if (f)
+ fclose(f);
+ else if (fd > 0)
+ close(fd);
+
+ if (ctx->errno)
+ UCI_THROW(ctx, ctx->errno);
+ if (err)
+ UCI_THROW(ctx, UCI_ERR_IO);
+ return 0;
}
+/*
+ * 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
+ * those with a trailing '/'
+ */
+static inline char *get_filename(char *path)
+{
+ char *p;
+
+ p = strrchr(path, '/');
+ p++;
+ if (!*p)
+ return NULL;
+ return p;
+}
+
char **uci_list_configs(struct uci_context *ctx)
{
char **configs;