Commit d45928cc0d969f255337e11edd59b4da6dc4926d
2016-04-18T16:05:12
ignore: move star-star matching closer to it use Instead of threading the state down to the larger loop, let's have the loop where we detect the double star so each of them are easier to read.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59
diff --git a/src/fnmatch.c b/src/fnmatch.c
index ba1964b..33c8a25 100644
--- a/src/fnmatch.c
+++ b/src/fnmatch.c
@@ -69,8 +69,7 @@ p_fnmatchx(const char *pattern, const char *string, int flags, size_t recurs)
if (recurs-- == 0)
return FNM_NORES;
- for (stringstart = string;;) {
- bool match_slash = false;
+ for (stringstart = string;;)
switch (c = *pattern++) {
case EOS:
if ((flags & FNM_LEADING_DIR) && *string == '/')
@@ -103,8 +102,15 @@ p_fnmatchx(const char *pattern, const char *string, int flags, size_t recurs)
return (FNM_NOMATCH);
c = *++pattern;
- flags &= ~FNM_PATHNAME;
- match_slash = true;
+ do {
+ int e = p_fnmatchx(pattern, string, recurs_flags, recurs);
+ if (e != FNM_NOMATCH)
+ return e;
+ string = strchr(string, '/');
+ } while (string++);
+
+ /* If we get here, we didn't find a match */
+ return FNM_NOMATCH;
}
if (*string == '.' && (flags & FNM_PERIOD) &&
@@ -135,17 +141,7 @@ p_fnmatchx(const char *pattern, const char *string, int flags, size_t recurs)
return e;
if (test == '/' && (flags & FNM_PATHNAME))
break;
-
- /* searching for star-star, so we jump over entire dirs */
- if (match_slash) {
- const char *slash;
- if (!(slash = strchr(string, '/')))
- break;
-
- string = slash + 1;
- } else {
- ++string;
- }
+ ++string;
}
return (FNM_NOMATCH);
case '[':
@@ -187,7 +183,6 @@ p_fnmatchx(const char *pattern, const char *string, int flags, size_t recurs)
++string;
break;
}
- }
/* NOTREACHED */
}