X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=file.c;h=c2b0e721da417cbbf000252cca3c0d2d83e4e992;hp=4eb35b184ff84b9868b3b4ba1f8ddd08e1b6cc4e;hb=2e90d2637abcbea12f5f4070be7a158fb4637604;hpb=1d6095d5ac6482672dbb434b8df7c5de69b9d64e diff --git a/file.c b/file.c index 4eb35b1..c2b0e72 100644 --- a/file.c +++ b/file.c @@ -398,7 +398,7 @@ static void uci_parse_config(struct uci_context *ctx, char **str) name = next_arg(ctx, str, false, true); assert_eol(ctx, str); - if (!name) { + if (!name || !name[0]) { ctx->internal = !pctx->merge; UCI_NESTED(uci_add_section, ctx, pctx->package, type, &pctx->section); } else { @@ -561,10 +561,10 @@ static void uci_export_package(struct uci_package *p, FILE *stream, bool header) 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"); @@ -572,12 +572,12 @@ static void uci_export_package(struct uci_package *p, FILE *stream, bool header) struct uci_option *opt = uci_to_option(o); switch(opt->type) { case UCI_TYPE_STRING: - fprintf(stream, "\toption '%s'", uci_escape(ctx, opt->e.name)); + 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, "\tlist %s", uci_escape(ctx, opt->e.name)); fprintf(stream, " '%s'\n", uci_escape(ctx, i->name)); } break;