diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-06-05 20:04:47 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2015-06-05 20:04:47 +0000 |
| commit | 9dd6b7799a0b04034f2d2266845c64a309b015a3 (patch) | |
| tree | 0ddf22dfc3d7d7f5b5aab3b6fe830d41075b9067 /include | |
| parent | a330baa05bf827b67a6391721fa3ab2f72f1f4dc (diff) | |
| download | glibc-9dd6b7799a0b04034f2d2266845c64a309b015a3.zip glibc-9dd6b7799a0b04034f2d2266845c64a309b015a3.tar.gz glibc-9dd6b7799a0b04034f2d2266845c64a309b015a3.tar.bz2 | |
Fix regex wctype namespace (bug 18495).
regcomp brings in references to various wctype functions that aren't
in all the standards including regcomp. This patch fixes this in the
usual way by using the __* versions of these functions (which already
exist, but some didn't have libc_hidden_proto / libc_hidden_def
before).
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch). (Other wide character
function references from the regex code mean that this patch by itself
doesn't fix any XFAILed linknamespace test failures; further patches
will be needed for that.)
[BZ #18495]
* wctype/wcfuncs.c (__iswalnum): Use libc_hidden_def.
(__iswlower): Likewise.
* include/wctype.h (__iswalnum): Declare. Use libc_hidden_proto.
(__iswlower): Likewise.
* posix/regcomp.c (re_compile_fastmap_iter): Call __towlower
instead of towlower.
* posix/regex_internal.c (build_wcs_upper_buffer): Call __iswlower
instead of iswlower. Call __towupper instead of towupper.
* posix/regex_internal.h (IS_WIDE_WORD_CHAR): Call __iswalnum
instead of iswalnum.
Diffstat (limited to 'include')
| -rw-r--r-- | include/wctype.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/wctype.h b/include/wctype.h index 88c78e6..a71b103 100644 --- a/include/wctype.h +++ b/include/wctype.h @@ -46,11 +46,13 @@ extern wctype_t __wctype (const char *__property); extern wctrans_t __wctrans (const char *__property); extern wint_t __towctrans (wint_t __wc, wctrans_t __desc); +extern __typeof (iswalnum) __iswalnum __THROW __attribute_pure__; extern __typeof (iswalnum_l) __iswalnum_l; extern __typeof (iswalpha_l) __iswalpha_l; extern __typeof (iswblank_l) __iswblank_l; extern __typeof (iswcntrl_l) __iswcntrl_l; extern __typeof (iswdigit_l) __iswdigit_l; +extern __typeof (iswlower) __iswlower __THROW __attribute_pure__; extern __typeof (iswlower_l) __iswlower_l; extern __typeof (iswgraph_l) __iswgraph_l; extern __typeof (iswprint_l) __iswprint_l; @@ -65,11 +67,13 @@ extern __typeof (towupper) __towupper __THROW __attribute_pure__; libc_hidden_proto (__towctrans) libc_hidden_proto (__iswctype) +libc_hidden_proto (__iswalnum) libc_hidden_proto (__iswalnum_l) libc_hidden_proto (__iswalpha_l) libc_hidden_proto (__iswblank_l) libc_hidden_proto (__iswcntrl_l) libc_hidden_proto (__iswdigit_l) +libc_hidden_proto (__iswlower) libc_hidden_proto (__iswlower_l) libc_hidden_proto (__iswgraph_l) libc_hidden_proto (__iswprint_l) |