public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin/main] Cygwin: fnmatch: handle named character classes
@ 2023-02-14 19:29 Corinna Vinschen
0 siblings, 0 replies; only message in thread
From: Corinna Vinschen @ 2023-02-14 19:29 UTC (permalink / raw)
To: cygwin-cvs
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=7faa6465531637d76e3c0733a4d2608bf7b3a54a
commit 7faa6465531637d76e3c0733a4d2608bf7b3a54a
Author: Corinna Vinschen <corinna@vinschen.de>
AuthorDate: Tue Feb 14 20:22:54 2023 +0100
Commit: Corinna Vinschen <corinna@vinschen.de>
CommitDate: Tue Feb 14 20:22:54 2023 +0100
Cygwin: fnmatch: handle named character classes
Handle [:<character-class>:] expressions in range brackets.
TODO: Collating symbols [.<collsym>'.] and Equivalence class
expressions [=<equiv-class>=] are recognized but skipped as if
they are not present at all.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diff:
---
winsup/cygwin/libc/fnmatch.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/winsup/cygwin/libc/fnmatch.c b/winsup/cygwin/libc/fnmatch.c
index 06732426b9c4..9829904f0812 100644
--- a/winsup/cygwin/libc/fnmatch.c
+++ b/winsup/cygwin/libc/fnmatch.c
@@ -274,6 +274,29 @@ rangematch(const char *pattern, wint_t test, int flags, char **newp,
return (RANGE_NOMATCH);
} else if (*pattern == '\\' && !(flags & FNM_NOESCAPE))
pattern++;
+ if (*pattern == '[' && (pattern[1] == ':' || pattern[1] == '.'
+ || pattern[1] == '=')) {
+ const char ctype = *++pattern;
+ const char *class_p = ++pattern;
+
+ while (*pattern
+ && (*pattern != ctype || pattern[1] != ']'))
+ ++pattern;
+ if (!*pattern)
+ return (RANGE_ERROR);
+ if (ctype == ':') {
+ size_t clen = pattern - class_p;
+ char class[clen + 1];
+
+ *stpncpy (class, class_p, clen) = '\0';
+ if (iswctype (test, wctype (class)))
+ ok = 1;
+ }
+ pattern += 2;
+ /* TODO: [. and [= are just ignored for now */
+ continue;
+
+ }
pclen = mbrtowi(&c, pattern, MB_LEN_MAX, patmbs);
if (pclen == (size_t)-1 || pclen == (size_t)-2)
return (RANGE_NOMATCH);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-02-14 19:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-14 19:29 [newlib-cygwin/main] Cygwin: fnmatch: handle named character classes Corinna Vinschen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).