undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wildmatch: fix "**" special case

Browse Source 
"**" is adjusted to only be effective when surrounded by slashes, in
40bbee0 (wildmatch: adjust "**" behavior - 2012-10-15). Except that
the commit did it wrong:

1. when it checks for "the preceding slash unless ** is at the
   beginning", it compares to wrong pointer. It should have compared
   to the beginning of the pattern, not the text.

2. prev_p points to the character before "**", not the first "*". The
   correct comparison must be "prev_p < pattern" or
   "prev_p + 1 == pattern", not "prev_p == pattern".

3. The pattern must be surrounded by slashes unless it's at the
   beginning or the end of the pattern. We do two checks: one for the
   preceding slash and one the trailing slash. Both checks must be
   met. The use of "||" is wrong.

This patch fixes all above.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2013-01-01 09:44:02 +07:00 committed by Junio C Hamano
parent d5d80e12bd
commit 3a078dec33
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t3070-wildmatch.sh
View File

@ -83,7 +83,7 @@ match 0 0 'deep/foo/bar/baz/' '**/bar/*'
match 1 0 'deep/foo/bar/baz/' '**/bar/**' match 1 0 'deep/foo/bar/baz/' '**/bar/**'
match 0 0 'deep/foo/bar' '**/bar/*' match 0 0 'deep/foo/bar' '**/bar/*'
match 1 0 'deep/foo/bar/' '**/bar/**' match 1 0 'deep/foo/bar/' '**/bar/**'
match 1 0 'foo/bar/baz' '**/bar**' match 0 0 'foo/bar/baz' '**/bar**'
match 1 0 'foo/bar/baz/x' '*/bar/**' match 1 0 'foo/bar/baz/x' '*/bar/**'
match 0 0 'deep/foo/bar/baz/x' '*/bar/**' match 0 0 'deep/foo/bar/baz/x' '*/bar/**'
match 1 0 'deep/foo/bar/baz/x' '**/bar/*/*' match 1 0 'deep/foo/bar/baz/x' '**/bar/*/*'

3
wildmatch.c
View File

@ -58,6 +58,7 @@ typedef unsigned char uchar;
static int dowild(const uchar *p, const uchar *text, int force_lower_case) static int dowild(const uchar *p, const uchar *text, int force_lower_case)
{ {
uchar p_ch; uchar p_ch;
const uchar *pattern = p;
for ( ; (p_ch = *p) != '\0'; text++, p++) { for ( ; (p_ch = *p) != '\0'; text++, p++) {
int matched, special; int matched, special;
@ -87,7 +88,7 @@ static int dowild(const uchar *p, const uchar *text, int force_lower_case)
if (*++p == '*') { if (*++p == '*') {
const uchar *prev_p = p - 2; const uchar *prev_p = p - 2;
while (*++p == '*') {} while (*++p == '*') {}
if ((prev_p == text || *prev_p == '/') || if ((prev_p < pattern || *prev_p == '/') &&
(*p == '\0' || *p == '/' || (*p == '\0' || *p == '/' ||
(p[0] == '\\' && p[1] == '/'))) { (p[0] == '\\' && p[1] == '/'))) {
/* /*