drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cygwin: fnmatch: drop static variable 

fnmatch calls fnmatch1 with a static mbstate_t.  This breaks
calling fnmatch from multiple threads.  Fix it by folding
fnmatch1 into fnmatch and moving all mbstates to local variables.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2023-02-28 16:45:52 +01:00
parent 6e75277b12
commit 0d2ad77c40
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
winsup/cygwin/libc/fnmatch.c
View File

@ -73,22 +73,13 @@ __FBSDID("$FreeBSD: head/lib/libc/gen/fnmatch.c 288309 2015-09-27 12:52:18Z jill
#define RANGE_ERROR (-1) #define RANGE_ERROR (-1)
static int rangematch(const char *, wint_t, int, char **, mbstate_t *); static int rangematch(const char *, wint_t, int, char **, mbstate_t *);
static int fnmatch1(const char *, const char *, const char *, int, mbstate_t,
mbstate_t);
int int
fnmatch(const char *pattern, const char *string, int flags) fnmatch(const char *pattern, const char *string, int flags)
{ {
static const mbstate_t initial; const char *stringstart = string;
return (fnmatch1(pattern, string, string, flags, initial, initial));
}
static int
fnmatch1(const char *pattern, const char *string, const char *stringstart,
int flags, mbstate_t patmbs, mbstate_t strmbs)
{
const char *bt_pattern, *bt_string; const char *bt_pattern, *bt_string;
mbstate_t patmbs, strmbs;
mbstate_t bt_patmbs, bt_strmbs; mbstate_t bt_patmbs, bt_strmbs;
char *newp; char *newp;
char c; char c;