* This file contains the code for parsing uci config files
*/
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdbool.h>
+#include <stdio.h>
#include <ctype.h>
#define LINEBUF 128
}
if (pctx->bufsz > LINEBUF_MAX/2) {
+ pctx->reason = "line too long";
pctx->byte = LINEBUF_MAX;
UCI_THROW(ctx, UCI_ERR_PARSE);
}
if (!pctx)
return;
- if (pctx->cfg)
- uci_drop_file(pctx->cfg);
+ ctx->pctx = NULL;
+ if (pctx->cfg) {
+ uci_list_del(&pctx->cfg->list);
+ uci_drop_config(pctx->cfg);
+ }
if (pctx->buf)
free(pctx->buf);
if (pctx->file)
*str += 1;
}
+static inline void addc(char **dest, char **src)
+{
+ **dest = **src;
+ *dest += 1;
+ *src += 1;
+}
+
+static inline void parse_backslash(char **str, char **target)
+{
+ /* skip backslash */
+ *str += 1;
+ /* FIXME: decode escaped characters? */
+ addc(target, str);
+}
+
/*
* parse a double quoted string argument from the command line
*/
-static char *parse_double_quote(char **str)
+static void parse_double_quote(struct uci_context *ctx, char **str, char **target)
{
- char *val;
+ char c;
+ /* skip quote character */
*str += 1;
- val = *str;
- while (**str) {
- /* skip escaped characters */
- if (**str == '\\') {
- *str += 2;
+ while ((c = **str)) {
+ switch(c) {
+ case '\\':
+ parse_backslash(str, target);
continue;
- }
-
- /* check for the end of the quoted string */
- if (**str == '"') {
- **str = 0;
+ case '"':
+ **target = 0;
*str += 1;
- return val;
+ return;
+ default:
+ addc(target, str);
+ break;
}
- *str += 1;
}
-
- return NULL;
+ ctx->pctx->reason = "unterminated \"";
+ ctx->pctx->byte = *str - ctx->pctx->buf;
+ UCI_THROW(ctx, UCI_ERR_PARSE);
}
/*
* parse a single quoted string argument from the command line
*/
-static char *parse_single_quote(char **str)
+static void parse_single_quote(struct uci_context *ctx, char **str, char **target)
{
- /* TODO: implement */
- return NULL;
+ char c;
+ /* skip quote character */
+ *str += 1;
+
+ while ((c = **str)) {
+ switch(c) {
+ case '\'':
+ **target = 0;
+ *str += 1;
+ return;
+ default:
+ addc(target, str);
+ }
+ }
+ ctx->pctx->reason = "unterminated '";
+ ctx->pctx->byte = *str - ctx->pctx->buf;
+ UCI_THROW(ctx, UCI_ERR_PARSE);
}
/*
- * extract the next word from the command line (unquoted argument)
+ * parse a string from the command line and detect the quoting style
*/
-static char *parse_unquoted(char **str)
+static void parse_str(struct uci_context *ctx, char **str, char **target)
{
- char *val;
-
- val = *str;
-
- while (**str && !isspace(**str))
- *str += 1;
-
- if (**str) {
- **str = 0;
+ do {
+ switch(**str) {
+ case '\\':
+ parse_backslash(str, target);
+ continue;
+ case '\'':
+ parse_single_quote(ctx, str, target);
+ break;
+ case '"':
+ parse_double_quote(ctx, str, target);
+ break;
+ case 0:
+ goto done;
+ default:
+ addc(target, str);
+ break;
+ }
+ } while (**str && !isspace(**str));
+done:
+
+ /*
+ * if the string was unquoted and we've stopped at a whitespace
+ * character, skip to the next one, because the whitespace will
+ * be overwritten by a null byte here
+ */
+ if (**str)
*str += 1;
- }
- return val;
+ /* terminate the parsed string */
+ **target = 0;
}
/*
static char *next_arg(struct uci_context *ctx, char **str, bool required)
{
char *val;
+ char *ptr;
+ val = ptr = *str;
skip_whitespace(str);
- switch (**str) {
- case '"':
- val = parse_double_quote(str);
- case '\'':
- val = parse_single_quote(str);
- case 0:
- val = NULL;
- default:
- val = parse_unquoted(str);
- }
-
- if (required && !val) {
+ 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);
}
- return val;
+ return uci_strdup(ctx, val);
}
/*
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);
}
*/
static void uci_parse_config(struct uci_context *ctx, char **str)
{
- char *type, *name;
+ char *name = NULL;
+ char *type = NULL;
+ /* command string null-terminated by strtok */
*str += strlen(*str) + 1;
- if (!*str) {
- ctx->pctx->byte = *str - ctx->pctx->buf;
- UCI_THROW(ctx, UCI_ERR_PARSE);
- }
-
+ UCI_TRAP_SAVE(ctx, error);
type = next_arg(ctx, str, true);
name = next_arg(ctx, str, false);
assert_eol(ctx, str);
-
- DPRINTF("Section<%s>: %s\n", type, name);
+ ctx->pctx->section = uci_add_section(ctx->pctx->cfg, type, name);
+ UCI_TRAP_RESTORE(ctx);
+ return;
+
+error:
+ if (name)
+ free(name);
+ if (type)
+ free(type);
+ UCI_THROW(ctx, ctx->errno);
}
/*
*/
static void uci_parse_option(struct uci_context *ctx, char **str)
{
- char *name, *value;
+ 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);
+ }
+ /* command string null-terminated by strtok */
*str += strlen(*str) + 1;
+ UCI_TRAP_SAVE(ctx, error);
name = next_arg(ctx, str, true);
value = next_arg(ctx, str, true);
assert_eol(ctx, str);
-
- DPRINTF("\tOption: %s=\"%s\"\n", name, value);
+ uci_add_option(ctx->pctx->section, name, value);
+ UCI_TRAP_RESTORE(ctx);
+ return;
+
+error:
+ if (name)
+ free(name);
+ if (value)
+ free(value);
+ UCI_THROW(ctx, ctx->errno);
}
/*
uci_parse_option(ctx, &word);
break;
default:
+ pctx->reason = "unterminated command";
pctx->byte = word - pctx->buf;
UCI_THROW(ctx, UCI_ERR_PARSE);
break;
}
}
-int uci_parse(struct uci_context *ctx, const char *name)
+int uci_load(struct uci_context *ctx, const char *name, struct uci_config **cfg)
{
struct uci_parse_context *pctx;
+ struct stat statbuf;
+ char *filename;
+ bool confpath;
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, name != NULL);
+ UCI_TRAP_SAVE(ctx, ignore);
+ uci_unload(ctx, name);
+ UCI_TRAP_RESTORE(ctx);
+
+ignore:
+ ctx->errno = 0;
+
/* make sure no memory from previous parse attempts is leaked */
uci_parse_cleanup(ctx);
pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context));
ctx->pctx = pctx;
- /* TODO: use /etc/config/ */
- pctx->file = fopen(name, "r");
- if (!pctx->file)
+ switch (name[0]) {
+ case '.':
+ case '/':
+ /* absolute/relative path outside of /etc/config */
+ filename = (char *) name;
+ confpath = false;
+ break;
+ default:
+ filename = uci_malloc(ctx, strlen(name) + sizeof(UCI_CONFDIR) + 2);
+ sprintf(filename, UCI_CONFDIR "/%s", name);
+ confpath = true;
+ break;
+ }
+
+ if ((stat(filename, &statbuf) < 0) ||
+ ((statbuf.st_mode & S_IFMT) != S_IFREG)) {
UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+ }
- pctx->cfg = uci_alloc_file(ctx, name);
+ pctx->file = fopen(filename, "r");
+ if (filename != name)
+ free(filename);
+
+ if (!pctx->file)
+ UCI_THROW(ctx, UCI_ERR_IO);
+
+ pctx->cfg = uci_alloc_config(ctx, name);
while (!feof(pctx->file)) {
uci_getln(ctx);
- if (*(pctx->buf))
+ if (pctx->buf[0])
uci_parse_line(ctx);
}
/* add to main config file list */
uci_list_add(&ctx->root, &pctx->cfg->list);
+ if (cfg)
+ *cfg = pctx->cfg;
+
pctx->cfg = NULL;
- /* if no error happened, we can get rid of the parser context now */
+ /* no error happened, we can get rid of the parser context now */
uci_parse_cleanup(ctx);
return 0;
}
-
projects / project / uci.git / blobdiff