[PATCH v2 1/2] match_pathname(): reorder prefix-match check
- From
Jeff King <peff@peff.net>
- Date
- Oct 26, 2025, 15:41 UTC
- Message-ID
- <20251026154146.GA2728835@coredump.intra.peff.net>
- In-Reply-To
- <20251026154036.GA2173430@coredump.intra.peff.net>
As an optimization, we use fspathncmp() to match a prefix of the pattern that does not contain any wildcards, and then pass the remainder to fnmatch(). If it has matched the whole thing, we can return early.
Let's shift this early-return check to before we tweak the pattern and name strings. That will gives us more flexibility with that tweaking.
It might also save a few instructions, but I couldn't measure any improvement in doing so (and I wouldn't be surprised if an optimizing compiler could figure that out itself).
Signed-off-by: Jeff King <peff@peff.net> --- dir.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/dir.c b/dir.c index 0a67a99cb3..bbc2bf289d 100644 --- a/dir.c +++ b/dir.c @@ -1360,18 +1360,19 @@ int match_pathname(const char *pathname, int pathlen, if (fspathncmp(pattern, name, prefix)) return 0; - pattern += prefix; - patternlen -= prefix; - name += prefix; - namelen -= prefix; /* * If the whole pattern did not have a wildcard, * then our prefix match is all we need; we * do not need to call fnmatch at all. */ - if (!patternlen && !namelen) + if (patternlen == prefix && namelen == prefix) return 1; + + pattern += prefix; + patternlen -= prefix; + name += prefix; + namelen -= prefix; } return fnmatch_icase_mem(pattern, patternlen,
-- 2.51.1.840.g23b87c0a58