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 290dcbf..144cdde 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -26,6 +26,8 @@ static enum {
        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;
@@ -39,6 +41,7 @@ enum {
        CMD_DEL,
        CMD_RENAME,
        CMD_REVERT,
+       CMD_REORDER,
        /* package cmds */
        CMD_SHOW,
        CMD_CHANGES,
@@ -50,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,
@@ -70,11 +139,13 @@ static void uci_usage(void)
                "\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"
@@ -83,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
        );
@@ -122,20 +194,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,17 +217,21 @@ 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 = "=";
 
@@ -181,6 +258,7 @@ static int package_cmd(int cmd, char *tuple)
 {
        struct uci_element *e = NULL;
        struct uci_ptr ptr;
+       int ret = 0;
 
        if (uci_lookup_ptr(ctx, &ptr, tuple, true) != UCI_OK) {
                cli_perror();
@@ -195,13 +273,20 @@ static int package_cmd(int cmd, char *tuple)
        case CMD_COMMIT:
                if (flags & CLI_FLAG_NOCOMMIT)
                        return 0;
-               if (uci_commit(ctx, &ptr.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, 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(ptr.p);
@@ -219,8 +304,9 @@ static int package_cmd(int cmd, char *tuple)
                break;
        }
 
-       uci_unload(ctx, ptr.p);
-       return 0;
+       if (ptr.p)
+               uci_unload(ctx, ptr.p);
+       return ret;
 }
 
 static int uci_do_import(int argc, char **argv)
@@ -332,12 +418,17 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
                return 1;
        }
 
-       if (ptr.value && (cmd != CMD_SET) && (cmd != CMD_ADD_LIST) && (cmd != CMD_RENAME))
+       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 (!(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,14 +445,22 @@ 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);
                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, &ptr);
                break;
@@ -385,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;
@@ -430,6 +529,7 @@ static int uci_batch(void)
 {
        int ret = 0;
 
+       flags |= CLI_FLAG_BATCH;
        while (!feof(input)) {
                struct uci_element *e, *tmp;
 
@@ -444,6 +544,8 @@ static int uci_batch(void)
                        uci_unload(ctx, uci_to_package(e));
                }
        }
+       flags &= ~CLI_FLAG_BATCH;
+
        return 0;
 }
 
@@ -470,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;
@@ -490,6 +595,7 @@ static int uci_cmd(int argc, char **argv)
                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:
@@ -513,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();
@@ -521,7 +628,7 @@ int main(int argc, char **argv)
                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);
@@ -530,12 +637,20 @@ int main(int argc, char **argv)
                                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;
@@ -553,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;
@@ -577,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);