mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-29 16:21:07 +00:00
b8986484e4
Use of isblank brings in isascii and toascii, but isblank is a C99 function and the other two aren't; similarly, isascii and toascii are UNIX98 functions and bring in isblank, which isn't. (Not a conformance issue because of the is* and to* reservation, but still contrary to glibc practice.) This patch fixes this by splitting isblank out of ctype-extn.c to a separate ctype-c99.c. isblank_l is also moved to a separate file, ctype-c99_l.c (non-XSI POSIX.1-2008 has isblank_l, but isascii / toascii are marked OB XSI). (In principle all these functions could go in separate files - that's optimal for static linking - but they are also all very small, and splitting them all out is not needed to fix the present bug.) Tested for x86_64 (testsuite, and that installed stripped shared libraries are unchanged by the patch - the ordering in which new and existing sources are listed in ctype/Makefile is arranged so functions go in the same order so that this comparison works). [BZ #17635] * ctype/ctype-c99.c: New file. isblank implementation moved from ... * ctype/ctype-extn.c: ... here. (__isblank_l): Move to ... * ctype/ctype-c99_l.c: ... here. New file. * ctype/Makefile (routines): Add ctype-c99 and ctype-c99_l. * conform/Makefile (test-xfail-ISO99/ctype.h/linknamespace): Remove variable. (test-xfail-ISO11/ctype.h/linknamespace): Likewise. (test-xfail-XPG3/ctype.h/linknamespace): Likewise. (test-xfail-XPG4/ctype.h/linknamespace): Likewise. (test-xfail-UNIX98/ctype.h/linknamespace): Likewise. (test-xfail-POSIX2008/ctype.h/linknamespace): Likewise.
52 lines
1.3 KiB
C
52 lines
1.3 KiB
C
/* Copyright (C) 1991-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/>. */
|
|
|
|
#define __NO_CTYPE
|
|
#include <ctype.h>
|
|
|
|
#define __ctype_tolower \
|
|
((int32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TOLOWER) + 128)
|
|
#define __ctype_toupper \
|
|
((int32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TOUPPER) + 128)
|
|
|
|
/* Real function versions of the non-ANSI ctype functions. */
|
|
|
|
int
|
|
_tolower (int c)
|
|
{
|
|
return __ctype_tolower[c];
|
|
}
|
|
int
|
|
_toupper (int c)
|
|
{
|
|
return __ctype_toupper[c];
|
|
}
|
|
|
|
int
|
|
toascii (int c)
|
|
{
|
|
return __toascii (c);
|
|
}
|
|
weak_alias (toascii, __toascii_l)
|
|
|
|
int
|
|
isascii (int c)
|
|
{
|
|
return __isascii (c);
|
|
}
|
|
weak_alias (isascii, __isascii_l)
|