Fix ticket #58 (If given path is empty it is assumed that it wasn't given)
This commit is contained in:
parent
22593adeac
commit
17eee5e4d7
|
@ -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::string CppCheck::parseFromArgs(int argc, const char* const argv[])
|
||||||
{
|
{
|
||||||
std::vector<std::string> pathnames;
|
std::vector<std::string> pathnames;
|
||||||
|
bool showHelp = false;
|
||||||
for (int i = 1; i < argc; i++)
|
for (int i = 1; i < argc; i++)
|
||||||
{
|
{
|
||||||
// Flag used for various purposes during debugging
|
// Flag used for various purposes during debugging
|
||||||
|
@ -100,6 +100,7 @@ std::string CppCheck::parseFromArgs(int argc, const char* const argv[])
|
||||||
{
|
{
|
||||||
pathnames.clear();
|
pathnames.clear();
|
||||||
_filenames.clear();
|
_filenames.clear();
|
||||||
|
showHelp = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -149,7 +150,8 @@ std::string CppCheck::parseFromArgs(int argc, const char* const argv[])
|
||||||
FileLister::RecursiveAddFiles(_filenames, iter->c_str(), true);
|
FileLister::RecursiveAddFiles(_filenames, iter->c_str(), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_filenames.empty())
|
|
||||||
|
if (argc <= 1 || showHelp)
|
||||||
{
|
{
|
||||||
std::ostringstream oss;
|
std::ostringstream oss;
|
||||||
oss << "Cppcheck 1.27\n"
|
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";
|
" cppcheck -I inc1/ -I inc2/ f.cpp\n";
|
||||||
return oss.str();
|
return oss.str();
|
||||||
}
|
}
|
||||||
|
else if (_filenames.empty())
|
||||||
|
{
|
||||||
|
return "cppcheck: No C or C++ source files found.\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue