p[ofs] = 0;
p = fgets(p, pctx->bufsz - ofs, pctx->file);
- if (!p || !p[ofs])
+ if (!p || !*p)
return;
ofs += strlen(p);
}
/*
- * Clean up all extra memory used by the parser
+ * Clean up all extra memory used by the parser and exporter
*/
-static void uci_parse_cleanup(struct uci_context *ctx)
+static void uci_file_cleanup(struct uci_context *ctx)
{
struct uci_parse_context *pctx;
+ if (ctx->buf) {
+ free(ctx->buf);
+ ctx->buf = NULL;
+ ctx->bufsz = 0;
+ }
+
pctx = ctx->pctx;
if (!pctx)
return;
ctx->pctx = NULL;
- if (pctx->cfg) {
- uci_list_del(&pctx->cfg->list);
- uci_drop_config(pctx->cfg);
- }
+ if (pctx->package)
+ uci_free_package(pctx->package);
+
if (pctx->buf)
free(pctx->buf);
if (pctx->file)
UCI_THROW(ctx, UCI_ERR_PARSE);
}
- return uci_strdup(ctx, val);
+ return val;
}
/*
name = pctx->name;
/* add the last config to main config file list */
- if (pctx->cfg) {
- uci_list_add(&ctx->root, &pctx->cfg->list);
+ if (pctx->package) {
+ uci_list_add(&ctx->root, &pctx->package->e.list);
- pctx->cfg = NULL;
+ pctx->package = NULL;
pctx->section = NULL;
}
ignore:
ctx->errno = 0;
- pctx->cfg = uci_alloc_config(ctx, name);
+ pctx->package = uci_alloc_package(ctx, name);
}
/*
/* command string null-terminated by strtok */
*str += strlen(*str) + 1;
- UCI_TRAP_SAVE(ctx, error);
name = next_arg(ctx, str, true);
assert_eol(ctx, str);
ctx->pctx->name = name;
uci_switch_config(ctx);
- UCI_TRAP_RESTORE(ctx);
- return;
-
-error:
- if (name)
- free(name);
- UCI_THROW(ctx, ctx->errno);
}
/*
char *name = NULL;
char *type = NULL;
- if (!ctx->pctx->cfg) {
+ 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";
/* command string null-terminated by strtok */
*str += strlen(*str) + 1;
- UCI_TRAP_SAVE(ctx, error);
type = next_arg(ctx, str, true);
name = next_arg(ctx, str, false);
assert_eol(ctx, str);
- 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);
+ ctx->pctx->section = uci_alloc_section(ctx->pctx->package, type, name);
}
/*
/* 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);
- 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_alloc_option(ctx->pctx->section, name, value);
}
static void uci_parse_line(struct uci_context *ctx)
{
struct uci_parse_context *pctx = ctx->pctx;
- char *word, *brk;
+ char *word, *brk = NULL;
for (word = strtok_r(pctx->buf, ";", &brk);
word;
word = strtok_r(NULL, ";", &brk)) {
- char *pbrk;
+ char *pbrk = NULL;
word = strtok_r(word, " \t", &pbrk);
switch(word[0]) {
}
}
-int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_config **cfg)
+/* max number of characters that escaping adds to the string */
+#define UCI_QUOTE_ESCAPE "'\\'"
+
+/*
+ * escape an uci string for export
+ */
+static char *uci_escape(struct uci_context *ctx, char *str)
+{
+ char *s, *p;
+ int pos = 0;
+
+ if (!ctx->buf) {
+ ctx->bufsz = LINEBUF;
+ ctx->buf = malloc(LINEBUF);
+ }
+
+ s = str;
+ p = strchr(str, '\'');
+ if (!p)
+ return str;
+
+ 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;
+ }
+ strcpy(&ctx->buf[pos], UCI_QUOTE_ESCAPE);
+ pos += sizeof(UCI_QUOTE_ESCAPE);
+ s = p + 1;
+ } while ((p = strchr(s, '\'')));
+
+ return ctx->buf;
+}
+
+
+/*
+ * export a single config package to a file stream
+ */
+static void uci_export_package(struct uci_package *p, FILE *stream)
+{
+ struct uci_context *ctx = p->ctx;
+ struct uci_element *s, *o;
+
+ 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, " '%s'\n", uci_escape(ctx, sec->e.name));
+ 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));
+ }
+ }
+ fprintf(stream, "\n");
+}
+
+int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *package)
+{
+ struct uci_element *e;
+
+ UCI_HANDLE_ERR(ctx);
+ UCI_ASSERT(ctx, stream != NULL);
+
+ if (package) {
+ uci_export_package(package, stream);
+ goto done;
+ }
+
+ 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)
{
struct uci_parse_context *pctx;
/* make sure no memory from previous parse attempts is leaked */
- uci_parse_cleanup(ctx);
+ uci_file_cleanup(ctx);
pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context));
ctx->pctx = pctx;
uci_parse_line(ctx);
}
- if (cfg)
- *cfg = pctx->cfg;
+ if (package)
+ *package = pctx->package;
pctx->name = NULL;
uci_switch_config(ctx);
/* no error happened, we can get rid of the parser context now */
- uci_parse_cleanup(ctx);
+ uci_file_cleanup(ctx);
return 0;
}
-int uci_load(struct uci_context *ctx, const char *name, struct uci_config **cfg)
+int uci_load(struct uci_context *ctx, const char *name, struct uci_package **package)
{
struct stat statbuf;
char *filename;
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, name != NULL);
-ignore:
- ctx->errno = 0;
-
switch (name[0]) {
case '.':
case '/':
if (!file)
UCI_THROW(ctx, UCI_ERR_IO);
- return uci_import(ctx, file, name, cfg);
+ return uci_import(ctx, file, name, package);
}
+
+char **uci_list_configs(struct uci_context *ctx)
+{
+ char **configs;
+ glob_t globbuf;
+ int size, i;
+ char *buf;
+
+ if (glob(UCI_CONFDIR "/*", GLOB_MARK, NULL, &globbuf) != 0)
+ return NULL;
+
+ size = sizeof(char *) * (globbuf.gl_pathc + 1);
+ for(i = 0; i < globbuf.gl_pathc; i++) {
+ char *p;
+
+ p = get_filename(globbuf.gl_pathv[i]);
+ if (!p)
+ continue;
+
+ size += strlen(p) + 1;
+ }
+
+ configs = malloc(size);
+ if (!configs)
+ return NULL;
+
+ memset(configs, 0, size);
+ buf = (char *) &configs[globbuf.gl_pathc + 1];
+ for(i = 0; i < globbuf.gl_pathc; i++) {
+ char *p;
+
+ p = get_filename(globbuf.gl_pathv[i]);
+ if (!p)
+ continue;
+
+ configs[i] = buf;
+ strcpy(buf, p);
+ buf += strlen(buf) + 1;
+ }
+ return configs;
+}
+
+
projects / project / uci.git / blobdiff