implement uci get

[project/uci.git] / cli.c

diff --git a/cli.c b/cli.c
index 40b5d91..4e0c5b7 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -15,8 +15,6 @@
 #include "uci.h"
 
 static struct uci_context *ctx;
-static char *buf = NULL;
-static int buflen = 256;
 
 static void uci_usage(int argc, char **argv)
 {
@@ -31,111 +29,108 @@ static void uci_usage(int argc, char **argv)
        exit(255);
 }
 
-static char *uci_escape(char *str)
-{
-       char *s, *p, *t;
-       int pos = 0;
-
-       if (!buf)
-               buf = malloc(buflen);
-
-       s = str;
-       p = strchr(str, '\'');
-       if (!p)
-               return str;
-
-       do {
-               int len = p - s;
-               if (len > 0) {
-                       if (p + 3 - str >= buflen) {
-                               buflen *= 2;
-                               buf = realloc(buf, buflen);
-                               if (!buf) {
-                                       fprintf(stderr, "Out of memory\n");
-                                       exit(255);
-                               }
-                       }
-                       memcpy(&buf[pos], s, len);
-                       pos += len;
-               }
-               strcpy(&buf[pos], "'\\''");
-               pos += 3;
-               s = p + 1;
-       } while ((p = strchr(s, '\'')));
-
-       return buf;
-}
-
 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;
+       cname = p->package->e.name;
+       sname = p->e.name;
        printf("%s.%s=%s\n", cname, sname, p->type);
-       uci_foreach_entry(option, &p->options, o) {
-               printf("%s.%s.%s=%s\n", cname, sname, o->name, o->value);
+       uci_foreach_element(&p->options, e) {
+               printf("%s.%s.%s=%s\n", cname, sname, e->name, uci_to_option(e)->value);
        }
 }
 
-static void uci_export_section(struct uci_section *p)
-{
-       struct uci_option *o;
-       const char *name;
-
-       printf("config '%s'", uci_escape(p->type));
-       printf(" '%s'\n", uci_escape(p->name));
-       uci_foreach_entry(option, &p->options, o) {
-               printf("\toption '%s'", uci_escape(o->name));
-               printf(" '%s'\n", uci_escape(o->value));
-       }
-}
-
-static void foreach_section(const char *name, void (*callback)(struct uci_section *))
-{
-       struct uci_config *cfg;
-       struct uci_section *p;
-
-       if (uci_load(ctx, name, &cfg) != UCI_OK) {
-               uci_perror(ctx, "uci_load");
-               return;
-       }
-
-       uci_list_empty(&cfg->sections);
-       uci_foreach_entry(section, &cfg->sections, p) {
-               callback(p);
-       }
-       uci_unload(ctx, name);
-}
-
 static int uci_show(int argc, char **argv)
 {
-       char **configs = uci_list_configs();
+       char *section = (argc > 2 ? argv[2] : NULL);
+       struct uci_package *package;
+       struct uci_element *e;
+       char **configs;
        char **p;
 
+       configs = uci_list_configs(ctx);
        if (!configs)
                return 0;
 
        for (p = configs; *p; p++) {
-               fprintf(stderr, "# config: %s\n", *p);
-               foreach_section(*p, uci_show_section);
+               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);
+               }
        }
 
        return 0;
 }
 
-static int uci_export(int argc, char **argv)
+static int uci_do_export(int argc, char **argv)
 {
-       char **configs = uci_list_configs();
+       char **configs = uci_list_configs(ctx);
        char **p;
 
        if (!configs)
                return 0;
 
        for (p = configs; *p; p++) {
-               foreach_section(*p, uci_export_section);
+               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;
 }
 
@@ -144,7 +139,9 @@ static int uci_cmd(int argc, char **argv)
        if (!strcasecmp(argv[0], "show"))
                return uci_show(argc, argv);
        if (!strcasecmp(argv[0], "export"))
-               return uci_export(argc, argv);
+               return uci_do_export(argc, argv);
+       if (!strcasecmp(argv[0], "get"))
+               return uci_do_get(argc, argv);
        return 255;
 }
 
@@ -152,13 +149,13 @@ 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);
        if (ret == 255)
                uci_usage(argc, argv);
-       uci_free(ctx);
+       uci_free_context(ctx);
 
        return ret;
 }