fix a few bugs found during code review
[project/uci.git] / cli.c
diff --git a/cli.c b/cli.c
index 1fa1cb1..946a905 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -1,4 +1,5 @@
 /*
+ * cli - Command Line Interface for the Unified Configuration Interface
  * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
  *
  * This program is free software; you can redistribute it and/or modify
  */
 #include <strings.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include "uci.h"
 
+static const char *appname = "uci";
+static enum {
+       CLI_FLAG_MERGE =    (1 << 0),
+       CLI_FLAG_QUIET =    (1 << 1),
+       CLI_FLAG_NOCOMMIT = (1 << 2),
+} flags;
+static FILE *input;
+
 static struct uci_context *ctx;
+enum {
+       /* section cmds */
+       CMD_GET,
+       CMD_SET,
+       CMD_DEL,
+       CMD_RENAME,
+       CMD_REVERT,
+       /* package cmds */
+       CMD_SHOW,
+       CMD_IMPORT,
+       CMD_EXPORT,
+       CMD_COMMIT,
+};
 
 static void uci_usage(int argc, char **argv)
 {
        fprintf(stderr,
                "Usage: %s [<options>] <command> [<arguments>]\n\n"
                "Commands:\n"
-               "\texport   [<config>]\n"
-               "\tshow     [<config>[.<section>[.<option>]]]\n"
-               "\tget      <config>.<section>[.<option>]\n"
-               "\tset      <config>.<section>[.<option>]=<value>\n"
+               "\texport     [<config>]\n"
+               "\timport     [<config>]\n"
+               "\tshow       [<config>[.<section>[.<option>]]]\n"
+               "\tget        <config>.<section>[.<option>]\n"
+               "\tset        <config>.<section>[.<option>]=<value>\n"
+               "\trename     <config>.<section>[.<option>]=<name>\n"
+               "\trevert     <config>[.<section>[.<option>]]\n"
+               "\n"
+               "Options:\n"
+               "\t-f <file>  use <file> as input instead of stdin\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"
+               "\t-p <path>  add a search path for config change files\n"
+               "\t-P <path>  add a search path for config change files and use as default\n"
+               "\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"
                "\n",
                argv[0]
        );
        exit(255);
 }
 
+static void cli_perror(void)
+{
+       if (flags & CLI_FLAG_QUIET)
+               return;
+
+       uci_perror(ctx, appname);
+}
+
 static void uci_show_section(struct uci_section *p)
 {
        struct uci_element *e;
@@ -44,198 +89,301 @@ static void uci_show_section(struct uci_section *p)
        }
 }
 
