fa0bc87c32
* stdlib/canonicalize.c: New file.
* stdlib/stdlib.h: Declare canonicalize_file_name, realpath.
* stdlib/Makefile (routines): Add canonicalize.
* posix/unistd.h: Declare __canonicalize_directory_name_internal.
Thu May 23 00:01:10 1996 Ulrich Drepper <drepper@cygnus.com>
* db/recno/rec_seq.c: Prevent `sccsid' definition by using the
same #if condition as in the other db files.
* intl/Makefile: Add -Wno-unused CFLAGS for compilation of
bindtextdom.c, finddomain.c, and localealias.c.
* intl/dcgettext.c: Don't define prototype for getcwd() when
compiling in glibc.
* libio/cleanup.c: Add prototype for _IO_register_cleanup.
* libio/filedoalloc.c, libio/fileops.c, libio/iopopen.c: Don't
define _POSIX_SOURCE unconditionally.
* libio/filedoalloc.c, libio/iopopen.c: Include <unistd.h> if
compiling in glibc.
* libio/fileops.c (_IO_file_close_it): Don't sync file, call
flush instead. This relaxes the rules from POSIX.1 about
changing the active handle a bit.
* libio/iofopncook.c (struct _IO_cookie_file): Move definition
into <libio.h>.
Add prototypes for local functions to prevent warnings.
* libio/iopopen.c: Change prototypes for _IO_fork, _IO_pipe, and
_IO_DUP2 to contain complete parameter list.
* libio/libio.h: Add definition of struct _IO_cookie_file.
* libio/libioP.h: Add prototypes for _IO_vasprintf, _IO_vdprintf,
and _IO_vsnprintf.
* libio/memstream.c: Include <stdio.h>.
* libio/stdio.h: Add prototypes for fopencookie,
__stdio_gen_tempname, __vfscanf, __vsscanf, and __vsnprintf.
* libio/strops.c: Avoid useless expression in `for' initializer.
* locale/findlocale.c: Add some casts to prevent warnings.
* locale/programs/locfile.c (write_locale_data): Don't use
double `/' in locale binary file.
* posix/unistd.h: Remove prototype for `reboot'.
Update from bind-4.9.4-T1A.
* resolv/Makefile (routines): Add inet_ntop and inet_pton.
* resolv/arpa/nameser.h: Add definition of IN6ADDRSZ.
* resolv/gethnamaddr.c, resolv/getnetnamadr.c, resolv/res_comp.c,
resolv/res_debug.c, resolv/res_init.c
* resolv/inet_ntop.c, resolv/inet_pton.c: New files.
* resolv/resolv.h: Add RES_USE_INET6 flag.
(__dn_isvalid): Renamed to __res_dnok.
Add prototypes for __res_ownok and __res_mailok.
* stdio-common/Makefile: Add -Wno-unused to CFLAGS for _itoa.c.
* stdio-common/getline.c, stdio-common/vfscanf.c,
sysdeps/posix/tempname.c: Don't use <ansidecl.h> anymore.
* sysdeps/unix/sysv/linux/Makefile [$subdir == misc]
(sysdep_routines): Add s_reboot.
(install-others): Add $(includedir)/sys/syscall.h.
New rule for $(includedir)/sys/syscall.h to produce from
<asm/unistd.h>.
* sysdeps/unix/sysv/linux/reboot.c: New file. Make single
argument function call 3 argument system call.
* sysdeps/unix/sysv/linux/sys/reboot.h: New file. Linux specific
definition for reboot function.
* sysdeps/unix/sysv/linux/syscall.h: Remove old and obsolete
comment.
* sysdeps/unix/sysv/linux/syscalls.list: Rename function for
reboot syscall to __syscall_reboot.
* wcsmbs/wchar.h: Protect prototypes for wcstof and wcstold by
__USE_GNU, not USE_GNU.
Tue May 21 21:55:49 1996 David Mosberger-Tang <davidm@AZStarNet.com>
* locale/programs/charset.c, locale/programs/ld-collate.c:
Add casts to prevent warnings on 64-bit machines.
* locale/programs/ld-monetary.c: Don't do unnecessary tests for
int_frac_digits and frac_digits which only produce warnings.
Mon May 13 23:45:29 1996 David Mosberger-Tang <davidm@AZStarNet.com>
* inet/arpa/inet.h: Backup return type of inet_addr to u_long.
* resolv/inet_addr.c: Likewise.
* resolv/Makefile (distribute): Add res_hconf.h
(routines): Add res_hconf.
* resolv/gethnamaddr.c: Add support for /etc/host.conf.
* resolv/res_init.c: Initialize /etc/host.conf reader.
* resolv/res_hconf.c, resolv/res_hconf.h: New files.
Implementation of reading /etc/host.conf.
Wed May 22 21:21:15 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* Rules (%.out rules): Prepend $($*-ENV) to the command.
* sysdeps/unix/sysv/linux/i386/brk.c (___brk_addr): Define as weak
alias for __curbrk.
Wed May 22 19:37:27 1996 Miles Bader <miles@gnu.ai.mit.edu>
* hurd/hurdexec.c (_hurd_exec): Pass INIT_TRACEMASK.
* hurd/hurdmsg.c (set_int): Support INIT_TRACEMASK.
Wed May 22 18:47:31 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* sysdeps/mach/hurd/getcwd.c
(_hurd_canonicalize_directory_name_internal): New function, broken out
of __getcwd.
(__getcwd): Use it.
(__canonicalize_directory_name_internal): New function using it.
* sysdeps/posix/getcwd.c (__canonicalize_directory_name_internal): New
function, broken out of __getcwd.
(__getcwd): Use it.
Wed May 22 18:14:05 1996 Miles Bader <miles@gnu.ai.mit.edu>
* string/argz-create.c (__argz_create): Correctly calculate length.
* string/argz-extract.c (__argz_extract): Add terminating 0 entry.
* hurd/hurdstartup.c (_hurd_startup): ... and don't so here.
[HAVE_VMSDIR_H]: Include "vmsdir.h".
(glob) [VMS]: Don't grok ~.
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 */
|