Report error on excess filenames (KhronosGroup#843)

Fixes KhronosGroup#842. CTS PR: KhronosGroup/KTX-Software-CTS#15.
2gis · Jan 22, 2024 · c32d99a · c32d99a
1 parent 4ac5403
commit c32d99a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/tests/cts b/tests/cts
diff --git a/tools/ktx/command.h b/tools/ktx/command.h
@@ -246,6 +246,9 @@ struct OptionsSingleIn {
     }
 
     void process(cxxopts::Options&, cxxopts::ParseResult& args, Reporter& report) {
+        if (!args.unmatched().empty())
+            report.fatal_usage("Too many filenames specified.");
+
         if (args.count("stdin") + args.count("input-file") == 0)
             report.fatal_usage("Missing input file. Either <input-file> or --stdin must be specified.");
         if (args.count("stdin") + args.count("input-file") > 1)
@@ -273,6 +276,9 @@ struct OptionsSingleInSingleOut {
     }
 
     void process(cxxopts::Options&, cxxopts::ParseResult& args, Reporter& report) {
+        if (!args.unmatched().empty())
+            report.fatal_usage("Too many filenames specified.");
+
         if (args.count("stdin") + args.count("input-file") == 0)
             report.fatal_usage("Missing input file. Either <input-file> or --stdin must be specified.");
         if (args.count("stdin") + args.count("input-file") > 1)
+2 −0		clitests/CMakeLists.txt
+1 −0		clitests/golden/encode/encode_error_too_many_filenames/file_to_file.err.txt
+1 −0		clitests/golden/encode/encode_error_too_many_filenames/file_to_stdout.err.txt
+1 −0		clitests/golden/encode/encode_error_too_many_filenames/stdin_to_file.err.txt
+1 −0		clitests/golden/encode/encode_error_too_many_filenames/stdin_to_stdout.err.txt
+1 −0		clitests/golden/info/cli_errors/too_many_filenames1.err.txt
+1 −0		clitests/golden/info/cli_errors/too_many_filenames2.err.txt
+1 −0		clitests/golden/transcode/transcode_error_too_many_filenames/file_to_file.err.txt
+1 −0		clitests/golden/transcode/transcode_error_too_many_filenames/file_to_stdout.err.txt
+1 −0		clitests/golden/transcode/transcode_error_too_many_filenames/stdin_to_file.err.txt
+1 −0		clitests/golden/transcode/transcode_error_too_many_filenames/stdin_to_stdout.err.txt
+1 −0		clitests/golden/validate/cli_errors/too_many_filenames1.err.txt
+1 −0		clitests/golden/validate/cli_errors/too_many_filenames2.err.txt
+16 −0		clitests/tests/encode/encode_error_too_many_filenames.json
+3 −1		clitests/tests/info/cli_errors.json
+16 −0		clitests/tests/transcode/transcode_error_too_many_filenames.json
+3 −1		clitests/tests/validate/cli_errors.json