bd355af04f
1997-12-14 21:33 Ulrich Drepper <drepper@cygnus.com> * version.h (VERSION): Bump to 2.0.91. * db2/makedb.c (process_input): Fix typo in message. * sunrpc/rpcinfo.c (pmapdump): Unify messages. * elf/dynamic-link.h: Pretty print. * elf/rtld.c: Allow multiple preloading of a shared object. * include/limits.h: Prevent multiple inclusion. * malloc/Makefile (headers): Add mcheck.h. (distribute): Remove it here. * malloc/mcheck.h: Pretty print. * malloc/mtrace.c (mallenv): Make `const'. * malloc/mtrace.pl: Don't print table head for memory leaks if there are none. * manual/memory.texi: Update descriptor of malloc hooks. * posix/Makefile (routines): Add waitid. * posix/sys/types.h [__USE_SVID || __USE_POSIX]: Define id_t based on __id_t. * posix/sys/wait.h: Define idtype_t type. Add prototype for waitid. * signal/signal.h: Move definition of sigval_t to <bits/siginfo.h>. * sysdeps/generic/waitid.c: Stub for waitid. * sysdeps/generic/bits/siginfo.h: Define sigval_t. Arrange to work the __need_siginfo_t defined. * sysdeps/unix/sysv/linux/bits/siginfo: Likewise. * sysdeps/generic/bits/types.h: Define __id_t. Correct definition of __FDMASK. * sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/bits/types.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Likewise. * sysdeps/posix/waitid.c: New file. Provided by Zack Weinberg. * rt/aio_misc.c: Rename __aio_free_req to __aio_free_request. * sysdeps/alpha/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE): Add missing parameters. * sysdeps/generic/dl-sysdep.c: Don't call __libc_init_secure. * sysdeps/generic/enbl-secure.c: Don't define __libc_uid. * sysdeps/unix/sysv/linux/init-first.c: Define __libc_uid. * sysdeps/unix/sysv/linux/sigqueue.c: Make sure __libc_uid is initialized. * sysdeps/i386/dl-machine.h: Little cleanup. * sysdeps/i386/fpu/bits/mathinline.h: Use __signbit* inline functions. (__finite): Mark function as const. Add inline code for __ieee754_atan2. * sysdeps/libm-ieee754/s_cacoshf.c: Add alternate implementation (but don't use it now). * sysdeps/libm-ieee754/s_catan.c: Use __ieee754_atan2 instead of __atan. * sysdeps/libm-ieee754/s_catanf.c: Likewise. * sysdeps/libm-ieee754/s_catanl.c: Likewise. * sysdeps/libm-ieee754/s_catanh.c: Likewise. Correct sign of real part. * sysdeps/libm-ieee754/s_catanhf.c: Likewise. * sysdeps/libm-ieee754/s_catanhl.c: Likewise. * sysdeps/libm-ieee754/s_clog10.c: Use factor to correct __ieee754_atan2 to base 10. * sysdeps/libm-ieee754/s_clog10f.c: Likewise. * sysdeps/libm-ieee754/s_clog10l.c: Likewise. * sysdeps/unix/sysv/linux/alpha/kernel_sigaction.h: Define as old_kernel_sigaction. * sysdeps/unix/sysv/linux/net/if_slip.h: Pretty print. * wctype/Makefile (routines): Add wctype_l. * wctype/wctype.h: Add declaration of __wctype_l. * wctype/wctype_l.c: New file. 1997-12-10 00:38 Ulrich Drepper <drepper@cygnus.com> * locale/C-ctype.c: Correct data for isw* functions. * locale/programs/ld-ctype.c: Write 32bit char classes in correct byte order. * wctype/test_wctype.c: Add test for isw* functions. * wctype/wctype.c: Return value with expected byte order. * sysdeps/generic/_G_config.h: Define _G_HAVE_IO_FILE_OPEN. * sysdeps/unix/sysv/linux/_G_config.h: Likewise.
312 lines
11 KiB
C
312 lines
11 KiB
C
/* Copyright (C) 1996, 1997 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 Library General Public License as
|
|
published by the Free Software Foundation; either version 2 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
/*
|
|
* ISO C Standard, Amendment 1, 7.15:
|
|
* Wide-character classification and mapping utilities <wctype.h>
|
|
*/
|
|
|
|
#ifndef _WCTYPE_H
|
|
#define _WCTYPE_H 1
|
|
|
|
#include <features.h>
|
|
#include <bits/types.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
/* We try to get wint_t from <stddef.h>, but not all GCC versions define it
|
|
there. So define it ourselves if it remains undefined. */
|
|
#define __need_wint_t
|
|
#include <stddef.h>
|
|
#ifndef _WINT_T
|
|
/* Integral type unchanged by default argument promotions that can
|
|
hold any value corresponding to members of the extended character
|
|
set, as well as at least one value that does not correspond to any
|
|
member of the extended character set. */
|
|
# define _WINT_T
|
|
typedef unsigned int wint_t;
|
|
#endif
|
|
|
|
/* Scalar type that can hold values which represent locale-specific
|
|
character mappings. */
|
|
typedef __const unsigned int *wctrans_t;
|
|
|
|
/* Scalar type that can hold values which represent locale-specific
|
|
character classifications. */
|
|
typedef unsigned long int wctype_t;
|
|
|
|
/* Constant expression of type `wint_t' whose value does not correspond
|
|
to any member of the extended character set. */
|
|
#ifndef WEOF
|
|
# define WEOF (0xffffffffu)
|
|
#endif
|
|
|
|
#ifndef _ISbit
|
|
/* 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. */
|
|
|
|
# include <endian.h>
|
|
# if __BYTE_ORDER == __BIG_ENDIAN
|
|
# define _ISbit(bit) (1 << bit)
|
|
# else /* __BYTE_ORDER == __LITTLE_ENDIAN */
|
|
# define _ISbit(bit) (bit < 8 ? ((1 << bit) << 8) : ((1 << bit) >> 8))
|
|
# endif
|
|
|
|
enum
|
|
{
|
|
_ISupper = _ISbit (0), /* UPPERCASE. */
|
|
_ISlower = _ISbit (1), /* lowercase. */
|
|
_ISalpha = _ISbit (2), /* Alphabetic. */
|
|
_ISdigit = _ISbit (3), /* Numeric. */
|
|
_ISxdigit = _ISbit (4), /* Hexadecimal numeric. */
|
|
_ISspace = _ISbit (5), /* Whitespace. */
|
|
_ISprint = _ISbit (6), /* Printing. */
|
|
_ISgraph = _ISbit (7), /* Graphical. */
|
|
_ISblank = _ISbit (8), /* Blank (usually SPC and TAB). */
|
|
_IScntrl = _ISbit (9), /* Control character. */
|
|
_ISpunct = _ISbit (10), /* Punctuation. */
|
|
_ISalnum = _ISbit (11) /* Alphanumeric. */
|
|
};
|
|
#endif /* Not _ISbit */
|
|
|
|
|
|
/*
|
|
* Wide-character classification functions: 7.15.2.1.
|
|
*/
|
|
|
|
/* Test for any wide character for which `iswalpha' or `iswdigit' is
|
|
true. */
|
|
extern int iswalnum __P ((wint_t __wc));
|
|
|
|
/* 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 __P ((wint_t __wc));
|
|
|
|
/* Test for any control wide character. */
|
|
extern int iswcntrl __P ((wint_t __wc));
|
|
|
|
/* Test for any wide character that corresponds to a decimal-digit
|
|
character. */
|
|
extern int iswdigit __P ((wint_t __wc));
|
|
|
|
/* Test for any wide character for which `iswprint' is true and
|
|
`iswspace' is false. */
|
|
extern int iswgraph __P ((wint_t __wc));
|
|
|
|
/* 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 __P ((wint_t __wc));
|
|
|
|
/* Test for any printing wide character. */
|
|
extern int iswprint __P ((wint_t __wc));
|
|
|
|
/* 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 __P ((wint_t __wc));
|
|
|
|
/* 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 __P ((wint_t __wc));
|
|
|
|
/* 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 __P ((wint_t __wc));
|
|
|
|
/* 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 __P ((wint_t __wc));
|
|
|
|
/*
|
|
* 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 __P ((__const char *__property));
|
|
|
|
/* Determine whether the wide-character WC has the property described by
|
|
DESC. */
|
|
extern int __iswctype __P ((wint_t __wc, wctype_t __desc));
|
|
extern int iswctype __P ((wint_t __wc, wctype_t __desc));
|
|
|
|
|
|
/*
|
|
* Wide-character case-mapping functions: 7.15.3.1.
|
|
*/
|
|
|
|
/* Converts an uppercase letter to the corresponding lowercase letter. */
|
|
extern wint_t towlower __P ((wint_t __wc));
|
|
|
|
/* Converts an lowercase letter to the corresponding uppercase letter. */
|
|
extern wint_t towupper __P ((wint_t __wc));
|
|
|
|
/*
|
|
* Extensible wide-character mapping functions: 7.15.3.2.
|
|
*/
|
|
|
|
/* Construct value that describes a mapping between wide characters
|
|
identified by the string argument PROPERTY. */
|
|
extern wctrans_t wctrans __P ((__const char *__property));
|
|
|
|
/* Map the wide character WC using the mapping described by DESC. */
|
|
extern wint_t towctrans __P ((wint_t __wc, wctrans_t __desc));
|
|
|
|
|
|
|
|
#ifndef __NO_WCTYPE
|
|
# define iswalnum(wc) __iswctype ((wc), _ISalnum)
|
|
# define iswalpha(wc) __iswctype ((wc), _ISalpha)
|
|
# define iswcntrl(wc) __iswctype ((wc), _IScntrl)
|
|
# define iswdigit(wc) __iswctype ((wc), _ISdigit)
|
|
# define iswlower(wc) __iswctype ((wc), _ISlower)
|
|
# define iswgraph(wc) __iswctype ((wc), _ISgraph)
|
|
# define iswprint(wc) __iswctype ((wc), _ISprint)
|
|
# define iswpunct(wc) __iswctype ((wc), _ISpunct)
|
|
# define iswspace(wc) __iswctype ((wc), _ISspace)
|
|
# define iswupper(wc) __iswctype ((wc), _ISupper)
|
|
# define iswxdigit(wc) __iswctype ((wc), _ISxdigit)
|
|
|
|
# ifdef __USE_GNU
|
|
# define iswblank(wc) __iswctype ((wc), _ISblank)
|
|
# endif
|
|
|
|
/* Pointer to conversion tables. */
|
|
extern __const __int32_t *__ctype_tolower; /* Case conversions. */
|
|
extern __const __int32_t *__ctype_toupper; /* Case conversions. */
|
|
|
|
# define towlower(wc) towctrans ((wc), __ctype_tolower)
|
|
# define towupper(wc) towctrans ((wc), __ctype_toupper)
|
|
|
|
#endif /* Not __NO_WCTYPE. */
|
|
|
|
#ifdef __USE_GNU
|
|
/* Declare the interface to extended locale model. */
|
|
# include <xlocale.h>
|
|
|
|
/* Test for any wide character for which `iswalpha' or `iswdigit' is
|
|
true. */
|
|
extern int __iswalnum_l __P ((wint_t __wc, __locale_t __locale));
|
|
|
|
/* 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_l __P ((wint_t __wc, __locale_t __locale));
|
|
|
|
/* Test for any control wide character. */
|
|
extern int __iswcntrl_l __P ((wint_t __wc, __locale_t __locale));
|
|
|
|
/* Test for any wide character that corresponds to a decimal-digit
|
|
character. */
|
|
extern int __iswdigit_l __P ((wint_t __wc, __locale_t __locale));
|
|
|
|
/* Test for any wide character for which `iswprint' is true and
|
|
`iswspace' is false. */
|
|
extern int __iswgraph_l __P ((wint_t __wc, __locale_t __locale));
|
|
|
|
/* 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_l __P ((wint_t __wc, __locale_t __locale));
|
|
|
|
/* Test for any printing wide character. */
|
|
extern int __iswprint_l __P ((wint_t __wc, __locale_t __locale));
|
|
|
|
/* 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_l __P ((wint_t __wc, __locale_t __locale));
|
|
|
|
/* 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_l __P ((wint_t __wc, __locale_t __locale));
|
|
|
|
/* 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_l __P ((wint_t __wc, __locale_t __locale));
|
|
|
|
/* 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_l __P ((wint_t __wc, __locale_t __locale));
|
|
|
|
|
|
/* Construct value that describes a class of wide characters identified
|
|
by the string argument PROPERTY. */
|
|
extern wctype_t __wctype_l __P ((__const char *__property,
|
|
__locale_t __locale));
|
|
|
|
/* Determine whether the wide-character WC has the property described by
|
|
DESC. */
|
|
extern int __iswctype_l __P ((wint_t __wc, wctype_t __desc,
|
|
__locale_t __locale));
|
|
|
|
|
|
/*
|
|
* Wide-character case-mapping functions.
|
|
*/
|
|
|
|
/* Converts an uppercase letter to the corresponding lowercase letter. */
|
|
extern wint_t __towlower_l __P ((wint_t __wc, __locale_t __locale));
|
|
|
|
/* Converts an lowercase letter to the corresponding uppercase letter. */
|
|
extern wint_t __towupper_l __P ((wint_t __wc, __locale_t __locale));
|
|
|
|
/* Map the wide character WC using the mapping described by DESC. */
|
|
extern wint_t __towctrans_l __P ((wint_t __wc, wctrans_t __desc,
|
|
__locale_t __locale));
|
|
|
|
|
|
# ifndef __NO_WCTYPE
|
|
# define __iswalnum_l(wc, loc) __iswctype_l ((wc), _ISalnum, (loc))
|
|
# define __iswalpha_l(wc, loc) __iswctype_l ((wc), _ISalpha, (loc))
|
|
# define __iswcntrl_l(wc, loc) __iswctype_l ((wc), _IScntrl, (loc))
|
|
# define __iswdigit_l(wc, loc) __iswctype_l ((wc), _ISdigit, (loc))
|
|
# define __iswlower_l(wc, loc) __iswctype_l ((wc), _ISlower, (loc))
|
|
# define __iswgraph_l(wc, loc) __iswctype_l ((wc), _ISgraph, (loc))
|
|
# define __iswprint_l(wc, loc) __iswctype_l ((wc), _ISprint, (loc))
|
|
# define __iswpunct_l(wc, loc) __iswctype_l ((wc), _ISpunct, (loc))
|
|
# define __iswspace_l(wc, loc) __iswctype_l ((wc), _ISspace, (loc))
|
|
# define __iswupper_l(wc, loc) __iswctype_l ((wc), _ISupper, (loc))
|
|
# define __iswxdigit_l(wc, loc) __iswctype_l ((wc), _ISxdigit, (loc))
|
|
|
|
# define __iswblank_l(wc, loc) __iswctype_l ((wc), _ISblank, (loc))
|
|
|
|
# define __towlower_l(wc, loc) __towctrans_l ((wc), (loc)->__ctype_tolower, \
|
|
(loc))
|
|
# define __towupper_l(wc, loc) __towctrans_l ((wc), (loc)->__ctype_toupper, \
|
|
(loc))
|
|
|
|
# endif /* Not __NO_WCTYPE. */
|
|
|
|
#endif /* Use GNU. */
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* wctype.h */
|