#define MAX_ARGS 4 /* max command line arguments for batch mode */
+static const char *delimiter = " ";
static const char *appname;
static enum {
CLI_FLAG_MERGE = (1 << 0),
/* section cmds */
CMD_GET,
CMD_SET,
+ CMD_ADD_LIST,
CMD_DEL,
CMD_RENAME,
CMD_REVERT,
CMD_EXPORT,
CMD_COMMIT,
/* other cmds */
+ CMD_ADD,
CMD_IMPORT,
CMD_HELP,
};
"\texport [<config>]\n"
"\timport [<config>]\n"
"\tchanges [<config>]\n"
+ "\tcommit [<config>]\n"
+ "\tadd <config> <section-type>\n"
+ "\tadd_list <config>.<section>.<option>=<string>\n"
"\tshow [<config>[.<section>[.<option>]]]\n"
"\tget <config>.<section>[.<option>]\n"
"\tset <config>.<section>[.<option>]=<value>\n"
+ "\tdelete <config>[.<section[.<option>]]\n"
"\trename <config>.<section>[.<option>]=<name>\n"
"\trevert <config>[.<section>[.<option>]]\n"
"\n"
"Options:\n"
+ "\t-c <path> set the search path for config files (default: /etc/config)\n"
+ "\t-d <str> set the delimiter for list values in uci show\n"
"\t-f <file> use <file> as input instead of stdin\n"
"\t-m when importing, merge data into an existing package\n"
"\t-n name unnamed sections on export (default)\n"
uci_perror(ctx, appname);
}
+static void uci_show_value(struct uci_option *o)
+{
+ struct uci_element *e;
+ bool sep = false;
+
+ switch(o->type) {
+ case UCI_TYPE_STRING:
+ printf("%s\n", o->v.string);
+ break;
+ case UCI_TYPE_LIST:
+ uci_foreach_element(&o->v.list, e) {
+ printf("%s%s", (sep ? delimiter : ""), e->name);
+ sep = true;
+ }
+ printf("\n");
+ break;
+ default:
+ printf("<unknown>\n");
+ break;
+ }
+}
+
+static void uci_show_option(struct uci_option *o)
+{
+ printf("%s.%s.%s=",
+ o->section->package->e.name,
+ o->section->e.name,
+ o->e.name);
+ uci_show_value(o);
+}
+
static void uci_show_section(struct uci_section *p)
{
struct uci_element *e;
sname = p->e.name;
printf("%s.%s=%s\n", cname, sname, p->type);
uci_foreach_element(&p->options, e) {
- printf("%s.%s.%s=%s\n", cname, sname, e->name, uci_to_option(e)->value);
+ uci_show_option(uci_to_option(e));
}
}
uci_foreach_element(&p->saved_history, e) {
struct uci_history *h = uci_to_history(e);
+ char *prefix = "";
+ char *op = "=";
- if (h->cmd == UCI_CMD_REMOVE)
- printf("-");
- printf("%s.%s", p->e.name, h->section);
+ switch(h->cmd) {
+ case UCI_CMD_REMOVE:
+ prefix = "-";
+ break;
+ case UCI_CMD_LIST_ADD:
+ op = "+=";
+ break;
+ default:
+ break;
+ }
+ printf("%s%s.%s", prefix, p->e.name, h->section);
if (e->name)
printf(".%s", e->name);
if (h->cmd != UCI_CMD_REMOVE)
- printf("=%s", h->value);
+ printf("%s%s", op, h->value);
printf("\n");
}
}
-static int package_cmd(int cmd, char *package)
+static int package_cmd(int cmd, char *tuple)
{
- struct uci_package *p = NULL;
- int ret;
-
- if (cmd == CMD_CHANGES)
- ctx->flags |= UCI_FLAG_SAVED_HISTORY;
- ret = uci_load(ctx, package, &p);
- if (cmd == CMD_CHANGES)
- ctx->flags &= ~UCI_FLAG_SAVED_HISTORY;
+ struct uci_package *p;
+ struct uci_section *s;
+ struct uci_element *e = NULL;
- if (ret != UCI_OK) {
+ if (uci_lookup_ext(ctx, &e, tuple) != UCI_OK) {
cli_perror();
return 1;
}
- if (!p)
+ switch(e->type) {
+ case UCI_TYPE_PACKAGE:
+ p = uci_to_package(e);
+ break;
+ case UCI_TYPE_SECTION:
+ s = uci_to_section(e);
+ p = s->package;
+ break;
+ case UCI_TYPE_OPTION:
+ s = uci_to_option(e)->section;
+ p = s->package;
+ break;
+ default:
return 0;
+ }
+
switch(cmd) {
case CMD_CHANGES:
uci_show_changes(p);
uci_export(ctx, stdout, p, true);
break;
case CMD_SHOW:
- uci_show_package(p);
+ switch(e->type) {
+ case UCI_TYPE_PACKAGE:
+ uci_show_package(p);
+ break;
+ case UCI_TYPE_SECTION:
+ uci_show_section(uci_to_section(e));
+ break;
+ case UCI_TYPE_OPTION:
+ uci_show_option(uci_to_option(e));
+ break;
+ default:
+ /* should not happen */
+ return 1;
+ }
break;
}
struct uci_package *package = NULL;
char *name = NULL;
int ret = UCI_OK;
+ bool merge = false;
if (argc > 2)
return 255;
if (flags & CLI_FLAG_MERGE) {
if (uci_load(ctx, name, &package) != UCI_OK)
package = NULL;
+ else
+ merge = true;
}
ret = uci_import(ctx, input, name, &package, (name != NULL));
if (ret == UCI_OK) {
- if (flags & CLI_FLAG_MERGE) {
+ if (merge) {
ret = uci_save(ctx, package);
} else {
struct uci_element *e;
return 0;
}
+static int uci_do_add(int argc, char **argv)
+{
+ struct uci_package *p = NULL;
+ struct uci_section *s = NULL;
+ int ret;
+
+ if (argc != 3)
+ return 255;
+
+ ret = uci_load(ctx, argv[1], &p);
+ if (ret != UCI_OK)
+ goto done;
+
+ ret = uci_add_section(ctx, p, argv[2], &s);
+ if (ret != UCI_OK)
+ goto done;
+
+ ret = uci_save(ctx, p);
+
+done:
+ if (ret != UCI_OK)
+ cli_perror();
+ else if (s)
+ fprintf(stdout, "%s\n", s->e.name);
+
+ return ret;
+}
static int uci_do_section_cmd(int cmd, int argc, char **argv)
{
struct uci_package *p = NULL;
+ struct uci_section *s = NULL;
struct uci_element *e = NULL;
- char *package = NULL;
+ struct uci_option *o = NULL;
char *section = NULL;
char *option = NULL;
char *value = NULL;
- char **ptr = NULL;
int ret = UCI_OK;
+ char *str;
if (argc != 2)
return 255;
- switch(cmd) {
- case CMD_SET:
- case CMD_RENAME:
- ptr = &value;
- break;
- default:
- break;
+ value = strchr(argv[1], '=');
+ if (value) {
+ *value = 0;
+ value++;
+ if (!uci_validate_text(value))
+ return 1;
}
- if (uci_parse_tuple(ctx, argv[1], &package, §ion, &option, ptr) != UCI_OK)
+
+ if (value && (cmd != CMD_SET) && (cmd != CMD_ADD_LIST) && (cmd != CMD_RENAME))
return 1;
- if (uci_load(ctx, package, &p) != UCI_OK) {
+ do {
+ str = strchr(argv[1], '.'); /* look up section part */
+ if (!str)
+ break;
+
+ str++;
+ str = strchr(str, '.'); /* look up option part */
+ if (!str)
+ break;
+
+ /* separate option from the rest of the pointer */
+ *str = 0;
+ option = str + 1;
+ } while (0);
+
+ if (uci_lookup_ext(ctx, &e, argv[1]) != UCI_OK) {
cli_perror();
return 1;
}
- if (!p)
- return 0;
+
+ switch(e->type) {
+ case UCI_TYPE_PACKAGE:
+ p = uci_to_package(e);
+ break;
+ case UCI_TYPE_SECTION:
+ s = uci_to_section(e);
+ break;
+ default:
+ return 1;
+ }
+ if (s) {
+ section = s->e.name;
+ p = s->package;
+ }
switch(cmd) {
case CMD_GET:
- if (uci_lookup(ctx, &e, p, section, option) != UCI_OK)
- return 1;
-
switch(e->type) {
case UCI_TYPE_SECTION:
- value = uci_to_section(e)->type;
+ printf("%s\n", s->type);
break;
case UCI_TYPE_OPTION:
- value = uci_to_option(e)->value;
+ o = uci_to_option(e);
+ uci_show_value(o);
break;
default:
- /* should not happen */
- return 1;
+ break;
}
/* throw the value to stdout */
- printf("%s\n", value);
break;
case CMD_RENAME:
ret = uci_rename(ctx, p, section, option, value);
ret = uci_revert(ctx, &p, section, option);
break;
case CMD_SET:
- ret = uci_set(ctx, p, section, option, value);
+ ret = uci_set(ctx, p, section, option, value, NULL);
+ break;
+ case CMD_ADD_LIST:
+ ret = uci_add_list(ctx, p, section, option, value, NULL);
break;
case CMD_DEL:
ret = uci_delete(ctx, p, section, option);
fprintf(stderr, "Unknown command\n");
/* clean up */
- uci_cleanup(ctx);
uci_foreach_element_safe(&ctx->root, tmp, e) {
uci_unload(ctx, uci_to_package(e));
}
cmd = CMD_IMPORT;
else if (!strcasecmp(argv[0], "help"))
cmd = CMD_HELP;
+ else if (!strcasecmp(argv[0], "add"))
+ cmd = CMD_ADD;
+ else if (!strcasecmp(argv[0], "add_list"))
+ cmd = CMD_ADD_LIST;
else
cmd = -1;
switch(cmd) {
+ case CMD_ADD_LIST:
case CMD_GET:
case CMD_SET:
case CMD_DEL:
return uci_do_package_cmd(cmd, argc, argv);
case CMD_IMPORT:
return uci_do_import(argc, argv);
+ case CMD_ADD:
+ return uci_do_add(argc, argv);
case CMD_HELP:
uci_usage();
return 0;
return 1;
}
- while((c = getopt(argc, argv, "f:mnNp:P:sSq")) != -1) {
+ while((c = getopt(argc, argv, "c:d:f:mnNp:P:sSq")) != -1) {
switch(c) {
+ case 'c':
+ uci_set_confdir(ctx, optarg);
+ break;
+ case 'd':
+ delimiter = optarg;
+ break;
case 'f':
input = fopen(optarg, "r");
if (!input) {
projects / project / uci.git / blobdiff