-static void uci_show_package(struct uci_package *p, char *section)
+static void uci_show_package(struct uci_package *p)
 {
        struct uci_element *e;
 
        uci_foreach_element( &p->sections, e) {
-               if (!section || !strcmp(e->name, section))
-                       uci_show_section(uci_to_section(e));
+               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;
-       char **configs;
-       char **p;
 
-       configs = uci_list_configs(ctx);
-       if (!configs)
-               return 0;
+static int package_cmd(int cmd, char *package)
+{
+       struct uci_package *p = NULL;
 
-       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;
+       if (uci_load(ctx, package, &p) != UCI_OK) {
+               cli_perror();
+               return 1;
        }
-
-       for (p = configs; *p; p++) {
-               if ((argc < 2) || !strcmp(argv[1], *p)) {
-                       if (uci_load(ctx, *p, &package) != UCI_OK) {
-                               uci_perror(ctx, NULL);
-                               return 1;
-                       }
-                       uci_show_package(package, section);
-                       uci_unload(ctx, package);
-               }
+       if (!p)
+               return 0;
+       switch(cmd) {
+       case CMD_COMMIT:
+               if (flags & CLI_FLAG_NOCOMMIT)
+                       return 0;
+               if (uci_commit(ctx, &p, false) != UCI_OK)
+                       cli_perror();
+               break;
+       case CMD_EXPORT:
+               uci_export(ctx, stdout, p, true);
+               break;
+       case CMD_SHOW:
+               uci_show_package(p);
+               break;
        }
 
+       uci_unload(ctx, p);
        return 0;
 }
 
-static int uci_do_export(int argc, char **argv)
+static int uci_do_import(int argc, char **argv)
 {
-       char **configs = uci_list_configs(ctx);
-       char **p;
+       struct uci_package *package = NULL;
+       char *name = NULL;
+       int ret = UCI_OK;
 
-       if (!configs)
-               return 0;
+       if (argc > 2)
+               return 255;
 
-       for (p = configs; *p; 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, true);
-                       uci_unload(ctx, package);
+       if (argc == 2)
+               name = argv[1];
+       else if (flags & CLI_FLAG_MERGE)
+               /* need a package to merge */
+               return 255;
+
+       if (flags & CLI_FLAG_MERGE) {
+               if (uci_load(ctx, name, &package) != UCI_OK)
+                       package = NULL;
+       }
+       ret = uci_import(ctx, input, name, &package, (name != NULL));
+       if (ret == UCI_OK) {
+               if (flags & CLI_FLAG_MERGE) {
+                       ret = uci_save(ctx, package);
+               } else {
+                       struct uci_element *e;
+                       /* loop through all config sections and overwrite existing data */
+                       uci_foreach_element(&ctx->root, e) {
+                               struct uci_package *p = uci_to_package(e);
+                               ret = uci_commit(ctx, &p, true);
+                       }
                }
        }
+
+       if (ret != UCI_OK) {
+               cli_perror();
+               return 1;
+       }
+
        return 0;
 }
 
-static void parse_tuple(char *str, char **package, char **section, char **option, char **value)
+static int uci_do_package_cmd(int cmd, int argc, char **argv)
 {
-       char *last = NULL;
-
-       *package = strtok(str, ".");
-       if (!*package)
-               goto done;
+       char **configs = NULL;
+       char **p;
 
-       last = *package;
-       *section = strtok(NULL, ".");
-       if (!*section)
-               goto done;
+       if (argc > 2)
+               return 255;
 
-       last = *section;
-       *option = strtok(NULL, ".");
-       if (!*option)
-               goto done;
+       if (argc == 2)
+               return package_cmd(cmd, argv[1]);
 
-       last = *option;
-done:
-       if (!value)
-               return;
+       if ((uci_list_configs(ctx, &configs) != UCI_OK) || !configs) {
+               cli_perror();
+               return 1;
+       }
 
-       last = strtok(last, "=");
-       if (!last)
-               return;
+       for (p = configs; *p; p++) {
+               package_cmd(cmd, *p);
+       }
 
-       *value = last + strlen(last) + 1;
+       return 0;
 }
 
 
-static int uci_do_get(int argc, char **argv)
+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;
-       struct uci_package *p = NULL;
-       struct uci_element *e = NULL;
        char *value = NULL;
+       char **ptr = NULL;
+       int ret = UCI_OK;
 
        if (argc != 2)
                return 255;
 
-       parse_tuple(argv[1], &package, &section, &option, NULL);
-       if (!package)
+       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 (uci_load(ctx, package, &p) != UCI_OK) {
-               uci_perror(ctx, "uci");
+               cli_perror();
                return 1;
        }
+       if (!p)
+               return 0;
 
-       if (uci_lookup(ctx, &e, p, section, option) != UCI_OK)
-               return 1;
+       switch(cmd) {
+       case CMD_GET:
+               if (uci_lookup(ctx, &e, p, section, option) != UCI_OK)
+                       return 1;
 
-       switch(e->type) {
-       case UCI_TYPE_SECTION:
-               value = uci_to_section(e)->type;
+               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 UCI_TYPE_OPTION:
-               value = uci_to_option(e)->value;
+       case CMD_RENAME:
+               ret = uci_rename(ctx, p, section, option, value);
+               break;
+       case CMD_REVERT:
+               ret = uci_revert(ctx, &p, section, option);
+               break;
+       case CMD_SET:
+               ret = uci_set(ctx, p, section, option, value);
+               break;
+       case CMD_DEL:
+               ret = uci_delete(ctx, p, section, option);
                break;
-       default:
-               /* should not happen */
-               return 1;
        }
 
-       /* throw the value to stdout */
-       printf("%s\n", value);
-
-       return 0;
-}
-
-static int uci_do_set(int argc, char **argv)
-{
-       struct uci_package *p;
-       char *package = NULL;
-       char *section = NULL;
-       char *option = NULL;
-       char *value = NULL;
-
-       if (argc != 2)
-               return 255;
+       /* no save necessary for get */
+       if ((cmd == CMD_GET) || (cmd == CMD_REVERT))
+               return 0;
 
-       parse_tuple(argv[1], &package, &section, &option, &value);
-       if (!package)
-               return 1;
+       /* save changes, but don't commit them yet */
+       if (ret == UCI_OK)
+               ret = uci_save(ctx, p);
 
-       if (uci_load(ctx, package, &p) != UCI_OK) {
-               uci_perror(ctx, "uci");
+       if (ret != UCI_OK) {
+               cli_perror();
                return 1;
        }
 
-       if (uci_set(ctx, package, section, option, value) != UCI_OK) {
-               uci_perror(ctx, "uci");
-               return 1;
-       }
-       uci_commit(ctx, p);
        return 0;
 }
 
 static int uci_cmd(int argc, char **argv)
 {
+       int cmd = 0;
+
        if (!strcasecmp(argv[0], "show"))
-               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);
-       if (!strcasecmp(argv[0], "set"))
-               return uci_do_set(argc, argv);
-       return 255;
+               cmd = CMD_SHOW;
+       else if (!strcasecmp(argv[0], "export"))
+               cmd = CMD_EXPORT;
+       else if (!strcasecmp(argv[0], "commit"))
+               cmd = CMD_COMMIT;
+       else if (!strcasecmp(argv[0], "get"))
+               cmd = CMD_GET;
+       else if (!strcasecmp(argv[0], "set"))
+               cmd = CMD_SET;
+       else if (!strcasecmp(argv[0], "ren") ||
+                !strcasecmp(argv[0], "rename"))
+               cmd = CMD_RENAME;
+       else if (!strcasecmp(argv[0], "revert"))
+               cmd = CMD_REVERT;
+       else if (!strcasecmp(argv[0], "del"))
+               cmd = CMD_DEL;
+       else if (!strcasecmp(argv[0], "import"))
+               cmd = CMD_IMPORT;
+       else
+               cmd = -1;
+
+       switch(cmd) {
+               case CMD_GET:
+               case CMD_SET:
+               case CMD_DEL:
+               case CMD_RENAME:
+               case CMD_REVERT:
+                       return uci_do_section_cmd(cmd, argc, argv);
+               case CMD_SHOW:
+               case CMD_EXPORT:
+               case CMD_COMMIT:
+                       return uci_do_package_cmd(cmd, argc, argv);
+               case CMD_IMPORT:
+                       return uci_do_import(argc, argv);
+               default:
+                       return 255;
+       }
 }
 
 int main(int argc, char **argv)
 {
        int ret;
+       int c;
 
+       input = stdin;
        ctx = uci_alloc_context();
+       if (!ctx) {
+               fprintf(stderr, "Out of memory\n");
+               return 1;
+       }
+
+       while((c = getopt(argc, argv, "f:mnNp:P:sSq")) != -1) {
+               switch(c) {
+                       case 'f':
+                               input = fopen(optarg, "r");
+                               if (!input) {
+                                       perror("uci");
+                                       return 1;
+                               }
+                               break;
+                       case 'm':
+                               flags |= CLI_FLAG_MERGE;
+                               break;
+                       case 's':
+                               ctx->flags |= UCI_FLAG_STRICT;
+                               break;
+                       case 'S':
+                               ctx->flags &= ~UCI_FLAG_STRICT;
+                               ctx->flags |= UCI_FLAG_PERROR;
+                               break;
+                       case 'n':
+                               ctx->flags |= UCI_FLAG_EXPORT_NAME;
+                               break;
+                       case 'N':
+                               ctx->flags &= ~UCI_FLAG_EXPORT_NAME;
+                               break;
+                       case 'p':
+                               uci_add_history_path(ctx, optarg);
+                               break;
+                       case 'P':
+                               uci_add_history_path(ctx, ctx->savedir);
+                               uci_set_savedir(ctx, optarg);
+                               flags |= CLI_FLAG_NOCOMMIT;
+                               break;
+                       case 'q':
+                               flags |= CLI_FLAG_QUIET;
+                               break;
+                       default:
+                               uci_usage(argc, argv);
+                               break;
+               }
+       }
+       if (optind > 1)
+               argv[optind - 1] = argv[0];
+       argv += optind - 1;
+       argc -= optind - 1;
+
        if (argc < 2)
                uci_usage(argc, argv);
        ret = uci_cmd(argc - 1, argv + 1);
+       if (input != stdin)
+               fclose(input);
        if (ret == 255)
                uci_usage(argc, argv);
+
        uci_free_context(ctx);
 
        return ret;