review

Author: danmar

cli/cmdlineparser.cpp

@@ -382,10 +382,10 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
     bool def = false;
     bool maxconfigs = false;
     bool debug = false;
+    bool inputAsFilter = false; // set by: --file-filter=+
 
     ImportProject::Type projectType = ImportProject::Type::NONE;
     ImportProject project;
-    bool projectSettings = false;
     std::string vsConfig;
 
     std::string platform;
@@ -769,6 +769,8 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                     mLogger.printError("Failed: --file-filter=-");
                     return Result::Fail;
                 }
+            } else if (std::strcmp(filter, "+") == 0) {
+                inputAsFilter = true;
             } else {
                 mSettings.fileFilters.emplace_back(filter);
             }
@@ -1133,18 +1135,16 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             }
         }
 
-        // --project, --project-settings
-        else if (std::strncmp(argv[i], "--project=", 10) == 0 || std::strncmp(argv[i], "--project-settings=", 19) == 0) {
+        // --project
+        else if (std::strncmp(argv[i], "--project=", 10) == 0) {
             if (projectType != ImportProject::Type::NONE)
             {
                 mLogger.printError("multiple --project options are not supported.");
                 return Result::Fail;
             }
 
-            projectSettings = (std::strncmp(argv[i], "--project-settings=", 19) == 0);
-
             mSettings.checkAllConfigurations = false;     // Can be overridden with --max-configs or --force
-            std::string projectFile = std::strchr(argv[i], '=') + 1;
+            std::string projectFile = argv[i]+10;
             projectType = project.import(projectFile, &mSettings, &mSuppressions, isCppcheckPremium());
             if (projectType == ImportProject::Type::CPPCHECK_GUI) {
                 for (const std::string &lib : project.guiProject.libraries)
@@ -1585,7 +1585,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         //mLogger.printMessage("whole program analysis requires --cppcheck-build-dir to be active with -j.");
     }
 
-    if (projectSettings) {
+    if (inputAsFilter) {
         mSettings.fileFilters.insert(mSettings.fileFilters.end(), mPathNames.cbegin(), mPathNames.cend());
         mPathNames.clear();
     }
@@ -1785,10 +1785,12 @@ void CmdLineParser::printHelp() const
         "    --exitcode-suppressions=<file>\n"
         "                         Used when certain messages should be displayed but\n"
         "                         should not cause a non-zero exitcode.\n"
-        "    --file-filter=<str>  Analyze only those files matching the given filter str\n"
-        "                         Can be used multiple times\n"
+        "    --file-filter=<str>  Analyze only those files matching the given filter str.\n"
+        "                         Can be used multiple times. When str is '-', the file\n"
+        "                         filter will be read from standard input. When str is '+',\n"
+        "                         all path arguments are treated as file filters.\n"
         "                         Example: --file-filter=*bar.cpp analyzes only files\n"
-        "                                  that end with bar.cpp.\n"
+        "                         that end with bar.cpp.\n"
         "    --file-list=<file>   Specify the files to check in a text file. Add one\n"
         "                         filename per line. When file is '-,' the file list will\n"
         "                         be read from standard input.\n"
@@ -1926,16 +1928,6 @@ void CmdLineParser::printHelp() const
         "                         or Visual Studio Project (*.vcxproj) you can limit\n"
         "                         the configuration cppcheck should check.\n"
         "                         For example: '--project-configuration=Release|Win32'\n"
-        "    --project-settings=<file>\n"
-        "                         IDE option: Import settings from project file. Preprocessor\n"
-        "                         settings, suppressions, coding standards, etc. are imported.\n"
-        "                         Unlike --project the files to analyse is not imported with this\n"
-        "                         option.\n"
-        "                         These two commands are effectively the same:\n"
-        "                             cppcheck --project=foo --file-filter=src/test.c\n"
-        "                             cppcheck --project-settings=foo src/test.c\n"
-        "                         Both commands will load the project foo and then analyse only the\n"
-        "                         file src/test.c\n"
         "    -q, --quiet          Do not show progress reports.\n"
         "                         Note that this option is not mutually exclusive with --verbose.\n"
         "    -rp=<paths>, --relative-paths=<paths>\n"

test/testcmdlineparser.cpp

@@ -208,6 +208,7 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(fileFilterFileWithDetailsSimplifiedPath);
         TEST_CASE(fileFilterFileWithDetailsCase);
         TEST_CASE(fileFilterStdin);
+        TEST_CASE(fileFilterPlus);
         TEST_CASE(fileFilterNoMatch);
         TEST_CASE(fileList);
         TEST_CASE(fileListNoFile);
@@ -376,8 +377,6 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(projectEmpty);
         TEST_CASE(projectMissing);
         TEST_CASE(projectNoPaths);
-        TEST_CASE(projectSettingsBeforeSource);
-        TEST_CASE(projectSettingsAfterSource);
         TEST_CASE(addon);
         TEST_CASE(addonMissing);
 #ifdef HAVE_RULES
@@ -1235,6 +1234,19 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS("file2.cpp", settings->fileFilters[1]);
     }
 
+    void fileFilterPlus() {
+        REDIRECT;
+        ScopedFile file("project.cppcheck",
+                        "<project>\n"
+                        "<paths>\n"
+                        "<dir name=\"src\"/>\n"
+                        "</paths>\n"
+                        "</project>");
+        const char * const argv[] = {"cppcheck", "--project=project.cppcheck", "--file-filter=+", "src/file.cpp"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
+        ASSERT_EQUALS("src/file.cpp", settings->fileFilters.front());
+    }
+
     void fileFilterNoMatch() {
         REDIRECT;
         RedirectInput input("notexist1.c\nnotexist2.cpp\n");
@@ -2504,32 +2516,6 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS("cppcheck: error: no C or C++ source files found.\n", logger->str());
     }
 
-    void projectSettingsBeforeSource() {
-        REDIRECT;
-        ScopedFile file("project.cppcheck",
-                        "<project>\n"
-                        "<paths>\n"
-                        "<dir name=\"src\"/>\n"
-                        "</paths>\n"
-                        "</project>");
-        const char * const argv[] = {"cppcheck", "--project-settings=project.cppcheck", "src/file.cpp"};
-        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS("src/file.cpp", settings->fileFilters.front());
-    }
-
-    void projectSettingsAfterSource() {
-        REDIRECT;
-        ScopedFile file("project.cppcheck",
-                        "<project>\n"
-                        "<paths>\n"
-                        "<dir name=\"src\"/>\n"
-                        "</paths>\n"
-                        "</project>");
-        const char * const argv[] = {"cppcheck", "src/file.cpp", "--project-settings=project.cppcheck"};
-        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
-        ASSERT_EQUALS("src/file.cpp", settings->fileFilters.front());
-    }
-
     void addon() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--addon=misra", "file.cpp"};