dir.c::match_pathname(): adjust patternlen when shifting pattern

peff · gitster · commit 982ac87316a1 · 2013-03-28T21:48:18.000-07:00
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 &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/dir.c b/dir.c
@@ -597,6 +597,7 @@ int match_pathname(const char *pathname, int pathlen,
 	 */
 	if (*pattern == '/') {
 		pattern++;
+		patternlen--;
 		prefix--;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -597,6 +597,7 @@ int match_pathname(const char *pathname, int pathlen,`
`597`	`597`	`*/`
`598`	`598`	`if (*pattern == '/') {`
`599`	`599`	`pattern++;`
	`600`	`+ patternlen--;`
`600`	`601`	`prefix--;`
`601`	`602`	`}`
`602`	`603`