cli: add option for changing save path

Save path is a directory where config change (delta) files are stored.
Having a custom individual save dir can be used to prevent two (or more)
"uci" cli callers (e.g. bash scripts) from commiting each other changes.

In the following example:

App0					App1
----					----
uci set system.@system[0].timezone=UTC
					uci set system.@system[0].hostname=OpenWrt
					uci commit system

App1 would unintentionally commit changes made by App0. This can be
avoided by at least 1 "uci" cli user specifying a custom -t option.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

diff --git a/cli.c b/cli.c
index 267437d096d227519220380b698a164b216dc94c..2fce39d012662889cdd211db6111d8eca1eed1fe 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -167,6 +167,7 @@ static void uci_usage(void)
                "\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-t <path>  set save path for config change files\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"
@@ -706,7 +707,7 @@ int main(int argc, char **argv)
                return 1;
        }
 
-       while((c = getopt(argc, argv, "c:d:f:LmnNp:P:sSqX")) != -1) {
+       while((c = getopt(argc, argv, "c:d:f:LmnNp:P:qsSt:X")) != -1) {
                switch(c) {
                        case 'c':
                                uci_set_confdir(ctx, optarg);
@@ -754,6 +755,9 @@ int main(int argc, char **argv)
                        case 'q':
                                flags |= CLI_FLAG_QUIET;
                                break;
+                       case 't':
+                               uci_set_savedir(ctx, optarg);
+                               break;
                        case 'X':
                                flags &= ~CLI_FLAG_SHOW_EXT;
                                break;