Re-fix incorrect ArgFixer.

It needs to be in the front-end, not the kdm_cli() method, otherwise the
tests break.

diff --git a/src/lib/kdm_cli.cc b/src/lib/kdm_cli.cc
index ee962225541695a5c832a4f5708e16f10c78997a..bba8fb7c0d5abf93da096e7de5996ed43a20a566 100644 (file)
--- a/src/lib/kdm_cli.cc
+++ b/src/lib/kdm_cli.cc
@@ -459,8 +459,6 @@ optional<string>
 kdm_cli (int argc, char* argv[], std::function<void (string)> out)
 try
 {
-       ArgFixer fixer(argc, argv);
-
        boost::filesystem::path output = dcp::filesystem::current_path();
        auto container_name_format = Config::instance()->kdm_container_name_format();
        auto filename_format = Config::instance()->kdm_filename_format();
@@ -515,7 +513,7 @@ try
                        { 0, 0, 0, 0 }
                };
 
-               int c = getopt_long(fixer.argc(), fixer.argv(), "ho:K:Z:f:t:d:F:pae::zvc:S:C:T:BDE:G", long_options, &option_index);
+               int c = getopt_long(argc, argv, "ho:K:Z:f:t:d:F:pae::zvc:S:C:T:BDE:G", long_options, &option_index);
 
                if (c == -1) {
                        break;
@@ -649,7 +647,7 @@ try
                throw KDMCLIError ("you must specify --valid-from");
        }
 
-       if (optind >= fixer.argc()) {
+       if (optind >= argc) {
                throw KDMCLIError ("no film, CPL ID or DKDM specified");
        }
 

diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index c30fe4e6a4cd9e9cdc97714618b16530f1105785..4ffd0acd7cb4f4f6dbc7d37a994f8a5ec7727a3c 100644 (file)
--- a/src/tools/dcpomatic_kdm_cli.cc
+++ b/src/tools/dcpomatic_kdm_cli.cc
@@ -33,10 +33,12 @@
 int
 main (int argc, char* argv[])
 {
+       ArgFixer fixer(argc, argv);
+
        dcpomatic_setup_path_encoding ();
        dcpomatic_setup ();
 
-       auto error = kdm_cli(argc, argv, [](std::string s) { std::cout << s << "\n"; });
+       auto error = kdm_cli(fixer.argc(), fixer.argv(), [](std::string s) { std::cout << s << "\n"; });
        if (error) {
                std::cerr << *error << "\n";
                exit (EXIT_FAILURE);