#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,
"\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_option(struct uci_option *o)
+static void uci_show_value(struct uci_option *o)
{
- printf("%s.%s.%s=",
- o->section->package->e.name,
- o->section->e.name,
- o->e.name);
+ 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;
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 *tuple)
{
- struct uci_package *p;
- struct uci_section *s;
struct uci_element *e = NULL;
+ struct uci_ptr ptr;
- if (uci_lookup_ext(ctx, &e, tuple) != UCI_OK) {
+ if (uci_lookup_ptr(ctx, &ptr, tuple, true) != UCI_OK) {
cli_perror();
return 1;
}
- 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;
- }
+ e = ptr.last;
switch(cmd) {
case CMD_CHANGES:
- uci_show_changes(p);
+ uci_show_changes(ptr.p);
break;
case CMD_COMMIT:
if (flags & CLI_FLAG_NOCOMMIT)
return 0;
- if (uci_commit(ctx, &p, false) != UCI_OK)
+ if (uci_commit(ctx, &ptr.p, false) != UCI_OK)
cli_perror();
break;
case CMD_EXPORT:
- uci_export(ctx, stdout, p, true);
+ uci_export(ctx, stdout, ptr.p, true);
break;
case CMD_SHOW:
switch(e->type) {
case UCI_TYPE_PACKAGE:
- uci_show_package(p);
+ uci_show_package(ptr.p);
break;
case UCI_TYPE_SECTION:
- uci_show_section(uci_to_section(e));
+ uci_show_section(ptr.s);
break;
case UCI_TYPE_OPTION:
- uci_show_option(uci_to_option(e));
+ uci_show_option(ptr.o);
break;
default:
/* should not happen */
break;
}
- uci_unload(ctx, p);
+ uci_unload(ctx, ptr.p);
return 0;
}
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;
- struct uci_option *o = NULL;
- char *section = NULL;
- char *option = NULL;
- char *value = NULL;
+ struct uci_element *e;
+ struct uci_ptr ptr;
int ret = UCI_OK;
if (argc != 2)
return 255;
- value = strchr(argv[1], '=');
- if (value) {
- *value = 0;
- value++;
- if (!uci_validate_text(value))
- return 1;
- }
-
- if (value && (cmd != CMD_SET) && (cmd != CMD_RENAME))
- return 1;
-
- if (uci_lookup_ext(ctx, &e, argv[1]) != UCI_OK) {
+ if (uci_lookup_ptr(ctx, &ptr, argv[1], true) != UCI_OK) {
cli_perror();
return 1;
}
- switch(e->type) {
- case UCI_TYPE_SECTION:
- s = uci_to_section(e);
- break;
- case UCI_TYPE_OPTION:
- option = e->name;
- s = uci_to_option(e)->section;
- break;
- default:
+ if (ptr.value && (cmd != CMD_SET) && (cmd != CMD_ADD_LIST) && (cmd != CMD_RENAME))
return 1;
- }
- section = s->e.name;
- p = s->package;
+ e = ptr.last;
switch(cmd) {
case CMD_GET:
switch(e->type) {
case UCI_TYPE_SECTION:
- printf("%s\n", s->type);
+ printf("%s\n", ptr.s->type);
break;
case UCI_TYPE_OPTION:
- o = uci_to_option(e);
- switch(o->type) {
- case UCI_TYPE_STRING:
- printf("%s\n", o->v.string);
- break;
- default:
- printf("<unknown>\n");
- break;
- }
+ uci_show_value(ptr.o);
break;
default:
break;
/* throw the value to stdout */
break;
case CMD_RENAME:
- ret = uci_rename(ctx, p, section, option, value);
+ ret = uci_rename(ctx, &ptr);
break;
case CMD_REVERT:
- ret = uci_revert(ctx, &p, section, option);
+ ret = uci_revert(ctx, &ptr);
break;
case CMD_SET:
- ret = uci_set(ctx, p, section, option, value, NULL);
+ ret = uci_set(ctx, &ptr);
+ break;
+ case CMD_ADD_LIST:
+ ret = uci_add_list(ctx, &ptr);
break;
case CMD_DEL:
- ret = uci_delete(ctx, p, section, option);
+ ret = uci_delete(ctx, &ptr);
break;
}
/* save changes, but don't commit them yet */
if (ret == UCI_OK)
- ret = uci_save(ctx, p);
+ ret = uci_save(ctx, ptr.p);
if (ret != UCI_OK) {
cli_perror();
cmd = CMD_RENAME;
else if (!strcasecmp(argv[0], "revert"))
cmd = CMD_REVERT;
- else if (!strcasecmp(argv[0], "del"))
+ else if (!strcasecmp(argv[0], "del") ||
+ !strcasecmp(argv[0], "delete"))
cmd = CMD_DEL;
else if (!strcasecmp(argv[0], "import"))
cmd = CMD_IMPORT;
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 1;
}
- while((c = getopt(argc, argv, "c: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