Merge pull request #427 from perillo/improve-getopt-errors

configuration: improve getopt_long error reporting

src/configuration.cc

@@ -171,6 +171,7 @@ class Configuration : public IConfiguration
 		/* Hooray for reentrancy... */
 		optind = 0;
 		optarg = 0;
+		opterr = 0;
 		while (1)
 		{
 			int option_index = 0;
@@ -180,7 +181,7 @@ class Configuration : public IConfiguration
 			// encountered.  This will ensure correct parsing of positional
 			// arguments without having to use "--" to stop parsing the
 			// executable arguments.
-			c = getopt_long(argc, (char **) argv, "+hp:s:l:t:", long_options,
+			c = getopt_long(argc, (char **) argv, "+:hp:s:l:t:", long_options,
 					&option_index);
 
 			/* No more options */
@@ -431,10 +432,17 @@ class Configuration : public IConfiguration
 				}
 				break;
 			}
-			default:
-				error("Unrecognized option: -%c\n", optopt);
+			case ':':
+				error("Option %s requires an argument\n", argv[optind - 1]);
+				return usage();
+			case '?':
+			{
+				error("Unrecognized option: %s\n", argv[optind - 1]);
 				return usage();
 			}
+			default:
+				panic("unreachable");
+			}
 		}
 
 		if (printUsage)

tests/tools/basic.py

@@ -7,12 +7,16 @@ class TooFewArguments(testbase.KcovTestCase):
     def runTest(self):
         self.setUp()
         rv, output = self.do(testbase.kcov + " " + testbase.outbase + "/kcov")
+
+        assert b"Usage: kcov" in output
         assert rv == 1
 
 class WrongArguments(testbase.KcovTestCase):
     def runTest(self):
         self.setUp()
         rv, output = self.do(testbase.kcov + " --abc=efg " + testbase.outbase + "/kcov " + testbase.testbuild + "/tests-stripped")
+
+        assert b"kcov: error: Unrecognized option: --abc=efg" in output
         assert rv == 1
 
 class LookupBinaryInPath(testbase.KcovTestCase):