* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
*/
/*
#include <fcntl.h>
#include <stdio.h>
#include <ctype.h>
+#include <glob.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "uci.h"
+#include "uci_internal.h"
+
+#define LINEBUF 32
+#define LINEBUF_MAX 4096
/*
- * Clean up all extra memory used by the parser and exporter
+ * Fetch a new line from the input stream and resize buffer if necessary
*/
-static void uci_file_cleanup(struct uci_context *ctx)
+__private void uci_getln(struct uci_context *ctx, int offset)
{
- struct uci_parse_context *pctx;
+ struct uci_parse_context *pctx = ctx->pctx;
+ char *p;
+ int ofs;
- if (ctx->buf) {
- free(ctx->buf);
- ctx->buf = NULL;
- ctx->bufsz = 0;
+ if (pctx->buf == NULL) {
+ pctx->buf = uci_malloc(ctx, LINEBUF);
+ pctx->bufsz = LINEBUF;
}
- pctx = ctx->pctx;
- if (!pctx)
- return;
+ ofs = offset;
+ do {
+ p = &pctx->buf[ofs];
+ p[ofs] = 0;
+
+ p = fgets(p, pctx->bufsz - ofs, pctx->file);
+ if (!p || !*p)
+ return;
+
+ ofs += strlen(p);
+ if (pctx->buf[ofs - 1] == '\n') {
+ pctx->line++;
+ if (ofs >= 2 && pctx->buf[ofs - 2] == '\r')
+ pctx->buf[ofs - 2] = 0;
+ else
+ pctx->buf[ofs - 1] = 0;
+ return;
+ }
+
+ 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);
+ } while (1);
+}
+
+
+/*
+ * parse a character escaped by '\'
+ * returns true if the escaped character is to be parsed
+ * returns false if the escaped character is to be ignored
+ */
+static inline bool parse_backslash(struct uci_context *ctx, char **str)
+{
+ /* skip backslash */
+ *str += 1;
+
+ /* undecoded backslash at the end of line, fetch the next line */
+ if (!**str) {
+ *str += 1;
+ uci_getln(ctx, *str - ctx->pctx->buf);
+ return false;
+ }
+
+ /* FIXME: decode escaped char, necessary? */
+ return true;
+}
+
+/*
+ * move the string pointer forward until a non-whitespace character or
+ * EOL is reached
+ */
+static void skip_whitespace(struct uci_context *ctx, char **str)
+{
+restart:
+ while (**str && isspace(**str))
+ *str += 1;
+
+ if (**str == '\\') {
+ if (!parse_backslash(ctx, str))
+ goto restart;
+ }
+}
+
+static inline void addc(char **dest, char **src)
+{
+ **dest = **src;
+ *dest += 1;
+ *src += 1;
+}
+
+/*
+ * parse a double quoted string argument from the command line
+ */
+static void parse_double_quote(struct uci_context *ctx, char **str, char **target)
+{
+ char c;
+
+ /* skip quote character */
+ *str += 1;
+
+ while ((c = **str)) {
+ switch(c) {
+ case '"':
+ **target = 0;
+ *str += 1;
+ return;
+ case '\\':
+ if (!parse_backslash(ctx, str))
+ continue;
+ /* fall through */
+ default:
+ addc(target, str);
+ break;
+ }
+ }
+ uci_parse_error(ctx, *str, "unterminated \"");
+}
+
+/*
+ * parse a single quoted string argument from the command line
+ */
+static void parse_single_quote(struct uci_context *ctx, char **str, char **target)
+{
+ char c;
+ /* skip quote character */
+ *str += 1;
+
+ while ((c = **str)) {
+ switch(c) {
+ case '\'':
+ **target = 0;
+ *str += 1;
+ return;
+ default:
+ addc(target, str);
+ }
+ }
+ uci_parse_error(ctx, *str, "unterminated '");
+}
+
+/*
+ * parse a string from the command line and detect the quoting style
+ */
+static void parse_str(struct uci_context *ctx, char **str, char **target)
+{
+ bool next = true;
+ do {
+ switch(**str) {
+ case '\'':
+ parse_single_quote(ctx, str, target);
+ break;
+ case '"':
+ parse_double_quote(ctx, str, target);
+ break;
+ case '#':
+ **str = 0;
+ /* fall through */
+ case 0:
+ goto done;
+ case ';':
+ next = false;
+ goto done;
+ case '\\':
+ if (!parse_backslash(ctx, str))
+ continue;
+ /* fall through */
+ 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 && next)
+ *str += 1;
+
+ /* terminate the parsed string */
+ **target = 0;
+}
+
+/*
+ * extract the next argument from the command line
+ */
+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);
+ if(*str[0] == ';') {
+ *str[0] = 0;
+ *str += 1;
+ } else {
+ parse_str(ctx, str, &ptr);
+ }
+ if (!*val) {
+ if (required)
+ uci_parse_error(ctx, *str, "insufficient arguments");
+ goto done;
+ }
+
+ if (name && !uci_validate_name(val))
+ uci_parse_error(ctx, val, "invalid character in field");
+
+done:
+ return val;
+}
+
+int uci_parse_argument(struct uci_context *ctx, FILE *stream, char **str, char **result)
+{
+ UCI_HANDLE_ERR(ctx);
+ UCI_ASSERT(ctx, str != NULL);
+ UCI_ASSERT(ctx, result != NULL);
- ctx->pctx = NULL;
- if (pctx->package)
- uci_free_package(&pctx->package);
+ if (ctx->pctx && (ctx->pctx->file != stream))
+ uci_cleanup(ctx);
- if (pctx->buf)
- free(pctx->buf);
+ if (!ctx->pctx)
+ uci_alloc_parse_context(ctx);
- free(pctx);
+ ctx->pctx->file = stream;
+
+ if (!*str) {
+ uci_getln(ctx, 0);
+ *str = ctx->pctx->buf;
+ }
+
+ *result = next_arg(ctx, str, false, false);
+
+ return 0;
}
+static int
+uci_fill_ptr(struct uci_context *ctx, struct uci_ptr *ptr, struct uci_element *e)
+{
+ UCI_ASSERT(ctx, ptr != NULL);
+ UCI_ASSERT(ctx, e != NULL);
+
+ memset(ptr, 0, sizeof(struct uci_ptr));
+ switch(e->type) {
+ case UCI_TYPE_OPTION:
+ ptr->o = uci_to_option(e);
+ goto fill_option;
+ case UCI_TYPE_SECTION:
+ ptr->s = uci_to_section(e);
+ goto fill_section;
+ case UCI_TYPE_PACKAGE:
+ ptr->p = uci_to_package(e);
+ goto fill_package;
+ default:
+ UCI_THROW(ctx, UCI_ERR_INVAL);
+ }
+
+fill_option:
+ ptr->option = ptr->o->e.name;
+ ptr->s = ptr->o->section;
+fill_section:
+ ptr->section = ptr->s->e.name;
+ ptr->p = ptr->s->package;
+fill_package:
+ ptr->package = ptr->p->e.name;
+
+ ptr->flags |= UCI_LOOKUP_DONE;
+
+ return 0;
+}
+
+
/*
* verify that the end of the line or command is reached.
{
char *tmp;
+ skip_whitespace(ctx, str);
tmp = next_arg(ctx, str, false, false);
if (*tmp && (ctx->flags & UCI_FLAG_STRICT))
uci_parse_error(ctx, *str, "too many arguments");
/* add the last config to main config file list */
if (pctx->package) {
+ pctx->package->backend = ctx->backend;
uci_list_add(&ctx->root, &pctx->package->e.list);
pctx->package = NULL;
* if an older config under the same name exists, unload it
* ignore errors here, e.g. if the config was not found
*/
- e = uci_lookup_list(ctx, &ctx->root, name);
+ e = uci_lookup_list(&ctx->root, name);
if (e)
UCI_THROW(ctx, UCI_ERR_DUPLICATE);
pctx->package = uci_alloc_package(ctx, name);
uci_switch_config(ctx);
}
-/* Based on an efficient hash function published by D. J. Bernstein */
-static unsigned int djbhash(unsigned int hash, char *str)
-{
- int len = strlen(str);
- int i;
-
- /* initial value */
- if (hash == ~0)
- hash = 5381;
-
- for(i = 0; i < len; i++) {
- hash = ((hash << 5) + hash) + str[i];
- }
- return (hash & 0x7FFFFFFF);
-}
-
-/* fix up an unnamed section */
-static void uci_fixup_section(struct uci_context *ctx, struct uci_section *s)
-{
- unsigned int hash = ~0;
- struct uci_element *e;
- char buf[16];
-
- if (!s || s->e.name)
- return;
-
- /*
- * Generate a name for unnamed sections. This is used as reference
- * when locating or updating the section from apps/scripts.
- * To make multiple concurrent versions somewhat safe for updating,
- * the name is generated from a hash of its type and name/value
- * pairs of its option, and it is prefixed by a counter value.
- * If the order of the unnamed sections changes for some reason,
- * updates to them will be rejected.
- */
- hash = djbhash(hash, s->type);
- uci_foreach_element(&s->options, e) {
- hash = djbhash(hash, e->name);
- hash = djbhash(hash, uci_to_option(e)->value);
- }
- sprintf(buf, "cfg%02x%04x", ++s->package->n_section, hash % (1 << 16));
- s->e.name = uci_strdup(ctx, buf);
-}
-
/*
* parse the 'config' uci command (open a section)
*/
static void uci_parse_config(struct uci_context *ctx, char **str)
{
struct uci_parse_context *pctx = ctx->pctx;
+ struct uci_element *e;
+ struct uci_ptr ptr;
char *name = NULL;
char *type = NULL;
*str += strlen(*str) + 1;
type = next_arg(ctx, str, true, false);
- if (!uci_validate_str(type, false))
+ if (!uci_validate_type(type))
uci_parse_error(ctx, type, "invalid character in field");
name = next_arg(ctx, str, false, true);
assert_eol(ctx, str);
- if (pctx->merge) {
- UCI_TRAP_SAVE(ctx, error);
- uci_set(ctx, pctx->package, name, NULL, type, NULL);
- UCI_TRAP_RESTORE(ctx);
- return;
-error:
- UCI_THROW(ctx, ctx->errno);
- } else
- pctx->section = uci_alloc_section(pctx->package, type, name);
+ if (!name || !name[0]) {
+ ctx->internal = !pctx->merge;
+ UCI_NESTED(uci_add_section, ctx, pctx->package, type, &pctx->section);
+ } else {
+ uci_fill_ptr(ctx, &ptr, &pctx->package->e);
+ e = uci_lookup_list(&pctx->package->sections, name);
+ if (e)
+ ptr.s = uci_to_section(e);
+ ptr.section = name;
+ ptr.value = type;
+
+ ctx->internal = !pctx->merge;
+ UCI_NESTED(uci_set, ctx, &ptr);
+ pctx->section = uci_to_section(ptr.last);
+ }
}
/*
* parse the 'option' uci command (open a value)
*/
-static void uci_parse_option(struct uci_context *ctx, char **str)
+static void uci_parse_option(struct uci_context *ctx, char **str, bool list)
{
struct uci_parse_context *pctx = ctx->pctx;
+ struct uci_element *e;
+ struct uci_ptr ptr;
char *name = NULL;
char *value = NULL;
if (!pctx->section)
- uci_parse_error(ctx, *str, "option command found before the first section");
+ uci_parse_error(ctx, *str, "option/list command found before the first section");
/* command string null-terminated by strtok */
*str += strlen(*str) + 1;
value = next_arg(ctx, str, false, false);
assert_eol(ctx, str);
- if (pctx->merge) {
- UCI_TRAP_SAVE(ctx, error);
- uci_set(ctx, pctx->package, pctx->section->e.name, name, value, NULL);
- UCI_TRAP_RESTORE(ctx);
- return;
-error:
- UCI_THROW(ctx, ctx->errno);
- } else
- uci_alloc_option(pctx->section, name, value);
+ uci_fill_ptr(ctx, &ptr, &pctx->section->e);
+ e = uci_lookup_list(&pctx->section->options, name);
+ if (e)
+ ptr.o = uci_to_option(e);
+ ptr.option = name;
+ ptr.value = value;
+
+ ctx->internal = !pctx->merge;
+ if (list)
+ UCI_NESTED(uci_add_list, ctx, &ptr);
+ else
+ UCI_NESTED(uci_set, ctx, &ptr);
}
-
/*
* parse a complete input line, split up combined commands by ';'
*/
static void uci_parse_line(struct uci_context *ctx, bool single)
{
struct uci_parse_context *pctx = ctx->pctx;
- char *word, *brk = NULL;
-
- for (word = strtok_r(pctx->buf, ";", &brk);
- word;
- word = strtok_r(NULL, ";", &brk)) {
-
- char *pbrk = NULL;
- word = strtok_r(word, " \t", &pbrk);
+ char *word, *brk;
+ word = pctx->buf;
+ do {
+ brk = NULL;
+ word = strtok_r(word, " \t", &brk);
if (!word)
- continue;
+ return;
switch(word[0]) {
+ case 0:
case '#':
return;
case 'p':
if ((word[1] == 0) || !strcmp(word + 1, "ackage"))
uci_parse_package(ctx, &word, single);
+ else
+ goto invalid;
break;
case 'c':
if ((word[1] == 0) || !strcmp(word + 1, "onfig"))
uci_parse_config(ctx, &word);
+ else
+ goto invalid;
break;
case 'o':
if ((word[1] == 0) || !strcmp(word + 1, "ption"))
- uci_parse_option(ctx, &word);
+ uci_parse_option(ctx, &word, false);
+ else
+ goto invalid;
break;
- default:
- uci_parse_error(ctx, word, "unterminated command");
+ case 'l':
+ if ((word[1] == 0) || !strcmp(word + 1, "ist"))
+ uci_parse_option(ctx, &word, true);
+ else
+ goto invalid;
break;
+ default:
+ goto invalid;
}
- }
+ continue;
+invalid:
+ uci_parse_error(ctx, word, "invalid command");
+ } while (1);
}
/* max number of characters that escaping adds to the string */
/*
* escape an uci string for export
*/
-static char *uci_escape(struct uci_context *ctx, char *str)
+static const char *uci_escape(struct uci_context *ctx, const char *str)
{
- char *s, *p;
- int pos = 0;
+ const char *end;
+ int ofs = 0;
if (!ctx->buf) {
ctx->bufsz = LINEBUF;
ctx->buf = malloc(LINEBUF);
+
+ if (!ctx->buf)
+ return str;
}
- s = str;
- p = strchr(str, '\'');
- if (!p)
- return str;
+ while (1) {
+ int len;
- do {
- int len = p - s;
- if (len > 0) {
- if (p + sizeof(UCI_QUOTE_ESCAPE) - str >= ctx->bufsz) {
- ctx->bufsz *= 2;
- ctx->buf = realloc(ctx->buf, ctx->bufsz);
- if (!ctx->buf)
- UCI_THROW(ctx, UCI_ERR_MEM);
- }
- memcpy(&ctx->buf[pos], s, len);
- pos += len;
+ end = strchr(str, '\'');
+ if (!end)
+ end = str + strlen(str);
+ len = end - str;
+
+ /* make sure that we have enough room in the buffer */
+ while (ofs + len + sizeof(UCI_QUOTE_ESCAPE) + 1 > ctx->bufsz) {
+ ctx->bufsz *= 2;
+ ctx->buf = uci_realloc(ctx, ctx->buf, ctx->bufsz);
}
- strcpy(&ctx->buf[pos], UCI_QUOTE_ESCAPE);
- pos += sizeof(UCI_QUOTE_ESCAPE);
- s = p + 1;
- } while ((p = strchr(s, '\'')));
+ /* copy the string until the character before the quote */
+ memcpy(&ctx->buf[ofs], str, len);
+ ofs += len;
+
+ /* end of string? return the buffer */
+ if (*end == 0)
+ break;
+
+ memcpy(&ctx->buf[ofs], UCI_QUOTE_ESCAPE, sizeof(UCI_QUOTE_ESCAPE));
+ ofs += strlen(&ctx->buf[ofs]);
+ str = end + 1;
+ }
+
+ ctx->buf[ofs] = 0;
return ctx->buf;
}
-
/*
* export a single config package to a 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;
+ struct uci_element *s, *o, *i;
if (header)
- fprintf(stream, "package '%s'\n", uci_escape(ctx, p->e.name));
+ 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, "\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, "\n");
uci_foreach_element(&sec->options, o) {
struct uci_option *opt = uci_to_option(o);
- fprintf(stream, "\toption '%s'", uci_escape(ctx, opt->e.name));
- fprintf(stream, " '%s'\n", uci_escape(ctx, opt->value));
+ switch(opt->type) {
+ case UCI_TYPE_STRING:
+ fprintf(stream, "\toption %s", uci_escape(ctx, opt->e.name));
+ fprintf(stream, " '%s'\n", uci_escape(ctx, opt->v.string));
+ break;
+ case UCI_TYPE_LIST:
+ uci_foreach_element(&opt->v.list, i) {
+ fprintf(stream, "\tlist %s", uci_escape(ctx, opt->e.name));
+ fprintf(stream, " '%s'\n", uci_escape(ctx, i->name));
+ }
+ break;
+ default:
+ fprintf(stream, "\t# unknown type for option '%s'\n", uci_escape(ctx, opt->e.name));
+ break;
+ }
}
}
fprintf(stream, "\n");
UCI_HANDLE_ERR(ctx);
/* make sure no memory from previous parse attempts is leaked */
- uci_file_cleanup(ctx);
+ uci_cleanup(ctx);
uci_alloc_parse_context(ctx);
pctx = ctx->pctx;
pctx->file = stream;
- if (*package && single) {
+ if (package && *package && single) {
pctx->package = *package;
pctx->merge = true;
}
* NB: the config file can still override the package name
*/
if (name) {
- UCI_ASSERT(ctx, uci_validate_name(name));
+ UCI_ASSERT(ctx, uci_validate_package(name));
pctx->name = name;
}
error:
if (ctx->flags & UCI_FLAG_PERROR)
uci_perror(ctx, NULL);
- if ((ctx->errno != UCI_ERR_PARSE) ||
+ if ((ctx->err != UCI_ERR_PARSE) ||
(ctx->flags & UCI_FLAG_STRICT))
- UCI_THROW(ctx, ctx->errno);
+ UCI_THROW(ctx, ctx->err);
}
uci_fixup_section(ctx, ctx->pctx->section);
+ if (!pctx->package && name)
+ uci_switch_config(ctx);
if (package)
*package = pctx->package;
if (pctx->merge)
uci_switch_config(ctx);
/* no error happened, we can get rid of the parser context now */
- uci_file_cleanup(ctx);
+ uci_cleanup(ctx);
return 0;
}
{
char *filename;
- UCI_ASSERT(ctx, uci_validate_name(name));
+ UCI_ASSERT(ctx, uci_validate_package(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;
- bool confdir;
- FILE *file = NULL;
-
- UCI_HANDLE_ERR(ctx);
-
- switch (name[0]) {
- case '.':
- /* relative path outside of /etc/config */
- if (name[1] != '/')
- UCI_THROW(ctx, UCI_ERR_NOTFOUND);
- /* fall through */
- case '/':
- /* absolute path outside of /etc/config */
- filename = uci_strdup(ctx, name);
- name = strrchr(name, '/') + 1;
- confdir = false;
- break;
- default:
- /* config in /etc/config */
- filename = uci_config_path(ctx, name);
- confdir = true;
- break;
- }
-
- file = uci_open_stream(ctx, filename, SEEK_SET, false, false);
- ctx->errno = 0;
- UCI_TRAP_SAVE(ctx, done);
- UCI_INTERNAL(uci_import, ctx, file, name, package, true);
- UCI_TRAP_RESTORE(ctx);
-
- if (*package) {
- (*package)->path = filename;
- (*package)->confdir = confdir;
- uci_load_history(ctx, *package, false);
- }
-
-done:
- uci_close_stream(file);
- return ctx->errno;
-}
-
-int uci_commit(struct uci_context *ctx, struct uci_package **package, bool overwrite)
+static void uci_file_commit(struct uci_context *ctx, struct uci_package **package, bool overwrite)
{
- struct uci_package *p;
+ struct uci_package *p = *package;
FILE *f = NULL;
char *name = NULL;
char *path = NULL;
- UCI_HANDLE_ERR(ctx);
- UCI_ASSERT(ctx, package != NULL);
- p = *package;
-
- UCI_ASSERT(ctx, p != NULL);
if (!p->path) {
if (overwrite)
p->path = uci_config_path(ctx, p->e.name);
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 */
+ /* flush unsaved changes and reload from delta file */
UCI_TRAP_SAVE(ctx, done);
- if (p->confdir) {
+ if (p->has_delta) {
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))
+ /* dump our own changes to the delta file */
+ if (!uci_list_empty(&p->delta))
UCI_INTERNAL(uci_save, ctx, p);
/*
* as well. dump and reload
*/
uci_free_package(&p);
- uci_file_cleanup(ctx);
+ uci_cleanup(ctx);
UCI_INTERNAL(uci_import, ctx, f, name, &p, true);
p->path = path;
- p->confdir = true;
+ p->has_delta = true;
*package = p;
/* freed together with the uci_package */
path = NULL;
-
- /* check for updated history, flush */
- if (!uci_load_history(ctx, p, true))
- goto done;
- } else {
- /* flush history */
- if (!uci_load_history(ctx, NULL, true))
- goto done;
}
+
+ /* flush delta */
+ if (!uci_load_delta(ctx, p, true))
+ goto done;
}
rewind(f);
- ftruncate(fileno(f), 0);
+ if (ftruncate(fileno(f), 0) < 0)
+ UCI_THROW(ctx, UCI_ERR_IO);
uci_export(ctx, f, p, false);
UCI_TRAP_RESTORE(ctx);
if (path)
free(path);
uci_close_stream(f);
- if (ctx->errno)
- UCI_THROW(ctx, ctx->errno);
-
- return 0;
+ if (ctx->err)
+ UCI_THROW(ctx, ctx->err);
}
return p;
}
-int uci_list_configs(struct uci_context *ctx, char ***list)
+static char **uci_list_config_files(struct uci_context *ctx)
{
char **configs;
glob_t globbuf;
char *buf;
char *dir;
- UCI_HANDLE_ERR(ctx);
-
dir = uci_malloc(ctx, strlen(ctx->confdir) + 1 + sizeof("/*"));
sprintf(dir, "%s/*", ctx->confdir);
- if (glob(dir, GLOB_MARK, NULL, &globbuf) != 0)
+ if (glob(dir, GLOB_MARK, NULL, &globbuf) != 0) {
+ free(dir);
UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+ }
size = sizeof(char *) * (globbuf.gl_pathc + 1);
for(i = 0; i < globbuf.gl_pathc; i++) {
if (!p)
continue;
+ if (!uci_validate_package(p))
+ continue;
+
configs[i] = buf;
strcpy(buf, p);
buf += strlen(buf) + 1;
}
- *list = configs;
free(dir);
+ globfree(&globbuf);
+ return configs;
+}
- return 0;
+static struct uci_package *uci_file_load(struct uci_context *ctx, const char *name)
+{
+ struct uci_package *package = NULL;
+ char *filename;
+ bool confdir;
+ FILE *file = NULL;
+
+ switch (name[0]) {
+ case '.':
+ /* relative path outside of /etc/config */
+ if (name[1] != '/')
+ UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+ /* fall through */
+ case '/':
+ /* absolute path outside of /etc/config */
+ filename = uci_strdup(ctx, name);
+ name = strrchr(name, '/') + 1;
+ confdir = false;
+ break;
+ default:
+ /* config in /etc/config */
+ filename = uci_config_path(ctx, name);
+ confdir = true;
+ break;
+ }
+
+ UCI_TRAP_SAVE(ctx, done);
+ file = uci_open_stream(ctx, filename, SEEK_SET, false, false);
+ ctx->err = 0;
+ UCI_INTERNAL(uci_import, ctx, file, name, &package, true);
+ UCI_TRAP_RESTORE(ctx);
+
+ if (package) {
+ package->path = filename;
+ package->has_delta = confdir;
+ uci_load_delta(ctx, package, false);
+ }
+
+done:
+ uci_close_stream(file);
+ if (ctx->err) {
+ free(filename);
+ UCI_THROW(ctx, ctx->err);
+ }
+ return package;
}
+__private UCI_BACKEND(uci_file_backend, "file",
+ .load = uci_file_load,
+ .commit = uci_file_commit,
+ .list_configs = uci_list_config_files,
+);
projects / project / uci.git / blobdiff