Fix isblank / isascii / toascii namespace (bug 17635)

[Joseph Myers <joseph at codesourcery dot com>]

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).

2014-12-19  Joseph Myers  <joseph@codesourcery.com>

	[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.

diff --git a/conform/Makefile b/conform/Makefile
index 5e6ac09..134a297 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
@@ -405,7 +400,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/fcntl.h/linknamespace = yes
 test-xfail-POSIX2008/grp.h/linknamespace = yes
diff --git a/ctype/Makefile b/ctype/Makefile
index 8a41f9c..892399f 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 0000000..e457e18
--- /dev/null
+++ b/ctype/ctype-c99.c
@@ -0,0 +1,26 @@
+/* External function version of isblank.
+   Copyright (C) 1991-2014 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>
+
+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 0000000..894301c
--- /dev/null
+++ b/ctype/ctype-c99_l.c
@@ -0,0 +1,27 @@
+/* External function version of isblank_l.
+   Copyright (C) 1991-2014 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>
+
+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 489fd44..90368a3 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)

-- 
Joseph S. Myers
joseph@codesourcery.com