lua: include /opt/local/lib and /opt/local/include in the search path on mac os x
[project/uci.git] / cli.c
diff --git a/cli.c b/cli.c
index 287ef96..144cdde 100644 (file)
--- a/cli.c
+++ b/cli.c
 
 #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),
        CLI_FLAG_QUIET =    (1 << 1),
        CLI_FLAG_NOCOMMIT = (1 << 2),
        CLI_FLAG_BATCH =    (1 << 3),
+       CLI_FLAG_SHOW_EXT = (1 << 4),
+       CLI_FLAG_NOPLUGINS= (1 << 5),
 } flags;
 
 static FILE *input;
@@ -34,9 +37,11 @@ enum {
        /* section cmds */
        CMD_GET,
        CMD_SET,
+       CMD_ADD_LIST,
        CMD_DEL,
        CMD_RENAME,
        CMD_REVERT,
+       CMD_REORDER,
        /* package cmds */
        CMD_SHOW,
        CMD_CHANGES,
@@ -48,8 +53,74 @@ 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 || !(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,
@@ -59,15 +130,22 @@ static void uci_usage(void)
                "\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"
+               "\treorder    <config>.<section>=<position>\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-L         do not load any plugins\n"
                "\t-m         when importing, merge data into an existing package\n"
                "\t-n         name unnamed sections on export (default)\n"
                "\t-N         don't name unnamed sections\n"
@@ -76,6 +154,7 @@ static void uci_usage(void)
                "\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
        );
@@ -89,16 +168,48 @@ static void cli_perror(void)
        uci_perror(ctx, appname);
 }
 
-static void uci_show_section(struct uci_section *p)
+static void uci_show_value(struct uci_option *o)
 {
        struct uci_element *e;
-       const char *cname, *sname;
+       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;
+       }
+}
 
-       cname = p->package->e.name;
-       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);
+static void uci_show_option(struct uci_option *o)
+{
+       printf("%s.%s.%s=",
+               o->section->package->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 *s)
+{
+       struct uci_element *e;
+       const char *cname;
+       const char *sname;
+
+       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));
        }
 }
 
@@ -106,66 +217,96 @@ 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)
 {
        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;
+               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_element *e = NULL;
+       struct uci_ptr ptr;
+       int ret = 0;
 
-       if (ret != UCI_OK) {
+       if (uci_lookup_ptr(ctx, &ptr, tuple, true) != UCI_OK) {
                cli_perror();
                return 1;
        }
-       if (!p)
-               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:
-               uci_show_package(p);
+               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(ptr.p);
+                               break;
+                       case UCI_TYPE_SECTION:
+                               uci_show_section(ptr.s);
+                               break;
+                       case UCI_TYPE_OPTION:
+                               uci_show_option(ptr.o);
+                               break;
+                       default:
+                               /* should not happen */
+                               return 1;
+               }
                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)
@@ -265,68 +406,63 @@ done:
 
 static int uci_do_section_cmd(int cmd, int argc, char **argv)
 {
-       struct uci_package *p = NULL;
-       struct uci_element *e = NULL;
-       char *package = NULL;
-       char *section = NULL;
-       char *option = NULL;
-       char *value = NULL;
-       char **ptr = NULL;
+       struct uci_element *e;
+       struct uci_ptr ptr;
        int ret = UCI_OK;
 
        if (argc != 2)
                return 255;
 
-       switch(cmd) {
-       case CMD_SET:
-       case CMD_RENAME:
-               ptr = &value;
-               break;
-       default:
-               break;
-       }
-       if (uci_parse_tuple(ctx, argv[1], &package, &section, &option, ptr) != UCI_OK)
-               return 1;
-       if (section && !section[0])
-               return 1;
-
-       if (uci_load(ctx, package, &p) != UCI_OK) {
+       if (uci_lookup_ptr(ctx, &ptr, argv[1], true) != UCI_OK) {
                cli_perror();
                return 1;
        }
-       if (!p)
-               return 0;
 
+       if (ptr.value && (cmd != CMD_SET) && (cmd != CMD_ADD_LIST) && (cmd != CMD_RENAME) && (cmd != CMD_REORDER))
+               return 1;
+
+       e = ptr.last;
        switch(cmd) {
        case CMD_GET:
-               if (uci_lookup(ctx, &e, p, section, option) != UCI_OK)
+               if (!(ptr.flags & UCI_LOOKUP_COMPLETE)) {
+                       ctx->err = UCI_ERR_NOTFOUND;
+                       cli_perror();
                        return 1;
-
+               }
                switch(e->type) {
                case UCI_TYPE_SECTION:
-                       value = uci_to_section(e)->type;
+                       printf("%s\n", ptr.s->type);
                        break;
                case UCI_TYPE_OPTION:
-                       value = uci_to_option(e)->value;
+                       uci_show_value(ptr.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_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_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);
+               ret = uci_delete(ctx, &ptr);
                break;
        }
 
@@ -336,7 +472,7 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
 
        /* 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();
@@ -348,7 +484,7 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
 
 static int uci_batch_cmd(void)
 {
-       char *argv[MAX_ARGS];
+       char *argv[MAX_ARGS + 2];
        char *str = NULL;
        int ret = 0;
        int i, j;
@@ -393,6 +529,7 @@ static int uci_batch(void)
 {
        int ret = 0;
 
+       flags |= CLI_FLAG_BATCH;
        while (!feof(input)) {
                struct uci_element *e, *tmp;
 
@@ -407,6 +544,8 @@ static int uci_batch(void)
                        uci_unload(ctx, uci_to_package(e));
                }
        }
+       flags &= ~CLI_FLAG_BATCH;
+
        return 0;
 }
 
@@ -433,7 +572,10 @@ 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], "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;
@@ -441,15 +583,19 @@ static int uci_cmd(int argc, char **argv)
                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:
                case CMD_RENAME:
                case CMD_REVERT:
+               case CMD_REORDER:
                        return uci_do_section_cmd(cmd, argc, argv);
                case CMD_SHOW:
                case CMD_EXPORT:
@@ -473,6 +619,7 @@ int main(int argc, char **argv)
        int ret;
        int c;
 
+       flags = CLI_FLAG_SHOW_EXT;
        appname = argv[0];
        input = stdin;
        ctx = uci_alloc_context();
@@ -481,15 +628,29 @@ int main(int argc, char **argv)
                return 1;
        }
 
-       while((c = getopt(argc, argv, "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);
+                               break;
+                       case 'd':
+                               delimiter = optarg;
+                               break;
                        case 'f':
+                               if (input != stdin) {
+                                       perror("uci");
+                                       return 1;
+                               }
+
                                input = fopen(optarg, "r");
                                if (!input) {
                                        perror("uci");
                                        return 1;
                                }
                                break;
+                       case 'L':
+                               flags |= CLI_FLAG_NOPLUGINS;
+                               break;
                        case 'm':
                                flags |= CLI_FLAG_MERGE;
                                break;
@@ -507,16 +668,19 @@ int main(int argc, char **argv)
                                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;
@@ -531,13 +695,16 @@ int main(int argc, char **argv)
                uci_usage();
                return 0;
        }
+
+       if (!(flags & CLI_FLAG_NOPLUGINS))
+               uci_load_plugins(ctx, NULL);
+
        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);