mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-20 16:40:54 +00:00
bb4acb522c
fnmatch brings in references to towlower (and thereby towupper), which isn't in all the standards that contain fnmatch, resulting in linknamespace test failures. (This is contrary to glibc conventions, rather than a standards conformance issue, because of the to* reservation.) This patch fixes this in the usual way, making those functions into weak aliases. Tested for x86_64 and x86 (testsuite, and that disassembly of installed shared libraries is unchanged by the patch). This is on top of <https://sourceware.org/ml/libc-alpha/2015-06/msg00019.html>, but the two patches should be independent. (The __attribute_pure__ on the declarations in include/wctype.h comes from GCC's built-in attributes for towlower and towupper, and is needed to get the same code generation for fnmatch before and after the patch. It seems likely there are cases where the declaration of __foo in the internal headers is missing attributes from foo in the public headers, built-in to GCC or both, but I don't know a good way to detect such missing attributes.) [BZ #18469] * wctype/wcfuncs.c (towlower): Rename to __towlower and define as weak alias of __towlower. Use libc_hidden_weak. (towupper): Rename to __towupper and define as weak alias of __towupper. Use libc_hidden_weak. * include/wctype.h (__towlower): Declare. Use libc_hidden_proto. (__towupper): Likewise. * posix/fnmatch.c [HANDLE_MULTIBYTE && _LIBC] (FOLD): Use __towlower instead of towlower.
95 lines
2.7 KiB
C
95 lines
2.7 KiB
C
/* Copyright (C) 1996-2015 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <ctype.h>
|
|
#include <wctype.h>
|
|
#include <locale/localeinfo.h>
|
|
|
|
#include "wchar-lookup.h"
|
|
|
|
/* Provide real-function versions of all the wctype macros. */
|
|
|
|
#define func(name, type) \
|
|
extern int __isw##name (wint_t __wc); \
|
|
int \
|
|
__isw##name (wint_t wc) \
|
|
{ \
|
|
if (isascii (wc)) \
|
|
return is##name ((int) wc); \
|
|
size_t i = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_CLASS_OFFSET) + type; \
|
|
const char *desc = _NL_CURRENT (LC_CTYPE, i); \
|
|
return wctype_table_lookup (desc, wc); \
|
|
} \
|
|
weak_alias (__isw##name, isw##name)
|
|
|
|
#undef iswalnum
|
|
func (alnum, __ISwalnum)
|
|
libc_hidden_weak (iswalnum)
|
|
#undef iswalpha
|
|
func (alpha, __ISwalpha)
|
|
libc_hidden_weak (iswalpha)
|
|
#undef iswblank
|
|
func (blank, __ISwblank)
|
|
#undef iswcntrl
|
|
func (cntrl, __ISwcntrl)
|
|
#undef iswdigit
|
|
func (digit, __ISwdigit)
|
|
libc_hidden_weak (iswdigit)
|
|
#undef iswlower
|
|
func (lower, __ISwlower)
|
|
libc_hidden_weak (iswlower)
|
|
#undef iswgraph
|
|
func (graph, __ISwgraph)
|
|
#undef iswprint
|
|
func (print, __ISwprint)
|
|
#undef iswpunct
|
|
func (punct, __ISwpunct)
|
|
#undef iswspace
|
|
func (space, __ISwspace)
|
|
libc_hidden_weak (iswspace)
|
|
#undef iswupper
|
|
func (upper, __ISwupper)
|
|
#undef iswxdigit
|
|
func (xdigit, __ISwxdigit)
|
|
libc_hidden_weak (iswxdigit)
|
|
|
|
#undef towlower
|
|
wint_t
|
|
__towlower (wc)
|
|
wint_t wc;
|
|
{
|
|
size_t i = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MAP_OFFSET) + __TOW_tolower;
|
|
const char *desc = _NL_CURRENT (LC_CTYPE, i);
|
|
return wctrans_table_lookup (desc, wc);
|
|
}
|
|
libc_hidden_def (__towlower)
|
|
weak_alias (__towlower, towlower)
|
|
libc_hidden_weak (towlower)
|
|
|
|
#undef towupper
|
|
wint_t
|
|
__towupper (wc)
|
|
wint_t wc;
|
|
{
|
|
size_t i = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MAP_OFFSET) + __TOW_toupper;
|
|
const char *desc = _NL_CURRENT (LC_CTYPE, i);
|
|
return wctrans_table_lookup (desc, wc);
|
|
}
|
|
libc_hidden_def (__towupper)
|
|
weak_alias (__towupper, towupper)
|
|
libc_hidden_weak (towupper)
|