diff options
author | Ulrich Drepper <drepper@redhat.com> | 2009-01-08 00:23:09 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2009-01-08 00:23:09 +0000 |
commit | b3918c7d7f99828d23232d0aaf4056f8fae9898e (patch) | |
tree | 317ef6202dc86daa7a351a045c355407aeb29a7c /posix/regcomp.c | |
parent | df9293cb169bf848be529381ca43680aa192421e (diff) | |
download | glibc-b3918c7d7f99828d23232d0aaf4056f8fae9898e.zip glibc-b3918c7d7f99828d23232d0aaf4056f8fae9898e.tar.gz glibc-b3918c7d7f99828d23232d0aaf4056f8fae9898e.tar.bz2 |
* posix/regcomp.c (re_compile_fastmap_iter): Use __mbrtowc.
* posix/regex_internal.c (build_wcs_buffer, build_wcs_upper_buffer,
re_string_skip_chars, re_string_reconstruct): Likewise.
* posix/regex_internal.h [!_LIBC] (__mbrtowc): New #define.
Diffstat (limited to 'posix/regcomp.c')
-rw-r--r-- | posix/regcomp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/posix/regcomp.c b/posix/regcomp.c index 8ba7668..d5a0535 100644 --- a/posix/regcomp.c +++ b/posix/regcomp.c @@ -327,8 +327,8 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state, && dfa->nodes[node].mb_partial) *p++ = dfa->nodes[node].opr.c; memset (&state, '\0', sizeof (state)); - if (mbrtowc (&wc, (const char *) buf, p - buf, - &state) == p - buf + if (__mbrtowc (&wc, (const char *) buf, p - buf, + &state) == p - buf && (__wcrtomb ((char *) buf, towlower (wc), &state) != (size_t) -1)) re_set_fastmap (fastmap, 0, buf[0]); |