From 17eee5e4d7f7b125467078788f1dc76beba15ef6 Mon Sep 17 00:00:00 2001 From: Reijo Tomperi Date: Sun, 25 Jan 2009 11:05:51 +0000 Subject: [PATCH] Fix ticket #58 (If given path is empty it is assumed that it wasn't given) --- src/cppcheck.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/cppcheck.cpp b/src/cppcheck.cpp index d742f3392..58736be0c 100644 --- a/src/cppcheck.cpp +++ b/src/cppcheck.cpp @@ -68,7 +68,7 @@ void CppCheck::addFile(const std::string &path, const std::string &content) std::string CppCheck::parseFromArgs(int argc, const char* const argv[]) { std::vector pathnames; - + bool showHelp = false; for (int i = 1; i < argc; i++) { // Flag used for various purposes during debugging @@ -100,6 +100,7 @@ std::string CppCheck::parseFromArgs(int argc, const char* const argv[]) { pathnames.clear(); _filenames.clear(); + showHelp = true; break; } @@ -149,7 +150,8 @@ std::string CppCheck::parseFromArgs(int argc, const char* const argv[]) FileLister::RecursiveAddFiles(_filenames, iter->c_str(), true); } - if (_filenames.empty()) + + if (argc <= 1 || showHelp) { std::ostringstream oss; oss << "Cppcheck 1.27\n" @@ -186,6 +188,11 @@ std::string CppCheck::parseFromArgs(int argc, const char* const argv[]) " cppcheck -I inc1/ -I inc2/ f.cpp\n"; return oss.str(); } + else if (_filenames.empty()) + { + return "cppcheck: No C or C++ source files found.\n"; + } + return ""; }