diff options
| author | jilles <jilles@FreeBSD.org> | 2010-04-23 18:01:19 +0000 |
|---|---|---|
| committer | jilles <jilles@FreeBSD.org> | 2010-04-23 18:01:19 +0000 |
| commit | 62840af138e26bcfd4e5b81e04a67f22560448d2 (patch) | |
| tree | 18fc41c976b3a978654070c481e31d1ee68f4c5e /lib | |
| parent | 827dc8fc54a62bcfc03457dc475be8334af3af46 (diff) | |
| download | FreeBSD-src-62840af138e26bcfd4e5b81e04a67f22560448d2.zip FreeBSD-src-62840af138e26bcfd4e5b81e04a67f22560448d2.tar.gz | |
MFC r206711: fnmatch: Fix bad FNM_PERIOD disabling
if an asterisk has been seen.
Example: fnmatch("a*b/*", "abbb/.x", FNM_PATHNAME | FNM_PERIOD)
PR: 116074
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/gen/fnmatch.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/libc/gen/fnmatch.c b/lib/libc/gen/fnmatch.c index e697bdc..3acbc3b 100644 --- a/lib/libc/gen/fnmatch.c +++ b/lib/libc/gen/fnmatch.c @@ -67,7 +67,8 @@ __FBSDID("$FreeBSD$"); #define RANGE_ERROR (-1) static int rangematch(const char *, wchar_t, int, char **, mbstate_t *); -static int fnmatch1(const char *, const char *, int, mbstate_t, mbstate_t); +static int fnmatch1(const char *, const char *, const char *, int, mbstate_t, + mbstate_t); int fnmatch(pattern, string, flags) @@ -76,22 +77,21 @@ fnmatch(pattern, string, flags) { static const mbstate_t initial; - return (fnmatch1(pattern, string, flags, initial, initial)); + return (fnmatch1(pattern, string, string, flags, initial, initial)); } static int -fnmatch1(pattern, string, flags, patmbs, strmbs) - const char *pattern, *string; +fnmatch1(pattern, string, stringstart, flags, patmbs, strmbs) + const char *pattern, *string, *stringstart; int flags; mbstate_t patmbs, strmbs; { - const char *stringstart; char *newp; char c; wchar_t pc, sc; size_t pclen, sclen; - for (stringstart = string;;) { + for (;;) { pclen = mbrtowc(&pc, pattern, MB_LEN_MAX, &patmbs); if (pclen == (size_t)-1 || pclen == (size_t)-2) return (FNM_NOMATCH); @@ -145,8 +145,8 @@ fnmatch1(pattern, string, flags, patmbs, strmbs) /* General case, use recursion. */ while (sc != EOS) { - if (!fnmatch1(pattern, string, - flags & ~FNM_PERIOD, patmbs, strmbs)) + if (!fnmatch1(pattern, string, stringstart, + flags, patmbs, strmbs)) return (0); sclen = mbrtowc(&sc, string, MB_LEN_MAX, &strmbs); |
