mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-17 18:40:14 +00: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.
302 lines
11 KiB
C
302 lines
11 KiB
C
/* Copyright (C) 1995, 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., 675 Mass Ave,
|
|
Cambridge, MA 02139, USA. */
|
|
|
|
/*
|
|
* ISO Standard: 7.16.4 General wide-string utilities <wchar.h>
|
|
*/
|
|
|
|
#ifndef _WCHAR_H
|
|
|
|
#define _WCHAR_H 1
|
|
#include <features.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
/* Get size_t, wchar_t, uwchar_t and NULL from <stddef.h>. */
|
|
#define __need_size_t
|
|
#define __need_wchar_t
|
|
/* #define __need_uwchar_t */
|
|
#define __need_NULL
|
|
/* __need_WCHAR_MAX */
|
|
/* __need_WCHAR_MIN */
|
|
#include <stddef.h>
|
|
|
|
/* FIXME: Should go with this or another name in stddef.h. */
|
|
typedef unsigned int uwchar_t;
|
|
|
|
/* Conversion state information. */
|
|
typedef int mbstate_t; /* FIXME */
|
|
|
|
/* Should come from <stddef.h> */
|
|
#define WCHAR_MIN ((wchar_t) 0) /* FIXME */
|
|
#define WCHAR_MAX (~WCHAR_MIN) /* FIXME */
|
|
|
|
#ifndef WEOF
|
|
# define WEOF (0xffffffffu)
|
|
#endif
|
|
|
|
/* 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
|
|
|
|
|
|
/* Copy SRC to DEST. */
|
|
extern wchar_t *wcscpy __P ((wchar_t *__dest, __const wchar_t *__src));
|
|
/* Copy no more than N wide-characters of SRC to DEST. */
|
|
extern wchar_t *wcsncpy __P ((wchar_t *__dest, __const wchar_t *__src,
|
|
size_t __n));
|
|
|
|
/* Append SRC onto DEST. */
|
|
extern wchar_t *wcscat __P ((wchar_t *__dest, __const wchar_t *__src));
|
|
/* Append no more than N wide-characters of SRC onto DEST. */
|
|
extern wchar_t *wcsncat __P ((wchar_t *__dest, __const wchar_t *__src,
|
|
size_t __n));
|
|
|
|
/* Compare S1 and S2. */
|
|
extern int wcscmp __P ((__const wchar_t *__s1, __const wchar_t *__s2));
|
|
/* Compare N wide-characters of S1 and S2. */
|
|
extern int wcsncmp __P ((__const wchar_t *__s1, __const wchar_t *__s2,
|
|
size_t __n));
|
|
|
|
/* Compare S1 and S2, both interpreted as appropriate to the
|
|
LC_COLLATE category of the current locale. */
|
|
extern int wcscoll __P ((__const wchar_t *__s1, __const wchar_t *__s2));
|
|
/* Transform S2 into array pointed to by S1 such that if wcscmp is
|
|
applied to two transformed strings the result is the as applying
|
|
`wcscoll' to the original strings. */
|
|
extern size_t wcsxfrm __P ((wchar_t *__s1, __const wchar_t *__s2, size_t __n));
|
|
|
|
/* Duplicate S, returning an identical malloc'd string. */
|
|
extern wchar_t *wcsdup __P ((__const wchar_t *__s));
|
|
|
|
/* Find the first occurence of WC in WCS. */
|
|
extern wchar_t *wcschr __P ((__const wchar_t *__wcs, wchar_t __wc));
|
|
/* Find the last occurence of WC in WCS. */
|
|
extern wchar_t *wcsrchr __P ((__const wchar_t *__wcs, wchar_t __wc));
|
|
|
|
/* Return the length of the initial segmet of WCS which
|
|
consists entirely of wide-characters not in REJECT. */
|
|
extern size_t wcscspn __P ((__const wchar_t *__wcs,
|
|
__const wchar_t *__reject));
|
|
/* Return the length of the initial segmet of WCS which
|
|
consists entirely of wide-characters in ACCEPT. */
|
|
extern size_t wcsspn __P ((__const wchar_t *__wcs, __const wchar_t *__accept));
|
|
/* Find the first occurence in WCS of any character in ACCEPT. */
|
|
extern wchar_t *wcspbrk __P ((__const wchar_t *__wcs,
|
|
__const wchar_t *__accept));
|
|
/* Find the first occurence of NEEDLE in HAYSTACK. */
|
|
extern wchar_t *wcsstr __P ((__const wchar_t *__haystack,
|
|
__const wchar_t *__needle));
|
|
/* Divide WCS into tokens separated by characters in DELIM. */
|
|
extern wchar_t *wcstok __P ((wchar_t *__s, __const wchar_t *__delim,
|
|
wchar_t **ptr));
|
|
|
|
/* Return the number of wide-characters in S. */
|
|
extern size_t wcslen __P ((__const wchar_t *__s));
|
|
|
|
|
|
/* Search N bytes of S for C. */
|
|
extern wchar_t *wmemchr __P ((__const wchar_t *__s, wchar_t __c, size_t __n));
|
|
|
|
/* Compare N bytes of S1 and S2. */
|
|
extern int wmemcmp __P ((__const wchar_t *__s1, __const wchar_t *__s2,
|
|
size_t __n));
|
|
|
|
/* Copy N bytes of SRC to DEST. */
|
|
extern wchar_t *wmemcpy __P ((wchar_t *__s1, __const wchar_t *__s2,
|
|
size_t __n));
|
|
|
|
/* Copy N bytes of SRC to DEST, guaranteeing
|
|
correct behavior for overlapping strings. */
|
|
extern wchar_t *wmemmove __P ((wchar_t *__s1, __const wchar_t *__s2,
|
|
size_t __N));
|
|
|
|
/* Set N bytes of S to C. */
|
|
extern wchar_t *wmemset __P ((wchar_t *__s, wchar_t __c, size_t __n));
|
|
|
|
|
|
/* Determine whether C constitutes a valid (one-byte) multibyte
|
|
character. */
|
|
extern wint_t btowc __P ((int __c));
|
|
|
|
/* Determine whether C corresponds to a member of the extended
|
|
character set whose multibyte representation is a single byte. */
|
|
extern int wctob __P ((wint_t __c));
|
|
|
|
/* Determine whether PS points to an object representing the initial
|
|
state. */
|
|
extern int mbsinit __P ((__const mbstate_t *__ps));
|
|
|
|
/* Return number of bytes in multibyte character pointed to by S. */
|
|
extern size_t mbrlen __P ((__const char *__s, size_t __n, mbstate_t *ps));
|
|
|
|
/* Write wide character representation of multibyte character pointed
|
|
to by S to PWC. */
|
|
extern size_t mbrtowc __P ((wchar_t *__pwc, __const char *__s, size_t __n,
|
|
mbstate_t *__p));
|
|
|
|
/* Write multibyte representation of wide character WC to S. */
|
|
extern size_t wcrtomb __P ((char *__s, wchar_t __wc, mbstate_t *__ps));
|
|
|
|
/* Write wide character representation of multibyte chracter string SRC
|
|
to DST. */
|
|
extern size_t mbsrtowcs __P ((wchar_t *__dst, __const char **__src,
|
|
size_t __len, mbstate_t *__ps));
|
|
|
|
/* Write multibyte character representation of wide character string
|
|
SRC to DST. */
|
|
extern size_t wcsrtombs __P ((char *__dst, __const wchar_t **__src,
|
|
size_t __len, mbstate_t *__ps));
|
|
|
|
|
|
#ifdef __USE_GNU
|
|
/* The following functions are extensions found in X/Open CAE. */
|
|
|
|
/* Determine number of column positions required for C. */
|
|
extern int wcwidth __P ((wint_t __c));
|
|
|
|
/* Determine number of column positions required for first N wide
|
|
characters (or fewer if S ends before this) in S. */
|
|
extern int wcswidth __P ((__const wchar_t *__s, size_t __n));
|
|
#endif /* use GNU */
|
|
|
|
|
|
/* Convert initial portion of the wide string NPTR to `double'
|
|
representation. */
|
|
extern double wcstod __P ((__const wchar_t *__nptr, wchar_t **__endptr));
|
|
|
|
#ifdef USE_GNU
|
|
/* Likewise for `float' and `long double' sizes of floating-point numbers. */
|
|
extern float wcstof __P ((__const wchar_t *__nptr, wchar_t **__endptr));
|
|
extern __long_double_t wcstold __P ((__const wchar_t *__nptr,
|
|
wchar_t **__endptr));
|
|
#endif /* GNU */
|
|
|
|
|
|
/* Convert initial portion of wide string NPTR to `long int'
|
|
representation. */
|
|
extern long int wcstol __P ((__const wchar_t *__nptr, wchar_t **__endptr,
|
|
int __base));
|
|
|
|
/* Convert initial portion of wide string NPTR to `unsigned long int'
|
|
representation. */
|
|
extern unsigned long int wcstoul __P ((__const wchar_t *__nptr,
|
|
wchar_t **__endptr, int __base));
|
|
|
|
#if defined (__GNUC__) && defined (__USE_GNU)
|
|
/* Convert initial portion of wide string NPTR to `long int'
|
|
representation. */
|
|
extern long long int wcstoq __P ((__const wchar_t *__nptr, wchar_t **__endptr,
|
|
int __base));
|
|
|
|
/* Convert initial portion of wide string NPTR to `unsigned long long int'
|
|
representation. */
|
|
extern unsigned long long int wcstouq __P ((__const wchar_t *__nptr,
|
|
wchar_t **__endptr, int __base));
|
|
#endif /* GCC and use GNU. */
|
|
|
|
|
|
/* The internal entry points for `wcstoX' take an extra flag argument
|
|
saying whether or not to parse locale-dependent number grouping. */
|
|
extern double __wcstod_internal __P ((__const wchar_t *__nptr,
|
|
wchar_t **_endptr, int __group));
|
|
extern float __wcstof_internal __P ((__const wchar_t *__nptr,
|
|
wchar_t **_endptr, int __group));
|
|
extern __long_double_t __wcstold_internal __P ((__const wchar_t *__nptr,
|
|
wchar_t **_endptr,
|
|
int __group));
|
|
|
|
extern long int __wcstol_internal __P ((__const wchar_t *__nptr,
|
|
wchar_t **__endptr, int __base,
|
|
int __group));
|
|
extern unsigned long int __wcstoul_internal __P ((__const wchar_t *__nptr,
|
|
wchar_t **__endptr,
|
|
int __base, int __group));
|
|
#ifdef __GNUC__
|
|
extern long long int __wcstoq_internal __P ((__const wchar_t *__nptr,
|
|
wchar_t **__endptr, int __base,
|
|
int __group));
|
|
extern unsigned long long int __wcstouq_internal __P ((__const wchar_t *__nptr,
|
|
wchar_t **__endptr,
|
|
int __base,
|
|
int __group));
|
|
#endif /* GCC */
|
|
|
|
|
|
#if defined (__OPTIMIZE__) && __GNUC__ >= 2
|
|
/* Define inline functions which call the internal entry points. */
|
|
|
|
extern __inline double wcstod (__const wchar_t *__nptr, wchar_t **__endptr)
|
|
{ return __wcstod_internal (__nptr, __endptr, 0); }
|
|
extern __inline long int wcstol (__const wchar_t *__nptr,
|
|
wchar_t **__endptr, int __base)
|
|
{ return __wcstol_internal (__nptr, __endptr, __base, 0); }
|
|
extern __inline unsigned long int wcstoul (__const wchar_t *__nptr,
|
|
wchar_t **__endptr, int __base)
|
|
{ return __wcstoul_internal (__nptr, __endptr, __base, 0); }
|
|
|
|
#ifdef __USE_GNU
|
|
extern __inline float wcstof (__const wchar_t *__nptr, wchar_t **__endptr)
|
|
{ return __wcstof_internal (__nptr, __endptr, 0); }
|
|
extern __inline __long_double_t wcstold (__const wchar_t *__nptr,
|
|
wchar_t **__endptr)
|
|
{ return __wcstold_internal (__nptr, __endptr, 0); }
|
|
#endif
|
|
|
|
#ifdef __USE_BSD
|
|
extern __inline long long int wcstoq (__const wchar_t *__nptr,
|
|
wchar_t **__endptr, int __base)
|
|
{ return __wcstoq_internal (__nptr, __endptr, __base, 0); }
|
|
extern __inline unsigned long long int wcstouq (__const wchar_t *__nptr,
|
|
wchar_t **__endptr, int __base)
|
|
{ return __wcstouq_internal (__nptr, __endptr, __base, 0); }
|
|
#endif
|
|
#endif /* Optimizing GCC >=2. */
|
|
|
|
|
|
#ifdef __USE_GNU
|
|
/* Copy SRC to DEST, returning the address of the terminating L'\0' in
|
|
DEST. */
|
|
extern wchar_t *__wcpcpy __P ((wchar_t *__dest, __const wchar_t *__src));
|
|
extern wchar_t *wcpcpy __P ((wchar_t *__dest, __const wchar_t *__src));
|
|
|
|
/* Copy no more than N characters of SRC to DEST, returning the address of
|
|
the last character written into DEST. */
|
|
extern wchar_t *__wcpncpy __P ((wchar_t *__dest, __const wchar_t *__src,
|
|
size_t __n));
|
|
extern wchar_t *wcpncpy __P ((wchar_t *__dest, __const wchar_t *__src,
|
|
size_t __n));
|
|
#endif /* use GNU */
|
|
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* wchar.h */
|