Allow directories to be specified without trailing path separator

Author: glankk

lib/pathmatch.cpp

@@ -84,25 +84,21 @@ PathMatch::PathMatch(const std::vector<std::string> &paths, const std::string &b
         if (p.front() == '.')
             p = mBasepath + "/" + p;
 
-        p = Path::fromNativeSeparators(p);
+        p = Path::fromNativeSeparators(Path::simplifyPath(p));
 
-        if (Path::isAbsolute(p)) {
-            p = Path::simplifyPath(p);
+        if (p.back() == '/')
+            p.pop_back();
 
-            if (p.back() == '/')
-                regex_string.append("^" + translate(p));
-            else
-                regex_string.append("^" + translate(p) + "$");
-        } else {
-            if (p.back() == '/')
-                regex_string.append("/" + translate(p));
-            else
-                regex_string.append("/" + translate(p) + "$");
-        }
+        if (Path::isAbsolute(p))
+            regex_string.push_back('^');
+        else
+            regex_string.push_back('/');
+
+        regex_string.append(translate(p) + "(/|$)");
     }
 
     if (regex_string.empty())
-        regex_string = "^$";
+        return;
 
     if (mode == Mode::icase)
         mRegex = std::regex(regex_string, std::regex_constants::extended | std::regex_constants::icase);

lib/pathmatch.h

@@ -31,32 +31,25 @@
 
 /**
  *  Path matching rules:
+ *  - All rules are simplified first (path separators vary by platform):
+ *    - '/./' => '/'
+ *    - '/dir/../' => '/'
+ *    - '//' => '/'
+ *    - Trailing slashes are removed
+ *  - Rules can contain globs:
+ *    - '**' matches any number of characters including path separators.
+ *    - '*' matches any number of characters except path separators.
+ *    - '?' matches any single character except path separators.
  *  - If a rule looks like an absolute path (e.g. starts with '/', but varies by platform):
- *    - The rule will be simplified (path separators vary by platform):
- *      - '/./' => '/'
- *      - '/dir/../' => '/'
- *      - '//' => '/'
- *    - If the rule ends with a path separator, match all files where the rule matches the start of the file's
- *      simplified absolute path. Globs are allowed in the rule.
- *    - Otherwise, match all files where the rule matches the file's simplified absolute path.
- *      Globs are allowed in the rule.
+ *    - Match all files where the rule matches the start of the file's simplified absolute path up until a path
+ *      separator or the end of the pathname.
  *  - If a rule starts with '.':
  *    - The rule is interpreted as a path relative to `basepath` and then converted to an absolute path and
  *      treated as such according to the above procedure. If the rule is relative to some other directory, it should
  *      be modified to be relative to `basepath` first (this should be done with rules in project files, for example).
  *  - Otherwise:
- *    - No simplification is done to the rule.
- *    - If the rule ends with a path separator:
- *      - Match all files where the rule matches any part of the file's simplified absolute path, and the matching
- *        part directly follows a path separator. Globs are allowed in the rule.
- *    - Otherwise:
- *      - Match all files where the rule matches the end of the file's simplified absolute path, and the matching
- *        part directly follows a path separator. Globs are allowed in the rule.
- *
- * - Glob rules:
- *   - '**' matches any number of characters including path separators.
- *   - '*' matches any number of characters except path separators.
- *   - '?' matches any single character except path separators.
+ *    - Match all files where the rule matches any part of the file's simplified absolute path up until a
+ *      path separator or the end of the pathname, and the matching part directly follows a path separator.
  **/
 
 /**

test/cli/other_test.py

@@ -2478,7 +2478,6 @@ def test_addon_suppr_cli_line(tmp_path):
     __test_addon_suppr(tmp_path, ['--suppress=misra-c2012-2.3:*:3'])
 
 
-@pytest.mark.xfail(strict=True)  # #13437 - TODO: suppression needs to match the whole input path
 def test_addon_suppr_cli_file_line(tmp_path):
     __test_addon_suppr(tmp_path, ['--suppress=misra-c2012-2.3:test.c:3'])
 

test/testcmdlineparser.cpp

@@ -3345,7 +3345,7 @@ class TestCmdlineParser : public TestFixture {
         const char * const argv[] = {"cppcheck", "-isrc\\file.cpp", "src/file.cpp"};
         ASSERT(!fillSettingsFromArgs(argv));
         ASSERT_EQUALS(1, parser->getIgnoredPaths().size());
-        ASSERT_EQUALS("src/file.cpp", parser->getIgnoredPaths()[0]);
+        ASSERT_EQUALS("src\\file.cpp", parser->getIgnoredPaths()[0]);
         ASSERT_EQUALS(1, parser->getPathNames().size());
         ASSERT_EQUALS("src/file.cpp", parser->getPathNames()[0]);
         ASSERT_EQUALS("cppcheck: error: could not find or open any of the paths given.\ncppcheck: Maybe all paths were ignored?\n", logger->str());
@@ -3367,7 +3367,7 @@ class TestCmdlineParser : public TestFixture {
         const char * const argv[] = {"cppcheck", "-isrc\\", "src\\file.cpp"};
         ASSERT(!fillSettingsFromArgs(argv));
         ASSERT_EQUALS(1, parser->getIgnoredPaths().size());
-        ASSERT_EQUALS("src/", parser->getIgnoredPaths()[0]);
+        ASSERT_EQUALS("src\\", parser->getIgnoredPaths()[0]);
         ASSERT_EQUALS(1, parser->getPathNames().size());
         ASSERT_EQUALS("src/file.cpp", parser->getPathNames()[0]);
         ASSERT_EQUALS("cppcheck: error: could not find or open any of the paths given.\ncppcheck: Maybe all paths were ignored?\n", logger->str());

test/testpathmatch.cpp

@@ -156,7 +156,7 @@ class TestPathMatch : public TestFixture {
     }
 
     void onemaskcwd() const {
-        ASSERT(!srcMatcher.match("./src"));
+        ASSERT(srcMatcher.match("./src"));
     }
 
     void twomasklongerpath1() const {
@@ -229,9 +229,9 @@ class TestPathMatch : public TestFixture {
         PathMatch match({"test?.cpp"});
         ASSERT(match.match("test1.cpp"));
         ASSERT(match.match("src/test1.cpp"));
+        ASSERT(match.match("test1.cpp/src"));
         ASSERT(!match.match("test1.c"));
         ASSERT(!match.match("test.cpp"));
-        ASSERT(!match.match("test1.cpp/src"));
     }
 
     void globstar1() const {