Don't print "files not found" after showing help.

kimmov · kimmov · commit dcc241a2b46c · 2011-01-27T10:30:53.000+02:00
Fix ticket cppcheck-opensource#2496 (Is error reporting for an unneeded parameter wrong?) There are several command line options / commands after which we don't want Cppcheck to even try to open any files. Eg. printing help or listing errors. So add new attribute for CmdLineParser to track use of these options and exit before checking files when the attribute is set.
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -60,6 +60,7 @@ CmdLineParser::CmdLineParser(Settings *settings)
     , _showHelp(false)
     , _showVersion(false)
     , _showErrorMessages(false)
+    , _exitAfterPrint(false)
 {
 }
 
@@ -75,6 +76,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
         if (strcmp(argv[i], "--version") == 0)
         {
             _showVersion = true;
+            _exitAfterPrint = true;
             return true;
         }
         // Flag used for various purposes during debugging
@@ -365,6 +367,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
             //_cppcheck->getErrorMessages();
             _showErrorMessages = true;
             _settings->_xml = true;
+            _exitAfterPrint = true;
             return true;
         }
 
@@ -383,6 +386,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
             while (doc2.find("\n\n\n") != std::string::npos)
                 doc2.erase(doc2.find("\n\n\n"), 1);
             std::cout << doc2;
+            _exitAfterPrint = true;
             return true;
         }
 
@@ -459,6 +463,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
         {
             _pathnames.clear();
             _showHelp = true;
+            _exitAfterPrint = true;
             break;
         }
 
diff --git a/cli/cmdlineparser.h b/cli/cmdlineparser.h
@@ -84,6 +84,14 @@ class CmdLineParser
         return _showHelp;
     }
 
+    /**
+     * Return if we should exit after printing version, help etc.
+     */
+    bool ExitAfterPrinting() const
+    {
+        return _exitAfterPrint;
+    }
+
 protected:
 
     /**
@@ -101,6 +109,7 @@ class CmdLineParser
     bool _showHelp;
     bool _showVersion;
     bool _showErrorMessages;
+    bool _exitAfterPrint;
     std::vector<std::string> _pathnames;
 };
 
diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
@@ -57,8 +57,10 @@ bool CppCheckExecutor::parseFromArgs(CppCheck *cppcheck, int argc, const char* c
             std::cout << ErrorLogger::ErrorMessage::getXMLHeader(_settings._xml_version);
             cppcheck->getErrorMessages();
             std::cout << ErrorLogger::ErrorMessage::getXMLFooter() << std::endl;
-            std::exit(0);
         }
+
+        if (parser.ExitAfterPrinting())
+            std::exit(0);
     }
 
     // Check that all include paths exist

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ CmdLineParser::CmdLineParser(Settings *settings)`
`60`	`60`	`, _showHelp(false)`
`61`	`61`	`, _showVersion(false)`
`62`	`62`	`, _showErrorMessages(false)`
	`63`	`+ , _exitAfterPrint(false)`
`63`	`64`	`{`
`64`	`65`	`}`
`65`	`66`
`@@ -75,6 +76,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])`
`75`	`76`	`if (strcmp(argv[i], "--version") == 0)`
`76`	`77`	`{`
`77`	`78`	`_showVersion = true;`
	`79`	`+ _exitAfterPrint = true;`
`78`	`80`	`return true;`
`79`	`81`	`}`
`80`	`82`	`// Flag used for various purposes during debugging`
`@@ -365,6 +367,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])`
`365`	`367`	`//_cppcheck->getErrorMessages();`
`366`	`368`	`_showErrorMessages = true;`
`367`	`369`	`_settings->_xml = true;`
	`370`	`+ _exitAfterPrint = true;`
`368`	`371`	`return true;`
`369`	`372`	`}`
`370`	`373`
`@@ -383,6 +386,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])`
`383`	`386`	`while (doc2.find("\n\n\n") != std::string::npos)`
`384`	`387`	`doc2.erase(doc2.find("\n\n\n"), 1);`
`385`	`388`	`std::cout << doc2;`
	`389`	`+ _exitAfterPrint = true;`
`386`	`390`	`return true;`
`387`	`391`	`}`
`388`	`392`
`@@ -459,6 +463,7 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])`
`459`	`463`	`{`
`460`	`464`	`_pathnames.clear();`
`461`	`465`	`_showHelp = true;`
	`466`	`+ _exitAfterPrint = true;`
`462`	`467`	`break;`
`463`	`468`	`}`
`464`	`469`
Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,10 @@ bool CppCheckExecutor::parseFromArgs(CppCheck cppcheck, int argc, const char c`
`57`	`57`	`std::cout << ErrorLogger::ErrorMessage::getXMLHeader(_settings._xml_version);`
`58`	`58`	`cppcheck->getErrorMessages();`
`59`	`59`	`std::cout << ErrorLogger::ErrorMessage::getXMLFooter() << std::endl;`
`60`		`- std::exit(0);`
`61`	`60`	`}`
	`61`	`+`
	`62`	`+ if (parser.ExitAfterPrinting())`
	`63`	`+ std::exit(0);`
`62`	`64`	`}`
`63`	`65`
`64`	`66`	`// Check that all include paths exist`