From b8986484e47d6c9b3aecbd259dac52b4c9c99e0d Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Mon, 5 Jan 2015 15:06:57 +0000 Subject: 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. --- NEWS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'NEWS') 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. -- cgit 1.4.1