put more descriptive names on anonymous sections when running uci show (can be reused...

[project/uci.git] / cli.c

diff --git a/cli.c b/cli.c
index 290dcbf..61afa80 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -50,8 +50,68 @@ enum {
        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)
+               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));
+               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);
+       }
+       sprintf(typestr, "@%s[%d]", ti->name, ti->idx);
+       ti->idx++;
+       return typestr;
+}
+
 static void uci_usage(void)
 {
        fprintf(stderr,
@@ -122,20 +182,21 @@ static void uci_show_option(struct uci_option *o)
 {
        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));
        }
 }
@@ -144,9 +205,13 @@ static void uci_show_package(struct uci_package *p)
 {
        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)
@@ -202,6 +267,11 @@ static int package_cmd(int cmd, char *tuple)
                uci_export(ctx, stdout, ptr.p, true);
                break;
        case CMD_SHOW:
+               if (!(ptr.flags & UCI_LOOKUP_COMPLETE)) {
+                       ctx->err = UCI_ERR_NOTFOUND;
+                       cli_perror();
+                       return 1;
+               }
                switch(e->type) {
                        case UCI_TYPE_PACKAGE:
                                uci_show_package(ptr.p);
@@ -338,6 +408,11 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
        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", ptr.s->type);
@@ -354,10 +429,10 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
                ret = uci_rename(ctx, &ptr);
                break;
        case CMD_REVERT:
-               ret = uci_revert(ctx, &ptr.p, ptr.section, ptr.option);
+               ret = uci_revert(ctx, &ptr);
                break;
        case CMD_SET:
-               ret = uci_set(ctx, ptr.p, ptr.section, ptr.option, ptr.value, NULL);
+               ret = uci_set(ctx, &ptr);
                break;
        case CMD_ADD_LIST:
                ret = uci_add_list(ctx, &ptr);
@@ -430,6 +505,7 @@ static int uci_batch(void)
 {
        int ret = 0;
 
+       flags |= CLI_FLAG_BATCH;
        while (!feof(input)) {
                struct uci_element *e, *tmp;
 
@@ -444,6 +520,8 @@ static int uci_batch(void)
                        uci_unload(ctx, uci_to_package(e));
                }
        }
+       flags &= ~CLI_FLAG_BATCH;
+
        return 0;
 }
 
@@ -470,7 +548,8 @@ static int uci_cmd(int argc, char **argv)
                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;