Thread (37 messages) flat view 37 messages, 5 authors, 2016-06-15
STALE3722d

[PATCH 3/6] dir.c::match_pathname(): adjust patternlen when shifting pattern

From: Jeff King <hidden>
Date: 2016-06-15 22:56:33
Subsystem: the rest · Maintainer: Linus Torvalds

If we receive a pattern that starts with "/", we shift it
forward to avoid looking at the "/" part. Since the prefix
and patternlen parameters are counts of what is in the
pattern, we must decrement them as we increment the pointer.

We remembered to handle prefix, but not patternlen. This
didn't cause any bugs, though, because the patternlen
parameter is not actually used. Since it will be used in
future patches, let's correct this oversight.

Signed-off-by: Jeff King <redacted>
---
New in this iteration.

 dir.c | 1 +
 1 file changed, 1 insertion(+)
diff --git a/dir.c b/dir.c
index fac82c1..cc4ce8b 100644
--- a/dir.c
+++ b/dir.c
@@ -597,6 +597,7 @@ int match_pathname(const char *pathname, int pathlen,
 	 */
 	if (*pattern == '/') {
 		pattern++;
+		patternlen--;
 		prefix--;
 	}
 
-- 
1.8.2.13.g0f18d3c
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help