mirror of
git://sourceware.org/git/glibc.git
synced 2025-01-18 12:16:13 +08:00
75cd5204dd
* time/strftime.c: Use canonical autoconf nugget for time.h+sys/time.h
include.
Mon Apr 29 02:48:26 1996 Ulrich Drepper <drepper@cygnus.com>
* ctype/ctype-info.c: (__ctype_width): New variable.
(__ctype_names): Initialize correctly without offset.
* locale/C-collate.c, locale/C-ctype.c,
locale/C-messages.c, locale/C-monetary.c,
locale/C-numeric.c, locale/C-time.c: Change copyright.
* locale/C-ctype.c (_nl_C_LC_CTYPE_class32): Correct
endianess for initialization value.
* locale/lc-ctype.c (current): Add parameter for offset.
(__ctype32_b, __ctype_width): Add initialization for these
variables.
* locale/programs/charmap.c: Finish support for WIDTH information.
(new_width): New function.
* locale/programs/charset.h (width_rule): new data structure.
(charset_t): Add elements for width information.
* locale/programs/ld-ctype.c (locale_ctype_t): Add element
for width information.
(allocate_arrays): Add new argument for charset.
(ctype_finish): Make sure all characters named in charset
width table are known to name table.
(ctype_output): Correct handling of class and map name
information and write out width information.
(find_idx): Prepare for being called with NULL pointer as
TABLE argument. This means only allocate name entry.
(allocate_arrays): Correct handling of array element -1.
Because EOF == -1 the value of element 127 must *not* be
mirrored here.
Fill width information from charset tables.
* locale/programs/localedef.c (main): Correct loop over all
categories after change of order from Thu Mar 28 14:22:51 1996.
Add new charset argument to call of `write_all_categories'.
* locale/programs/locales.h (ctype_finish, ctype_output): New
charset argument.
* locale/programs/locfile.c (write_all_categories): Call
`ctype_output' with additional argument charset.
* posix/getconf.c (vars): Add _POSIX_SYNC_IO, _POSIX_ASYNC_IO,
and _POSIX_PRIO_IO definitions.
* posix/posix2_lim.h: Add definition of _POSIX2_CHARCLASS_NAME_MAX
and CHARCLASS_NAME_MAX.
* posix/unistd.h: Document _POSIX_SYNC_IO, _POSIX_ASYNC_IO,
and _POSIX_PRIO_IO.
* stdlib/grouping.h: Prepare for use in wide string functions.
* stdlib/stdlib.h: Correct prototypes for __strto*_internal
functions.
* stdlib/strtod.c: Extend for use as `wcsto{f,d,ld}'.
* stdlib/strtol.c: Extend for use as `wcsto{l,ul,q,uq}'.
* string/strcoll.c: Extend for use as `wcscoll'.
* string/strxfrm.c: Extend for use as `wcsxfrm'.
* sysdeps/generic/confname.h: Add definition of _PC_SYNC_IO,
_PC_ASYNC_IO, _PC_PRIO_IO and _SC_CHARCLASS_NAME_MAX.
* sysdeps/generic/stpncpy.c: Correct return value.
* sysdeps/posix/fpathconf.c: Add handling of _PC_SYNC_IO,
_PC_ASYNC_IO, and _PC_PRIO_IO.
* sysdeps/posix/sysconf.c: Add handling of _SC_REALTIME_SIGNALS,
_SC_PRIORITY_SCHEDULING, _SC_TIMERS, _SC_ASYNCHRONOUS_IO,
_SC_PRIORITIZED_IO, _SC_SYNCHRONIZED_IO, _SC_FSYNC,
_SC_MAPPED_FILES, _SC_MEMLOCK, _SC_MEMLOCK_RANGE,
_SC_MEMORY_PROTECTION, _SC_MESSAGE_PASSING, _SC_SEMAPHORES,
_SC_SHARED_MEMORY_OBJECTS, and _SC_CHARCLASS_NAME_MAX.
* sysdeps/stub/sysconf.c: Ditto.
* sysdeps/unix/sysv/sysv4/sysconf.c: Ditto.
* sysdeps/unix/sysv/linux/Dist: Add sys/sysctl.h.
* sysdeps/unix/sysv/linux/Makefile [subdir == misc]
(sysdep_routines): Add s_sysctl and sysctl.
* sysdeps/unix/sysv/linux/sys/mman.h: Add declaration of mremap.
* sysdeps/unix/sysv/linux/sys/socket.h: New file. Wrapper
around kernel header.
* sysdeps/unix/sysv/linux/sys/sysctl.h: New file. Define
interface to `sysctl' function.
* sysdeps/unix/sysv/linux/syscalls.list: Add mremap and _sysctl.
* sysdeps/unix/sysv/linux/sysconf.c: Add handling of
_SC_CHARCLASS_NAME_MAX.
* sysdeps/unix/sysv/linux/sysctl.c: new file. Implement caller
of _sysctl system call.
* sysvipc/Makefile (routines): Add ftok.
* sysvipc/ftok.c: use variable `proj_id' not `id'. Patch by
David Mosberger-Tang.
* wcsmbs/Makefile (routines): Add wcpcpy, wcpncpy, wcstol,
wcstoul, wcstoq, wcstouq, wcstod, wcstold, wcstof, wcscoll,
wcsxfrm, wcwidth, and wcswidth.
* wcsmbs/wchar.h: Add declarations for wcpcpy, wcpncpy, wcstol,
wcstoul, wcstoq, wcstouq, wcstod, wcstold, wcstof, wcscoll,
wcsxfrm, wcwidth, and wcswidth.
Declare internal interfaces for wcsto* functions.
[OPTIMIZE]: Define inline functions for wcsto* functions to
call internal interface functions.
* wcsmbs/wcpcpy.c, wcsmbs/wcpncpy.c: New files. Implement non-
standard function equivalent to stpcpy/stpncpy.
* wcsmbs/wcscoll.c: Implement `wcscoll' function by using
`strcoll' implementation.
* wcsmbs/wcscpy.c, wcsmbs/wcsncpy.c: Use wint_t instead of
wchar_t.
* wcsmbs/wcstod.c: Implement `wcstod' function by using `strtod'
implementation.
* wcsmbs/wcstof.c: Same for `wcstof'.
* wcsmbs/wcstold.c: Same for `strtold'.
* wcsmbs/wcstol.c: Implement `wcstol' function by using `strtol'
implementation.
* wcsmbs/wcstoq.c: Same for `wcstoq'.
* wcsmbs/wcstoul.c: Same for `wcstoul'.
* wcsmbs/wcstouq.c: Same for `wcstouq'.
* wcsmbs/wcswidth.c: Implement `wcswidth' function from X/Open
CAE.
* wcsmbs/wcwidth.c: Ditto for `wcwidth'.
* wcsmbs/wcwidth.h: Common function for definitions of above two
functions.
* wcsmbs/wcsxfrm.c: Implement `wcsxfrm function by using
`strxfrm implementation.
* wctype/wctype.c: Remove case for `wctype_t' being 16 bit type.
* wctype/wctype.h (wint_t): Protect against multiple definition.
(wctype_t): Always define as `unsigned long int'.
* wctype.h: New file. Wrapper around wctype/wctype.h.
* hurd/hurdstartup.c (_hurd_split_args): Function removed.
(_hurd_startup): Use argz functions.
* hurd/hurdexec.c: Use argz functions.
214 lines
6.9 KiB
C
214 lines
6.9 KiB
C
/* Copyright (C) 1996 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/IEC 9899:1990/Amendment 1:1995 7.15:
|
|
* Wide-character classification and mapping utilities <wctype.h>
|
|
*/
|
|
|
|
#ifndef _WCTYPE_H
|
|
|
|
#define _WCTYPE_H 1
|
|
#include <features.h>
|
|
|
|
|
|
__BEGIN_DECLS
|
|
|
|
/* FIXME: should this go into <stddef.h>??? */
|
|
#if 0
|
|
#define __need_wint_t
|
|
#include <stddef.h>
|
|
#else
|
|
/* 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. */
|
|
#ifndef __have_wint_t_defined
|
|
#define __have_wint_t_defined 1
|
|
/* This is a hack!!! */
|
|
typedef unsigned int wint_t;
|
|
#endif
|
|
#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
|
|
/* These are all the characteristics of characters.
|
|
If there get to be more than 16 distinct characteristics,
|
|
many things must be changed that use `unsigned short int's.
|
|
|
|
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. */
|
|
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. */
|
|
int iswalpha __P ((wint_t __wc));
|
|
|
|
/* Test for any control wide character. */
|
|
int iswcntrl __P ((wint_t __wc));
|
|
|
|
/* Test for any wide character that corresponds to a decimal-digit
|
|
character. */
|
|
int iswdigit __P ((wint_t __wc));
|
|
|
|
/* Test for any wide character for which `iswprint' is true and
|
|
`iswspace' is false. */
|
|
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. */
|
|
int iswlower __P ((wint_t __wc));
|
|
|
|
/* Test for any printing wide character. */
|
|
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. */
|
|
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. */
|
|
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. */
|
|
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. */
|
|
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. */
|
|
wctype_t wctype __P ((__const char *__property));
|
|
|
|
/* Determine whether the wide-character WC has the property described by
|
|
DESC. */
|
|
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. */
|
|
wint_t towlower __P ((wint_t __wc));
|
|
|
|
/* Converts an lowercase letter to the corresponding uppercase letter. */
|
|
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. */
|
|
wctrans_t wctrans __P ((__const char *__property));
|
|
|
|
/* Map the wide character WC using the mapping described by DESC. */
|
|
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 int *__ctype_tolower; /* Case conversions. */
|
|
extern __const int *__ctype_toupper; /* Case conversions. */
|
|
|
|
#define towlower(wc) towctrans (wc, __ctype_tolower)
|
|
#define towupper(wc) towctrans (wc, __ctype_toupper)
|
|
|
|
#endif /* Not __NO_WCTYPE. */
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* wctype.h */
|