2022-01-01 18:54:23 +00:00
|
|
|
/* Copyright (C) 1996-2022 Free Software Foundation, Inc.
|
Remove __need macros from stdio.h and wchar.h.
wint_t is a little finicky because it might be defined by stddef.h, which
belongs to the compiler.
In addition to the _types_, a bunch of other declarations shared between
wctype.h and wchar.h are factored out to their own header.
* libio/bits/types/FILE.h, libio/bits/types/__FILE.h
* wcsmbs/bits/types/mbstate_t.h, wcsmbs/bits/types/__mbstate_t.h
* wcsmbs/bits/types/wint_t.h: New single-type definition files.
* wctype/bits/wctype-wchar.h: New file holding declarations shared
between wctype.h and wchar.h.
* libio/Makefile, wcsmbs/Makefile, wctype/Makefile:
Install them.
* include/bits/types/FILE.h, include/bits/types/__FILE.h
* include/bits/types/mbstate_t.h, include/bits/types/__mbstate_t.h
* include/bits/types/wint_t.h, include/bits/wcsmbs-wchar.h:
New wrappers.
* include/stdio.h, include/wchar.h, include/wctype.h:
No need to handle __need macros.
* grp/grp.h, gshadow/gshadow.h, hurd/hurd.h, iconv/gconv.h
* libio/stdio.h, mach/mach.h, misc/mntent.h, pwd/pwd.h
* shadow/shadow.h, stdio-common/printf.h, wcsmbs/uchar.h
* wcsmbs/wchar.h, wctype/wctype.h
* sysdeps/generic/_G_config.h, sysdeps/unix/sysv/linux/_G_config.h
Use the new files instead of __need macros.
2016-11-21 04:00:02 +00:00
|
|
|
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
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
<https://www.gnu.org/licenses/>. */
|
Remove __need macros from stdio.h and wchar.h.
wint_t is a little finicky because it might be defined by stddef.h, which
belongs to the compiler.
In addition to the _types_, a bunch of other declarations shared between
wctype.h and wchar.h are factored out to their own header.
* libio/bits/types/FILE.h, libio/bits/types/__FILE.h
* wcsmbs/bits/types/mbstate_t.h, wcsmbs/bits/types/__mbstate_t.h
* wcsmbs/bits/types/wint_t.h: New single-type definition files.
* wctype/bits/wctype-wchar.h: New file holding declarations shared
between wctype.h and wchar.h.
* libio/Makefile, wcsmbs/Makefile, wctype/Makefile:
Install them.
* include/bits/types/FILE.h, include/bits/types/__FILE.h
* include/bits/types/mbstate_t.h, include/bits/types/__mbstate_t.h
* include/bits/types/wint_t.h, include/bits/wcsmbs-wchar.h:
New wrappers.
* include/stdio.h, include/wchar.h, include/wctype.h:
No need to handle __need macros.
* grp/grp.h, gshadow/gshadow.h, hurd/hurd.h, iconv/gconv.h
* libio/stdio.h, mach/mach.h, misc/mntent.h, pwd/pwd.h
* shadow/shadow.h, stdio-common/printf.h, wcsmbs/uchar.h
* wcsmbs/wchar.h, wctype/wctype.h
* sysdeps/generic/_G_config.h, sysdeps/unix/sysv/linux/_G_config.h
Use the new files instead of __need macros.
2016-11-21 04:00:02 +00:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* ISO C99 Standard: 7.25
|
|
|
|
|
* Wide character classification and mapping utilities <wctype.h>
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifndef _BITS_WCTYPE_WCHAR_H
|
|
|
|
|
#define _BITS_WCTYPE_WCHAR_H 1
|
|
|
|
|
|
|
|
|
|
#if !defined _WCTYPE_H && !defined _WCHAR_H
|
|
|
|
|
#error "Never include <bits/wctype-wchar.h> directly; include <wctype.h> or <wchar.h> instead."
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#include <bits/types.h>
|
|
|
|
|
#include <bits/types/wint_t.h>
|
|
|
|
|
|
|
|
|
|
/* The definitions in this header are specified to appear in <wctype.h>
|
|
|
|
|
in ISO C99, but in <wchar.h> in Unix98. _GNU_SOURCE follows C99. */
|
|
|
|
|
|
|
|
|
|
/* Scalar type that can hold values which represent locale-specific
|
|
|
|
|
character classifications. */
|
|
|
|
|
typedef unsigned long int wctype_t;
|
|
|
|
|
|
|
|
|
|
# ifndef _ISwbit
|
|
|
|
|
/* The characteristics are stored always in network byte order (big
|
|
|
|
|
endian). We define the bit value interpretations here dependent on the
|
|
|
|
|
machine's byte order. */
|
|
|
|
|
|
Split up endian.h to minimize exposure of BYTE_ORDER.
With only two exceptions (sys/types.h and sys/param.h, both of which
historically might have defined BYTE_ORDER) the public headers that
include <endian.h> only want to be able to test __BYTE_ORDER against
__*_ENDIAN.
This patch creates a new bits/endian.h that can be included by any
header that wants to be able to test __BYTE_ORDER and/or
__FLOAT_WORD_ORDER against the __*_ENDIAN constants, or needs
__LONG_LONG_PAIR. It only defines macros in the implementation
namespace.
The existing bits/endian.h (which could not be included independently
of endian.h, and only defines __BYTE_ORDER and maybe __FLOAT_WORD_ORDER)
is renamed to bits/endianness.h. I also took the opportunity to
canonicalize the form of this header, which we are stuck with having
one copy of per architecture. Since they are so short, this means git
doesn’t understand that they were renamed from existing headers, sigh.
endian.h itself is a nonstandard header and its only remaining use
from a standard header is guarded by __USE_MISC, so I dropped the
__USE_MISC conditionals from around all of the public-namespace things
it defines. (This means, an application that requests strict library
conformance but includes endian.h will still see the definition of
BYTE_ORDER.)
A few changes to specific bits/endian(ness).h variants deserve
mention:
- sysdeps/unix/sysv/linux/ia64/bits/endian.h is moved to
sysdeps/ia64/bits/endianness.h. If I remember correctly, ia64 did
have selectable endianness, but we have assembly code in
sysdeps/ia64 that assumes it’s little-endian, so there is no reason
to treat the ia64 endianness.h as linux-specific.
- The C-SKY port does not fully support big-endian mode, the compile
will error out if __CSKYBE__ is defined.
- The PowerPC port had extra logic in its bits/endian.h to detect a
broken compiler, which strikes me as unnecessary, so I removed it.
- The only files that defined __FLOAT_WORD_ORDER always defined it to
the same value as __BYTE_ORDER, so I removed those definitions.
The SH bits/endian(ness).h had comments inconsistent with the
actual setting of __FLOAT_WORD_ORDER, which I also removed.
- I *removed* copyright boilerplate from the few bits/endian(ness).h
headers that had it; these files record a single fact in a fashion
dictated by an external spec, so I do not think they are copyrightable.
As long as I was changing every copy of ieee754.h in the tree, I
noticed that only the MIPS variant includes float.h, because it uses
LDBL_MANT_DIG to decide among three different versions of
ieee854_long_double. This patch makes it not include float.h when
GCC’s intrinsic __LDBL_MANT_DIG__ is available.
* string/endian.h: Unconditionally define LITTLE_ENDIAN,
BIG_ENDIAN, PDP_ENDIAN, and BYTE_ORDER. Condition byteswapping
macros only on !__ASSEMBLER__. Move the definitions of
__BIG_ENDIAN, __LITTLE_ENDIAN, __PDP_ENDIAN, __FLOAT_WORD_ORDER,
and __LONG_LONG_PAIR to...
* string/bits/endian.h: ...this new file, which includes
the renamed header bits/endianness.h for the definition of
__BYTE_ORDER and possibly __FLOAT_WORD_ORDER.
* string/Makefile: Install bits/endianness.h.
* include/bits/endian.h: New wrapper.
* bits/endian.h: Rename to bits/endianness.h.
Add multiple-include guard. Rewrite the comment explaining what
the machine-specific variants of this file should do.
* sysdeps/unix/sysv/linux/ia64/bits/endian.h:
Move to sysdeps/ia64.
* sysdeps/aarch64/bits/endian.h
* sysdeps/alpha/bits/endian.h
* sysdeps/arm/bits/endian.h
* sysdeps/csky/bits/endian.h
* sysdeps/hppa/bits/endian.h
* sysdeps/ia64/bits/endian.h
* sysdeps/m68k/bits/endian.h
* sysdeps/microblaze/bits/endian.h
* sysdeps/mips/bits/endian.h
* sysdeps/nios2/bits/endian.h
* sysdeps/powerpc/bits/endian.h
* sysdeps/riscv/bits/endian.h
* sysdeps/s390/bits/endian.h
* sysdeps/sh/bits/endian.h
* sysdeps/sparc/bits/endian.h
* sysdeps/x86/bits/endian.h:
Rename to endianness.h; canonicalize form of file; remove
redundant definitions of __FLOAT_WORD_ORDER.
* sysdeps/powerpc/bits/endianness.h: Remove logic to check for
broken compilers.
* ctype/ctype.h
* sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h
* sysdeps/arm/nptl/bits/pthreadtypes-arch.h
* sysdeps/csky/nptl/bits/pthreadtypes-arch.h
* sysdeps/ia64/ieee754.h
* sysdeps/ieee754/ieee754.h
* sysdeps/ieee754/ldbl-128/ieee754.h
* sysdeps/ieee754/ldbl-128ibm/ieee754.h
* sysdeps/m68k/nptl/bits/pthreadtypes-arch.h
* sysdeps/microblaze/nptl/bits/pthreadtypes-arch.h
* sysdeps/mips/ieee754/ieee754.h
* sysdeps/mips/nptl/bits/pthreadtypes-arch.h
* sysdeps/nios2/nptl/bits/pthreadtypes-arch.h
* sysdeps/nptl/pthread.h
* sysdeps/riscv/nptl/bits/pthreadtypes-arch.h
* sysdeps/sh/nptl/bits/pthreadtypes-arch.h
* sysdeps/sparc/sparc32/ieee754.h
* sysdeps/unix/sysv/linux/generic/bits/stat.h
* sysdeps/unix/sysv/linux/generic/bits/statfs.h
* sysdeps/unix/sysv/linux/sys/acct.h
* wctype/bits/wctype-wchar.h:
Include bits/endian.h, not endian.h.
* sysdeps/unix/sysv/linux/hppa/pthread.h: Don’t include endian.h.
* sysdeps/mips/ieee754/ieee754.h: Use __LDBL_MANT_DIG__
in ifdefs, instead of LDBL_MANT_DIG. Only include float.h
when __LDBL_MANT_DIG__ is not predefined, in which case
define __LDBL_MANT_DIG__ to equal LDBL_MANT_DIG.
2019-09-20 21:23:51 +00:00
|
|
|
# include <bits/endian.h>
|
Remove __need macros from stdio.h and wchar.h.
wint_t is a little finicky because it might be defined by stddef.h, which
belongs to the compiler.
In addition to the _types_, a bunch of other declarations shared between
wctype.h and wchar.h are factored out to their own header.
* libio/bits/types/FILE.h, libio/bits/types/__FILE.h
* wcsmbs/bits/types/mbstate_t.h, wcsmbs/bits/types/__mbstate_t.h
* wcsmbs/bits/types/wint_t.h: New single-type definition files.
* wctype/bits/wctype-wchar.h: New file holding declarations shared
between wctype.h and wchar.h.
* libio/Makefile, wcsmbs/Makefile, wctype/Makefile:
Install them.
* include/bits/types/FILE.h, include/bits/types/__FILE.h
* include/bits/types/mbstate_t.h, include/bits/types/__mbstate_t.h
* include/bits/types/wint_t.h, include/bits/wcsmbs-wchar.h:
New wrappers.
* include/stdio.h, include/wchar.h, include/wctype.h:
No need to handle __need macros.
* grp/grp.h, gshadow/gshadow.h, hurd/hurd.h, iconv/gconv.h
* libio/stdio.h, mach/mach.h, misc/mntent.h, pwd/pwd.h
* shadow/shadow.h, stdio-common/printf.h, wcsmbs/uchar.h
* wcsmbs/wchar.h, wctype/wctype.h
* sysdeps/generic/_G_config.h, sysdeps/unix/sysv/linux/_G_config.h
Use the new files instead of __need macros.
2016-11-21 04:00:02 +00:00
|
|
|
# if __BYTE_ORDER == __BIG_ENDIAN
|
|
|
|
|
# define _ISwbit(bit) (1 << (bit))
|
|
|
|
|
# else /* __BYTE_ORDER == __LITTLE_ENDIAN */
|
|
|
|
|
# define _ISwbit(bit) \
|
|
|
|
|
((bit) < 8 ? (int) ((1UL << (bit)) << 24) \
|
|
|
|
|
: ((bit) < 16 ? (int) ((1UL << (bit)) << 8) \
|
|
|
|
|
: ((bit) < 24 ? (int) ((1UL << (bit)) >> 8) \
|
|
|
|
|
: (int) ((1UL << (bit)) >> 24))))
|
|
|
|
|
# endif
|
|
|
|
|
|
|
|
|
|
enum
|
|
|
|
|
{
|
|
|
|
|
__ISwupper = 0, /* UPPERCASE. */
|
|
|
|
|
__ISwlower = 1, /* lowercase. */
|
|
|
|
|
__ISwalpha = 2, /* Alphabetic. */
|
|
|
|
|
__ISwdigit = 3, /* Numeric. */
|
|
|
|
|
__ISwxdigit = 4, /* Hexadecimal numeric. */
|
|
|
|
|
__ISwspace = 5, /* Whitespace. */
|
|
|
|
|
__ISwprint = 6, /* Printing. */
|
|
|
|
|
__ISwgraph = 7, /* Graphical. */
|
|
|
|
|
__ISwblank = 8, /* Blank (usually SPC and TAB). */
|
|
|
|
|
__ISwcntrl = 9, /* Control character. */
|
|
|
|
|
__ISwpunct = 10, /* Punctuation. */
|
|
|
|
|
__ISwalnum = 11, /* Alphanumeric. */
|
|
|
|
|
|
|
|
|
|
_ISwupper = _ISwbit (__ISwupper), /* UPPERCASE. */
|
|
|
|
|
_ISwlower = _ISwbit (__ISwlower), /* lowercase. */
|
|
|
|
|
_ISwalpha = _ISwbit (__ISwalpha), /* Alphabetic. */
|
|
|
|
|
_ISwdigit = _ISwbit (__ISwdigit), /* Numeric. */
|
|
|
|
|
_ISwxdigit = _ISwbit (__ISwxdigit), /* Hexadecimal numeric. */
|
|
|
|
|
_ISwspace = _ISwbit (__ISwspace), /* Whitespace. */
|
|
|
|
|
_ISwprint = _ISwbit (__ISwprint), /* Printing. */
|
|
|
|
|
_ISwgraph = _ISwbit (__ISwgraph), /* Graphical. */
|
|
|
|
|
_ISwblank = _ISwbit (__ISwblank), /* Blank (usually SPC and TAB). */
|
|
|
|
|
_ISwcntrl = _ISwbit (__ISwcntrl), /* Control character. */
|
|
|
|
|
_ISwpunct = _ISwbit (__ISwpunct), /* Punctuation. */
|
|
|
|
|
_ISwalnum = _ISwbit (__ISwalnum) /* Alphanumeric. */
|
|
|
|
|
};
|
|
|
|
|
# endif /* Not _ISwbit */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
__BEGIN_DECLS
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Wide-character classification functions: 7.15.2.1.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/* Test for any wide character for which `iswalpha' or `iswdigit' is
|
|
|
|
|
true. */
|
|
|
|
|
extern int iswalnum (wint_t __wc) __THROW;
|
|
|
|
|
|
|
|
|
|
/* Test for any wide character for which `iswupper' or 'iswlower' is
|
|
|
|
|
true, or any wide character that is one of a locale-specific set of
|
|
|
|
|
wide-characters for which none of `iswcntrl', `iswdigit',
|
|
|
|
|
`iswpunct', or `iswspace' is true. */
|
|
|
|
|
extern int iswalpha (wint_t __wc) __THROW;
|
|
|
|
|
|
|
|
|
|
/* Test for any control wide character. */
|
|
|
|
|
extern int iswcntrl (wint_t __wc) __THROW;
|
|
|
|
|
|
|
|
|
|
/* Test for any wide character that corresponds to a decimal-digit
|
|
|
|
|
character. */
|
|
|
|
|
extern int iswdigit (wint_t __wc) __THROW;
|
|
|
|
|
|
|
|
|
|
/* Test for any wide character for which `iswprint' is true and
|
|
|
|
|
`iswspace' is false. */
|
|
|
|
|
extern int iswgraph (wint_t __wc) __THROW;
|
|
|
|
|
|
|
|
|
|
/* Test for any wide character that corresponds to a lowercase letter
|
|
|
|
|
or is one of a locale-specific set of wide characters for which
|
|
|
|
|
none of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */
|
|
|
|
|
extern int iswlower (wint_t __wc) __THROW;
|
|
|
|
|
|
|
|
|
|
/* Test for any printing wide character. */
|
|
|
|
|
extern int iswprint (wint_t __wc) __THROW;
|
|
|
|
|
|
|
|
|
|
/* Test for any printing wide character that is one of a
|
|
|
|
|
locale-specific et of wide characters for which neither `iswspace'
|
|
|
|
|
nor `iswalnum' is true. */
|
|
|
|
|
extern int iswpunct (wint_t __wc) __THROW;
|
|
|
|
|
|
|
|
|
|
/* Test for any wide character that corresponds to a locale-specific
|
|
|
|
|
set of wide characters for which none of `iswalnum', `iswgraph', or
|
|
|
|
|
`iswpunct' is true. */
|
|
|
|
|
extern int iswspace (wint_t __wc) __THROW;
|
|
|
|
|
|
|
|
|
|
/* Test for any wide character that corresponds to an uppercase letter
|
|
|
|
|
or is one of a locale-specific set of wide character for which none
|
|
|
|
|
of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */
|
|
|
|
|
extern int iswupper (wint_t __wc) __THROW;
|
|
|
|
|
|
|
|
|
|
/* Test for any wide character that corresponds to a hexadecimal-digit
|
|
|
|
|
character equivalent to that performed be the functions described
|
|
|
|
|
in the previous subclause. */
|
|
|
|
|
extern int iswxdigit (wint_t __wc) __THROW;
|
|
|
|
|
|
|
|
|
|
/* Test for any wide character that corresponds to a standard blank
|
|
|
|
|
wide character or a locale-specific set of wide characters for
|
|
|
|
|
which `iswalnum' is false. */
|
|
|
|
|
# ifdef __USE_ISOC99
|
|
|
|
|
extern int iswblank (wint_t __wc) __THROW;
|
|
|
|
|
# endif
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Extensible wide-character classification functions: 7.15.2.2.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/* Construct value that describes a class of wide characters identified
|
|
|
|
|
by the string argument PROPERTY. */
|
|
|
|
|
extern wctype_t wctype (const char *__property) __THROW;
|
|
|
|
|
|
|
|
|
|
/* Determine whether the wide-character WC has the property described by
|
|
|
|
|
DESC. */
|
|
|
|
|
extern int iswctype (wint_t __wc, wctype_t __desc) __THROW;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Wide-character case-mapping functions: 7.15.3.1.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/* Converts an uppercase letter to the corresponding lowercase letter. */
|
|
|
|
|
extern wint_t towlower (wint_t __wc) __THROW;
|
|
|
|
|
|
|
|
|
|
/* Converts an lowercase letter to the corresponding uppercase letter. */
|
|
|
|
|
extern wint_t towupper (wint_t __wc) __THROW;
|
|
|
|
|
|
|
|
|
|
__END_DECLS
|
|
|
|
|
|
|
|
|
|
#endif /* bits/wctype-wchar.h. */
|