libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Cygwin: glob: perform ignore_case_with_glob on input" 

This reverts commit a51147467e.

Dumb thinko on my part.  What was supposed to be an optimization
actually broke caseinsensitive globbing in that the entire input
of globbed expressions were downcased.

Drop the unused CCHAR() macro nevertheless.

Fixes: a51147467e ("Cygwin: glob: perform ignore_case_with_glob on input")
Reported-by: Michael Goldshteyn <mgold10000@gmail.com>
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2024-03-18 10:50:30 +01:00
parent 176b19fbe5
commit 89afbb8d8a
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
winsup/cygwin/glob.cc
View File

@ -96,8 +96,6 @@ __FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.28 2010/05/12 17:44:00 gordon Ex
#ifdef __CYGWIN__
#define Cchar(c) (ignore_case_with_glob ? towlower (c) : (c))
#else
#define Cchar(c) (c)
#endif
#undef MAXPATHLEN
@ -123,7 +121,6 @@ __FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.28 2010/05/12 17:44:00 gordon Ex
#define SLASH '/'
#define COMMA ','
#undef DEBUG /* never define */
#ifndef DEBUG
#define M_QUOTE 0x40000000U
@ -251,7 +248,7 @@ glob(const char *__restrict pattern, int flags, int (*errfunc)(const char *, int
return (GLOB_NOMATCH);
else if (clen == 0)
break;
*bufnext++ = Cchar(wc);
*bufnext++ = wc;
patnext += clen;
}
} else {
@ -271,7 +268,7 @@ glob(const char *__restrict pattern, int flags, int (*errfunc)(const char *, int
return (GLOB_NOMATCH);
else if (clen == 0)
break;
*bufnext++ = Cchar(wc) | prot;
*bufnext++ = wc | prot;
patnext += clen;
}
}
@ -772,19 +769,6 @@ glob3(Char *pathbuf, Char *pathend, Char *pathend_last,
break;
sc += clen;
}
#ifdef __CYGWIN__
if (ignore_case_with_glob) {
wint_t lower_path[MAXPATHLEN];
wint_t *lp = lower_path, *sp = pathend;
while ((*lp++ = towlower(*sp++)))
;
if (!match(lower_path, pattern, restpattern)) {
*pathend = EOS;
continue;
}
} else
#endif
if (!match(pathend, pattern, restpattern)) {
*pathend = EOS;
continue;
@ -938,7 +922,7 @@ match(Char *name, Char *pat, Char *patend)
return(0);
break;
default:
if (*name++ != *c)
if (Cchar(*name++) != Cchar(*c))
return(0);
break;
}

4
winsup/cygwin/release/3.5.2
View File

@ -20,3 +20,7 @@ Fixes:
- Don't skip inadvertently some local SAM accounts on domain member
machines.
- Revert ill-advised optimization of glob(3) in case of caseinsensitive
globbing.
Addresses: https://cygwin.com/pipermail/cygwin/2024-March/255675.html