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. --- conform/Makefile | 6 ------ 1 file changed, 6 deletions(-) (limited to 'conform/Makefile') 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 -- cgit 1.4.1