fix assertion debugging

[project/uci.git] / cli.c

diff --git a/cli.c b/cli.c
index 23386c1..4e0c5b7 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -19,9 +19,10 @@ static struct uci_context *ctx;
 static void uci_usage(int argc, char **argv)
 {
        fprintf(stderr,
-               "Usage: %s [options] <command> [arguments]\n\n"
+               "Usage: %s [<options>] <command> [<arguments>]\n\n"
                "Commands:\n"
                "\tshow [<config>[.<section>[.<option>]]]\n"
+               "\texport [<config>]\n"
                "\n",
                argv[0]
        );
@@ -30,34 +31,47 @@ static void uci_usage(int argc, char **argv)
 
 static void uci_show_section(struct uci_section *p)
 {
-       struct uci_option *o;
+       struct uci_element *e;
        const char *cname, *sname;
 
-       cname = p->config->name;
-       sname = p->name;
-       uci_foreach_entry(option, &p->options, o) {
-               printf("%s.%s.%s=%s\n", cname, sname, o->name, o->value);
+       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_file(const char *name)
+static int uci_show(int argc, char **argv)
 {
-       struct uci_config *cfg;
-       struct uci_section *p;
+       char *section = (argc > 2 ? argv[2] : NULL);
+       struct uci_package *package;
+       struct uci_element *e;
+       char **configs;
+       char **p;
 
-       if (uci_load(ctx, name, &cfg) != UCI_OK) {
-               uci_perror(ctx, "uci_load");
-               return;
-       }
+       configs = uci_list_configs(ctx);
+       if (!configs)
+               return 0;
 
-       uci_list_empty(&cfg->sections);
-       uci_foreach_entry(section, &cfg->sections, p) {
-               uci_show_section(p);
+       for (p = configs; *p; p++) {
+               if ((argc < 2) || !strcmp(argv[1], *p)) {
+                       if (uci_load(ctx, *p, &package) != UCI_OK) {
+                               uci_perror(ctx, "uci_load");
+                               return 255;
+                       }
+                       uci_foreach_element( &package->sections, e) {
+                               if (!section || !strcmp(e->name, section))
+                                       uci_show_section(uci_to_section(e));
+                       }
+                       uci_unload(ctx, *p);
+               }
        }
-       uci_unload(ctx, name);
+
+       return 0;
 }
 
-static int uci_show(int argc, char **argv)
+static int uci_do_export(int argc, char **argv)
 {
        char **configs = uci_list_configs(ctx);
        char **p;
@@ -66,29 +80,82 @@ static int uci_show(int argc, char **argv)
                return 0;
 
        for (p = configs; *p; p++) {
-               fprintf(stderr, "# config: %s\n", *p);
-               uci_show_file(*p);
+               if ((argc < 2) || !strcmp(argv[1], *p)) {
+                       struct uci_package *package = NULL;
+                       int ret;
+
+                       ret = uci_load(ctx, *p, &package);
+                       if (ret)
+                               continue;
+                       uci_export(ctx, stdout, package);
+                       uci_unload(ctx, *p);
+               }
        }
+       return 0;
+}
+
+
+
+static int uci_do_get(int argc, char **argv)
+{
+       char *package = NULL;
+       char *section = NULL;
+       char *option = NULL;
+       struct uci_package *p = NULL;
+       struct uci_element *e = NULL;
+       char *value = NULL;
+
+       package = strtok(argv[1], ".");
+       if (!package)
+               return 1;
 
+       section = strtok(NULL, ".");
+       if (section)
+               option = strtok(NULL, ".");
+
+       if (uci_load(ctx, package, &p) != UCI_OK) {
+               uci_perror(ctx, "uci");
+               return 1;
+       }
+       if (uci_lookup(ctx, &e, package, section, option) != UCI_OK)
+               return 1;
+       switch(e->type) {
+       case UCI_TYPE_SECTION:
+               value = uci_to_section(e)->type;
+               break;
+       case UCI_TYPE_OPTION:
+               value = uci_to_option(e)->value;
+               break;
+       default:
+               /* should not happen */
+               return 1;
+       }
+       printf("%s\n", value);
        return 0;
 }
 
 static int uci_cmd(int argc, char **argv)
 {
        if (!strcasecmp(argv[0], "show"))
-               uci_show(argc, argv);
-       return 0;
+               return uci_show(argc, argv);
+       if (!strcasecmp(argv[0], "export"))
+               return uci_do_export(argc, argv);
+       if (!strcasecmp(argv[0], "get"))
+               return uci_do_get(argc, argv);
+       return 255;
 }
 
 int main(int argc, char **argv)
 {
        int ret;
 
-       ctx = uci_alloc();
+       ctx = uci_alloc_context();
        if (argc < 2)
                uci_usage(argc, argv);
        ret = uci_cmd(argc - 1, argv + 1);
-       uci_free(ctx);
+       if (ret == 255)
+               uci_usage(argc, argv);
+       uci_free_context(ctx);
 
        return ret;
 }