CLI_FLAG_QUIET = (1 << 1),
CLI_FLAG_NOCOMMIT = (1 << 2),
CLI_FLAG_BATCH = (1 << 3),
+ CLI_FLAG_SHOW_EXT = (1 << 4),
} flags;
static FILE *input;
CMD_GET,
CMD_SET,
CMD_ADD_LIST,
+ CMD_DEL_LIST,
CMD_DEL,
CMD_RENAME,
CMD_REVERT,
+ CMD_REORDER,
/* package cmds */
CMD_SHOW,
CMD_CHANGES,
CMD_HELP,
};
+struct uci_type_list {
+ unsigned int idx;
+ const char *name;
+ struct uci_type_list *next;
+};
+
+static struct uci_type_list *type_list = NULL;
+static char *typestr = NULL;
+static const char *cur_section_ref = NULL;
+
static int uci_cmd(int argc, char **argv);
+static void
+uci_reset_typelist(void)
+{
+ struct uci_type_list *type;
+ while (type_list != NULL) {
+ type = type_list;
+ type_list = type_list->next;
+ free(type);
+ }
+ if (typestr) {
+ free(typestr);
+ typestr = NULL;
+ }
+ cur_section_ref = NULL;
+}
+
+static char *
+uci_lookup_section_ref(struct uci_section *s)
+{
+ struct uci_type_list *ti = type_list;
+ int maxlen;
+
+ if (!s->anonymous || !(flags & CLI_FLAG_SHOW_EXT))
+ return s->e.name;
+
+ /* look up in section type list */
+ while (ti) {
+ if (strcmp(ti->name, s->type) == 0)
+ break;
+ ti = ti->next;
+ }
+ if (!ti) {
+ ti = malloc(sizeof(struct uci_type_list));
+ if (!ti)
+ return NULL;
+ memset(ti, 0, sizeof(struct uci_type_list));
+ ti->next = type_list;
+ type_list = ti;
+ ti->name = s->type;
+ }
+
+ maxlen = strlen(s->type) + 1 + 2 + 10;
+ if (!typestr) {
+ typestr = malloc(maxlen);
+ } else {
+ typestr = realloc(typestr, maxlen);
+ }
+
+ if (typestr)
+ sprintf(typestr, "@%s[%d]", ti->name, ti->idx);
+
+ ti->idx++;
+
+ return typestr;
+}
+
static void uci_usage(void)
{
fprintf(stderr,
"\tcommit [<config>]\n"
"\tadd <config> <section-type>\n"
"\tadd_list <config>.<section>.<option>=<string>\n"
+ "\tdel_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"
+ "\tdelete <config>[.<section>[[.<option>][=<id>]]]\n"
"\trename <config>.<section>[.<option>]=<name>\n"
"\trevert <config>[.<section>[.<option>]]\n"
+ "\treorder <config>.<section>=<position>\n"
"\n"
"Options:\n"
"\t-c <path> set the search path for config files (default: /etc/config)\n"
"\t-q quiet mode (don't print error messages)\n"
"\t-s force strict mode (stop on parser errors, default)\n"
"\t-S disable strict mode\n"
+ "\t-X do not use extended syntax on 'show'\n"
"\n",
appname
);
{
printf("%s.%s.%s=",
o->section->package->e.name,
- o->section->e.name,
+ (cur_section_ref ? cur_section_ref : o->section->e.name),
o->e.name);
uci_show_value(o);
}
-static void uci_show_section(struct uci_section *p)
+static void uci_show_section(struct uci_section *s)
{
struct uci_element *e;
- const char *cname, *sname;
+ const char *cname;
+ const char *sname;
- cname = p->package->e.name;
- sname = p->e.name;
- printf("%s.%s=%s\n", cname, sname, p->type);
- uci_foreach_element(&p->options, e) {
+ cname = s->package->e.name;
+ sname = (cur_section_ref ? cur_section_ref : s->e.name);
+ printf("%s.%s=%s\n", cname, sname, s->type);
+ uci_foreach_element(&s->options, e) {
uci_show_option(uci_to_option(e));
}
}
{
struct uci_element *e;
+ uci_reset_typelist();
uci_foreach_element( &p->sections, e) {
- uci_show_section(uci_to_section(e));
+ struct uci_section *s = uci_to_section(e);
+ cur_section_ref = uci_lookup_section_ref(s);
+ uci_show_section(s);
}
+ uci_reset_typelist();
}
static void uci_show_changes(struct uci_package *p)
{
struct uci_element *e;
- uci_foreach_element(&p->saved_history, e) {
- struct uci_history *h = uci_to_history(e);
+ uci_foreach_element(&p->saved_delta, e) {
+ struct uci_delta *h = uci_to_delta(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;
+ case UCI_CMD_LIST_DEL:
+ 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;
+ int ret = 0;
- 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();
+ ret = 1;
+ }
break;
case CMD_EXPORT:
- uci_export(ctx, stdout, p, true);
+ uci_export(ctx, stdout, ptr.p, true);
break;
case CMD_SHOW:
+ if (!(ptr.flags & UCI_LOOKUP_COMPLETE)) {
+ ctx->err = UCI_ERR_NOTFOUND;
+ cli_perror();
+ ret = 1;
+ }
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);
- return 0;
+ if (ptr.p)
+ uci_unload(ctx, ptr.p);
+ return ret;
}
static int uci_do_import(int argc, char **argv)
{
char **configs = NULL;
char **p;
+ int ret = 1;
if (argc > 2)
return 255;
if ((uci_list_configs(ctx, &configs) != UCI_OK) || !configs) {
cli_perror();
- return 1;
+ goto out;
}
for (p = configs; *p; p++) {
package_cmd(cmd, *p);
}
- return 0;
+ ret = 0;
+out:
+ free(configs);
+ return ret;
}
static int uci_do_add(int argc, char **argv)
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;
+ int dummy;
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_ADD_LIST) && (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_PACKAGE:
- p = uci_to_package(e);
- break;
- 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_DEL) &&
+ (cmd != CMD_ADD_LIST) && (cmd != CMD_DEL_LIST) &&
+ (cmd != CMD_RENAME) && (cmd != CMD_REORDER))
return 1;
- }
- if (s) {
- section = s->e.name;
- p = s->package;
- }
+ e = ptr.last;
switch(cmd) {
case CMD_GET:
+ if (!(ptr.flags & UCI_LOOKUP_COMPLETE)) {
+ ctx->err = UCI_ERR_NOTFOUND;
+ cli_perror();
+ return 1;
+ }
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);
- uci_show_value(o);
+ 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, p, section, option, value, NULL);
+ ret = uci_add_list(ctx, &ptr);
+ break;
+ case CMD_DEL_LIST:
+ ret = uci_del_list(ctx, &ptr);
+ break;
+ case CMD_REORDER:
+ if (!ptr.s || !ptr.value) {
+ ctx->err = UCI_ERR_NOTFOUND;
+ cli_perror();
+ return 1;
+ }
+ ret = uci_reorder_section(ctx, ptr.s, strtoul(ptr.value, NULL, 10));
break;
case CMD_DEL:
- ret = uci_delete(ctx, p, section, option);
+ if (ptr.value && !sscanf(ptr.value, "%d", &dummy))
+ return 1;
+ 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();
static int uci_batch_cmd(void)
{
- char *argv[MAX_ARGS];
+ char *argv[MAX_ARGS + 2];
char *str = NULL;
int ret = 0;
int i, j;
return 0;
for (j = 0; j < i; j++) {
- if (argv[j])
- free(argv[j]);
+ free(argv[j]);
}
return ret;
{
int ret = 0;
+ flags |= CLI_FLAG_BATCH;
while (!feof(input)) {
struct uci_element *e, *tmp;
uci_unload(ctx, uci_to_package(e));
}
}
+ flags &= ~CLI_FLAG_BATCH;
+
return 0;
}
cmd = CMD_RENAME;
else if (!strcasecmp(argv[0], "revert"))
cmd = CMD_REVERT;
- else if (!strcasecmp(argv[0], "del"))
+ else if (!strcasecmp(argv[0], "reorder"))
+ cmd = CMD_REORDER;
+ else if (!strcasecmp(argv[0], "del") ||
+ !strcasecmp(argv[0], "delete"))
cmd = CMD_DEL;
else if (!strcasecmp(argv[0], "import"))
cmd = CMD_IMPORT;
cmd = CMD_ADD;
else if (!strcasecmp(argv[0], "add_list"))
cmd = CMD_ADD_LIST;
+ else if (!strcasecmp(argv[0], "del_list"))
+ cmd = CMD_DEL_LIST;
else
cmd = -1;
switch(cmd) {
case CMD_ADD_LIST:
+ case CMD_DEL_LIST:
case CMD_GET:
case CMD_SET:
case CMD_DEL:
case CMD_RENAME:
case CMD_REVERT:
+ case CMD_REORDER:
return uci_do_section_cmd(cmd, argc, argv);
case CMD_SHOW:
case CMD_EXPORT:
int ret;
int c;
+ flags = CLI_FLAG_SHOW_EXT;
appname = argv[0];
input = stdin;
ctx = uci_alloc_context();
return 1;
}
- while((c = getopt(argc, argv, "c:d:f:mnNp:P:sSq")) != -1) {
+ while((c = getopt(argc, argv, "c:d:f:LmnNp:P:sSqX")) != -1) {
switch(c) {
case 'c':
uci_set_confdir(ctx, optarg);
delimiter = optarg;
break;
case 'f':
+ if (input != stdin) {
+ perror("uci");
+ return 1;
+ }
+
input = fopen(optarg, "r");
if (!input) {
perror("uci");
ctx->flags &= ~UCI_FLAG_EXPORT_NAME;
break;
case 'p':
- uci_add_history_path(ctx, optarg);
+ uci_add_delta_path(ctx, optarg);
break;
case 'P':
- uci_add_history_path(ctx, ctx->savedir);
+ uci_add_delta_path(ctx, ctx->savedir);
uci_set_savedir(ctx, optarg);
flags |= CLI_FLAG_NOCOMMIT;
break;
case 'q':
flags |= CLI_FLAG_QUIET;
break;
+ case 'X':
+ flags &= ~CLI_FLAG_SHOW_EXT;
+ break;
default:
uci_usage();
return 0;
uci_usage();
return 0;
}
+
ret = uci_cmd(argc - 1, argv + 1);
if (input != stdin)
fclose(input);
- if (ret == 255) {
+
+ if (ret == 255)
uci_usage();
- return 0;
- }
uci_free_context(ctx);
projects / project / uci.git / blobdiff