fix extended cli lookup

[project/uci.git] / cli.c

diff --git a/cli.c b/cli.c
index b48567faf90bce689491514b54315897c708c9a3..16306ff845c449b4180fb340c19dfec7f7ed97ec 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -155,14 +155,24 @@ static void uci_show_changes(struct uci_package *p)
 
        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");
        }
 }
@@ -329,7 +339,6 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
        struct uci_section *s = NULL;
        struct uci_element *e = NULL;
        struct uci_option *o = NULL;
-       char *package = NULL;
        char *section = NULL;
        char *option = NULL;
        char *value = NULL;
@@ -347,19 +356,23 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
                        return 1;
        }
 
-       str = strdup(argv[1]);
-       if (!str)
-               return 1;
-
        if (value && (cmd != CMD_SET) && (cmd != CMD_ADD_LIST) && (cmd != CMD_RENAME))
                return 1;
 
-       if (uci_parse_tuple(ctx, str, &package, &section, &option, NULL) != UCI_OK) {
-               cli_perror();
-               return 1;
-       }
-       sprintf(argv[1], "%s.%s", package, section);
-       free(str);
+       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();
@@ -373,10 +386,6 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
        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:
                return 1;
        }