d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fnmatch: Fix bad FNM_PERIOD disabling if an asterisk has been seen.

Browse Source 
Example: fnmatch("a*b/*", "abbb/.x", FNM_PATHNAME | FNM_PERIOD)

PR:		116074
MFC after:	1 week
This commit is contained in:
jilles 2010-04-16 22:29:24 +00:00
parent dd4fae15ab
commit bb1d9873c9
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/libc/gen/fnmatch.c
View File

@ -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);

1
tools/regression/lib/libc/gen/test-fnmatch.c
View File

@ -174,6 +174,7 @@ struct testcase {
"*a", ".a/b", FNM_PATHNAME | FNM_LEADING_DIR, 0,
"*", ".a/b", FNM_PATHNAME | FNM_PERIOD | FNM_LEADING_DIR, FNM_NOMATCH,
"*a", ".a/b", FNM_PATHNAME | FNM_PERIOD | FNM_LEADING_DIR, FNM_NOMATCH,
"a*b/*", "abbb/.x", FNM_PATHNAME | FNM_PERIOD, FNM_NOMATCH,
};
static const char *