From b8986484e47d6c9b3aecbd259dac52b4c9c99e0d Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Mon, 5 Jan 2015 15:06:57 +0000 Subject: [PATCH] Fix isblank / isascii / toascii namespace (bug 17635). 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. --- ChangeLog | 15 +++++++++++++++ NEWS | 6 +++--- conform/Makefile | 6 ------ ctype/Makefile | 2 +- ctype/ctype-c99.c | 26 ++++++++++++++++++++++++++ ctype/ctype-c99_l.c | 27 +++++++++++++++++++++++++++ ctype/ctype-extn.c | 17 +---------------- 7 files changed, 73 insertions(+), 26 deletions(-) create mode 100644 ctype/ctype-c99.c create mode 100644 ctype/ctype-c99_l.c diff --git a/ChangeLog b/ChangeLog index 01b3832ef3..493e34b2cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,20 @@ 2015-01-05 Joseph Myers + [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. + [BZ #17777] * sysdeps/unix/sysv/linux/wordsize-64/posix_fadvise.c (posix_fadvise64): Define as weak alias not strong alias. diff --git a/NEWS b/NEWS index 56d739ee5d..db8e2c556a 100644 --- a/NEWS +++ b/NEWS @@ -14,9 +14,9 @@ Version 2.21 17344, 17363, 17370, 17371, 17411, 17460, 17475, 17485, 17501, 17506, 17508, 17522, 17555, 17570, 17571, 17572, 17573, 17574, 17581, 17582, 17583, 17584, 17585, 17589, 17594, 17601, 17608, 17616, 17625, 17630, - 17633, 17634, 17647, 17653, 17657, 17664, 17665, 17668, 17682, 17717, - 17719, 17722, 17723, 17724, 17725, 17732, 17733, 17744, 17745, 17746, - 17747, 17775, 17777, 17780, 17781, 17782 + 17633, 17634, 17635, 17647, 17653, 17657, 17664, 17665, 17668, 17682, + 17717, 17719, 17722, 17723, 17724, 17725, 17732, 17733, 17744, 17745, + 17746, 17747, 17775, 17777, 17780, 17781, 17782 * i386 memcpy functions optimized with SSE2 unaligned load/store. diff --git a/conform/Makefile b/conform/Makefile index 0c21c28df3..331590a266 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -345,9 +345,6 @@ test-xfail-XOPEN2K/ndbm.h/linknamespace = yes test-xfail-XOPEN2K8/ndbm.h/linknamespace = yes # Unsorted expected failures. -test-xfail-ISO99/ctype.h/linknamespace = yes -test-xfail-ISO11/ctype.h/linknamespace = yes -test-xfail-XPG3/ctype.h/linknamespace = yes test-xfail-XPG3/fnmatch.h/linknamespace = yes test-xfail-XPG3/glob.h/linknamespace = yes test-xfail-XPG3/regex.h/linknamespace = yes @@ -355,7 +352,6 @@ test-xfail-XPG3/search.h/linknamespace = yes test-xfail-XPG3/stdio.h/linknamespace = yes test-xfail-XPG3/unistd.h/linknamespace = yes test-xfail-XPG3/wordexp.h/linknamespace = yes -test-xfail-XPG4/ctype.h/linknamespace = yes test-xfail-XPG4/fmtmsg.h/linknamespace = yes test-xfail-XPG4/fnmatch.h/linknamespace = yes test-xfail-XPG4/glob.h/linknamespace = yes @@ -375,7 +371,6 @@ test-xfail-POSIX/regex.h/linknamespace = yes test-xfail-POSIX/semaphore.h/linknamespace = yes test-xfail-POSIX/unistd.h/linknamespace = yes test-xfail-POSIX/wordexp.h/linknamespace = yes -test-xfail-UNIX98/ctype.h/linknamespace = yes test-xfail-UNIX98/fmtmsg.h/linknamespace = yes test-xfail-UNIX98/fnmatch.h/linknamespace = yes test-xfail-UNIX98/glob.h/linknamespace = yes @@ -403,7 +398,6 @@ test-xfail-XOPEN2K/syslog.h/linknamespace = yes test-xfail-XOPEN2K/ucontext.h/linknamespace = yes test-xfail-XOPEN2K/unistd.h/linknamespace = yes test-xfail-XOPEN2K/wordexp.h/linknamespace = yes -test-xfail-POSIX2008/ctype.h/linknamespace = yes test-xfail-POSIX2008/dirent.h/linknamespace = yes test-xfail-POSIX2008/grp.h/linknamespace = yes test-xfail-POSIX2008/netdb.h/linknamespace = yes diff --git a/ctype/Makefile b/ctype/Makefile index edca5ccb93..a231b48a41 100644 --- a/ctype/Makefile +++ b/ctype/Makefile @@ -24,7 +24,7 @@ include ../Makeconfig headers := ctype.h -routines := ctype ctype-extn ctype_l isctype +routines := ctype ctype-c99 ctype-extn ctype-c99_l ctype_l isctype aux := ctype-info tests := test_ctype diff --git a/ctype/ctype-c99.c b/ctype/ctype-c99.c new file mode 100644 index 0000000000..2343242c48 --- /dev/null +++ b/ctype/ctype-c99.c @@ -0,0 +1,26 @@ +/* External function version of isblank. + 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 + . */ + +#define __NO_CTYPE +#include + +int +isblank (int c) +{ + return __isctype (c, _ISblank); +} diff --git a/ctype/ctype-c99_l.c b/ctype/ctype-c99_l.c new file mode 100644 index 0000000000..0a2afa9f0c --- /dev/null +++ b/ctype/ctype-c99_l.c @@ -0,0 +1,27 @@ +/* External function version of isblank_l. + 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 + . */ + +#define __NO_CTYPE +#include + +int +__isblank_l (int c, __locale_t l) +{ + return __isctype_l (c, _ISblank, l); +} +weak_alias (__isblank_l, isblank_l) diff --git a/ctype/ctype-extn.c b/ctype/ctype-extn.c index dcc9874894..0073c1a036 100644 --- a/ctype/ctype-extn.c +++ b/ctype/ctype-extn.c @@ -23,14 +23,7 @@ #define __ctype_toupper \ ((int32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TOUPPER) + 128) -/* Real function versions of the non-ANSI ctype functions. isblank is - now in ISO C99 but we leave it here. */ - -int -isblank (int c) -{ - return __isctype (c, _ISblank); -} +/* Real function versions of the non-ANSI ctype functions. */ int _tolower (int c) @@ -56,11 +49,3 @@ isascii (int c) return __isascii (c); } weak_alias (isascii, __isascii_l) - - -int -__isblank_l (int c, __locale_t l) -{ - return __isctype_l (c, _ISblank, l); -} -weak_alias (__isblank_l, isblank_l)