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

Cygwin: glob: perform ignore_case_with_glob on input 

Rather than converting single chars on the fly to lowercase
in case ignore_case_with_glob is set, perform the conversion
on the entire input (pattern and filenames).
This commit is contained in:
Corinna Vinschen 2023-02-22 10:47:54 +01:00
parent f3f20038c4
commit a51147467e
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
winsup/cygwin/glob.cc
View File

@ -95,8 +95,9 @@ __FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.28 2010/05/12 17:44:00 gordon Ex
#include "collate.h" #include "collate.h"
#ifdef __CYGWIN__ #ifdef __CYGWIN__
#define CCHAR(c) (ignore_case_with_glob ? towlower (CHAR (c)) : CHAR (c))
#define Cchar(c) (ignore_case_with_glob ? towlower (c) : (c)) #define Cchar(c) (ignore_case_with_glob ? towlower (c) : (c))
#else
#define Cchar(c) (c)
#endif #endif
#undef MAXPATHLEN #undef MAXPATHLEN
@ -122,6 +123,7 @@ __FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.28 2010/05/12 17:44:00 gordon Ex
#define SLASH '/' #define SLASH '/'
#define COMMA ',' #define COMMA ','
#undef DEBUG /* never define */
#ifndef DEBUG #ifndef DEBUG
#define M_QUOTE 0x40000000U #define M_QUOTE 0x40000000U
@ -252,7 +254,7 @@ glob(const char *__restrict pattern, int flags, int (*errfunc)(const char *, int
return (GLOB_NOMATCH); return (GLOB_NOMATCH);
else if (clen == 0) else if (clen == 0)
break; break;
*bufnext++ = wc; *bufnext++ = Cchar(wc);
patnext += clen; patnext += clen;
} }
} else { } else {
@ -272,7 +274,7 @@ glob(const char *__restrict pattern, int flags, int (*errfunc)(const char *, int
return (GLOB_NOMATCH); return (GLOB_NOMATCH);
else if (clen == 0) else if (clen == 0)
break; break;
*bufnext++ = wc | prot; *bufnext++ = Cchar(wc) | prot;
patnext += clen; patnext += clen;
} }
} }
@ -779,6 +781,19 @@ glob3(Char *pathbuf, Char *pathend, Char *pathend_last,
break; break;
sc += clen; 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)) { if (!match(pathend, pattern, restpattern)) {
*pathend = EOS; *pathend = EOS;
continue; continue;
@ -932,7 +947,7 @@ match(Char *name, Char *pat, Char *patend)
return(0); return(0);
break; break;
default: default:
if (Cchar(*name++) != Cchar(*c)) if (*name++ != *c)
return(0); return(0);
break; break;
} }