add strict mode to the cli usage

[project/uci.git] / cli.c

diff --git a/cli.c b/cli.c
index 85fab6f..93517bf 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -12,17 +12,31 @@
  */
 #include <strings.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include "uci.h"
 
+static const char *appname = "uci";
+
 static struct uci_context *ctx;
+enum {
+       CMD_GET,
+       CMD_SET,
+       CMD_DEL
+};
 
 static void uci_usage(int argc, char **argv)
 {
        fprintf(stderr,
                "Usage: %s [<options>] <command> [<arguments>]\n\n"
                "Commands:\n"
-               "\tshow [<config>[.<section>[.<option>]]]\n"
-               "\texport [<config>]\n"
+               "\texport   [<config>]\n"
+               "\tshow     [<config>[.<section>[.<option>]]]\n"
+               "\tget      <config>.<section>[.<option>]\n"
+               "\tset      <config>.<section>[.<option>]=<value>\n"
+               "\n"
+               "Options:\n"
+               "\t-s       force strict mode (stop on parser errors)\n"
+               "\t-S       disable strict mode\n"
                "\n",
                argv[0]
        );
@@ -42,11 +56,20 @@ static void uci_show_section(struct uci_section *p)
        }
 }
 
+static void uci_show_package(struct uci_package *p, char *section)
+{
+       struct uci_element *e;
+
+       uci_foreach_element( &p->sections, e) {
+               if (!section || !strcmp(e->name, section))
+                       uci_show_section(uci_to_section(e));
+       }
+}
+
 static int uci_show(int argc, char **argv)
 {
        char *section = (argc > 2 ? argv[2] : NULL);
        struct uci_package *package;
-       struct uci_element *e;
        char **configs;
        char **p;
 
@@ -54,17 +77,24 @@ static int uci_show(int argc, char **argv)
        if (!configs)
                return 0;
 
+       if (argc >= 2) {
+               if (uci_load(ctx, argv[1], &package) != UCI_OK) {
+                       uci_perror(ctx, NULL);
+                       return 1;
+               }
+               uci_show_package(package, section);
+               uci_unload(ctx, package);
+               return 0;
+       }
+
        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_perror(ctx, NULL);
+                               return 1;
                        }
-                       uci_foreach_element( &package->sections, e) {
-                               if (!section || !strcmp(e->name, section))
-                                       uci_show_section(uci_to_section(e));
-                       }
-                       uci_unload(ctx, *p);
+                       uci_show_package(package, section);
+                       uci_unload(ctx, package);
                }
        }
 
@@ -87,33 +117,136 @@ static int uci_do_export(int argc, char **argv)
                        ret = uci_load(ctx, *p, &package);
                        if (ret)
                                continue;
-                       uci_export(ctx, stdout, package);
-                       uci_unload(ctx, *p);
+                       uci_export(ctx, stdout, package, true);
+                       uci_unload(ctx, package);
+               }
+       }
+       return 0;
+}
+
+static int uci_do_cmd(int cmd, int argc, char **argv)
+{
+       char *package = NULL;
+       char *section = NULL;
+       char *option = NULL;
+       char *value = NULL;
+       struct uci_package *p = NULL;
+       struct uci_element *e = NULL;
+
+       if (argc != 2)
+               return 255;
+
+       if (uci_parse_tuple(ctx, argv[1], &package, &section, &option, (cmd == CMD_SET ? &value : NULL)) != UCI_OK)
+               return 1;
+
+       if (uci_load(ctx, package, &p) != UCI_OK) {
+               uci_perror(ctx, appname);
+               return 1;
+       }
+
+       if (uci_lookup(ctx, &e, p, section, option) != UCI_OK)
+               return 1;
+
+       switch(cmd) {
+       case CMD_GET:
+               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;
+               }
+               /* throw the value to stdout */
+               printf("%s\n", value);
+               break;
+       case CMD_SET:
+               if (uci_set(ctx, p, section, option, value) != UCI_OK) {
+                       uci_perror(ctx, appname);
+                       return 1;
+               }
+               break;
+       case CMD_DEL:
+               if (uci_del(ctx, p, section, option) != UCI_OK) {
+                       uci_perror(ctx, appname);
+                       return 1;
                }
+               break;
+       }
+
+       /* no save necessary for get */
+       if (cmd == CMD_GET)
+               return 0;
+
+       /* save changes, but don't commit them yet */
+       if (uci_save(ctx, p) != UCI_OK) {
+               uci_perror(ctx, appname);
+               return 1;
        }
+
        return 0;
 }
 
 static int uci_cmd(int argc, char **argv)
 {
+       int cmd;
+
        if (!strcasecmp(argv[0], "show"))
                return uci_show(argc, argv);
        if (!strcasecmp(argv[0], "export"))
                return uci_do_export(argc, argv);
-       return 255;
+
+       if (!strcasecmp(argv[0], "get"))
+               cmd = CMD_GET;
+       else if (!strcasecmp(argv[0], "set"))
+               cmd = CMD_SET;
+       else if (!strcasecmp(argv[0], "del"))
+               cmd = CMD_DEL;
+       else
+               return 255;
+       return uci_do_cmd(cmd, argc, argv);
 }
 
 int main(int argc, char **argv)
 {
        int ret;
+       int c;
+
+       ctx = uci_alloc_context();
+       if (!ctx) {
+               fprintf(stderr, "Out of memory\n");
+               return 1;
+       }
+
+       while((c = getopt(argc, argv, "sS")) != -1) {
+               switch(c) {
+                       case 's':
+                               ctx->flags |= UCI_FLAG_STRICT;
+                               break;
+                       case 'S':
+                               ctx->flags &= ~UCI_FLAG_STRICT;
+                               ctx->flags |= UCI_FLAG_PERROR;
+                               break;
+                       default:
+                               uci_usage(argc, argv);
+                               break;
+               }
+       }
+       if (optind > 1)
+               argv[optind - 1] = argv[0];
+       argv += optind - 1;
+       argc -= optind - 1;
 
-       ctx = uci_alloc();
        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;
 }