fix a few bugs found during code review
[project/uci.git] / cli.c
diff --git a/cli.c b/cli.c
index 845fc2a..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
@@ -17,8 +18,9 @@
 
 static const char *appname = "uci";
 static enum {
-       CLI_FLAG_MERGE = (1 << 0),
-       CLI_FLAG_QUIET = (1 << 1)
+       CLI_FLAG_MERGE =    (1 << 0),
+       CLI_FLAG_QUIET =    (1 << 1),
+       CLI_FLAG_NOCOMMIT = (1 << 2),
 } flags;
 static FILE *input;
 
@@ -29,6 +31,7 @@ enum {
        CMD_SET,
        CMD_DEL,
        CMD_RENAME,
+       CMD_REVERT,
        /* package cmds */
        CMD_SHOW,
        CMD_IMPORT,
@@ -47,12 +50,15 @@ static void uci_usage(int argc, char **argv)
                "\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"
@@ -105,6 +111,8 @@ static int package_cmd(int cmd, char *package)
                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;
@@ -239,6 +247,9 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
        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;
@@ -248,7 +259,7 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
        }
 
        /* no save necessary for get */
-       if (cmd == CMD_GET)
+       if ((cmd == CMD_GET) || (cmd == CMD_REVERT))
                return 0;
 
        /* save changes, but don't commit them yet */
@@ -280,6 +291,8 @@ static int uci_cmd(int argc, char **argv)
        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"))
@@ -292,6 +305,7 @@ static int uci_cmd(int argc, char **argv)
                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:
@@ -316,7 +330,7 @@ int main(int argc, char **argv)
                return 1;
        }
 
-       while((c = getopt(argc, argv, "mf:sSnNq")) != -1) {
+       while((c = getopt(argc, argv, "f:mnNp:P:sSq")) != -1) {
                switch(c) {
                        case 'f':
                                input = fopen(optarg, "r");
@@ -341,6 +355,14 @@ int main(int argc, char **argv)
                        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;