diff options
author | Joseph Myers <joseph@codesourcery.com> | 2015-01-05 15:06:57 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2015-01-05 15:06:57 +0000 |
commit | b8986484e47d6c9b3aecbd259dac52b4c9c99e0d (patch) | |
tree | e7114186d221e4388c25b08188cfe50a956c5717 /ctype/ctype-c99.c | |
parent | a287953a45b0759ce08349a299a458c89b7d8276 (diff) |
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.
Diffstat (limited to 'ctype/ctype-c99.c')
-rw-r--r-- | ctype/ctype-c99.c | 26 |
1 files changed, 26 insertions, 0 deletions
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 + <http://www.gnu.org/licenses/>. */ + +#define __NO_CTYPE +#include <ctype.h> + +int +isblank (int c) +{ + return __isctype (c, _ISblank); +} |