mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-30 22:43:12 +03:00
Update.
* Versions.def: Add GLIBC_2.2 for libc. * iconv/gconv.h: Make header suitable for inclusion in public header by protecting all names with __. * iconv/gconv.c: Adapt for symbol name changes. * iconv/gconv.h: Likewise. * iconv/gconv_builtin.c: Likewise. * iconv/gconv_close.c: Likewise. * iconv/gconv_db.c: Likewise. * iconv/gconv_dl.c: Likewise. * iconv/gconv_int.h: Likewise. * iconv/gconv_open.c: Likewise. * iconv/gconv_simple.c: Likewise. * iconv/iconv.c: Likewise. * iconv/iconv_close.c: Likewise. * iconv/iconv_open.c: Likewise. * iconv/loop.c: Likewise. * iconv/skeleton.c: Likewise. * iconvdata/8bit-gap.c: Likewise. * iconvdata/8bit-generic.c: Likewise. * iconvdata/ansi_x3.110.c: Likewise. * iconvdata/big5.c: Likewise. * iconvdata/cns11643.h: Likewise. * iconvdata/cns11643l1.h: Likewise. * iconvdata/euc-cn.c: Likewise. * iconvdata/euc-jp.c: Likewise. * iconvdata/euc-kr.c: Likewise. * iconvdata/euc-tw.c: Likewise. * iconvdata/gb2312.h: Likewise. * iconvdata/iso-2022-jp.c: Likewise. * iconvdata/iso-2022-kr.c: Likewise. * iconvdata/iso646.c: Likewise. * iconvdata/iso8859-1.c: Likewise. * iconvdata/iso_6937-2.c: Likewise. * iconvdata/iso_6937.c: Likewise. * iconvdata/jis0201.h: Likewise. * iconvdata/jis0208.h: Likewise. * iconvdata/jis0212.h: Likewise. * iconvdata/johab.c: Likewise. * iconvdata/ksc5601.h: Likewise. * iconvdata/sjis.c: Likewise. * iconvdata/t.61.c: Likewise. * iconvdata/uhc.c: Likewise. * stdlib/mblen.c: Likewise. * stdlib/mbtowc.c: Likewise. * stdlib/wctomb.c: Likewise. * wcsmbs/btowc.c: Likewise. * wcsmbs/mbrtowc.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wchar.h: Likewise. * wcsmbs/wcrtomb.c: Likewise. * wcsmbs/wcsmbsload.c: Likewise. * wcsmbs/wcsmbsload.h: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wctob.c: Likewise. * include/limits.h (MB_LEN_MAX): Increase to 16. * sysdeps/generic/_G_config.h: Define _G_fpos_t as struct. Define _G_iconv_t. * sysdeps/unix/sysv/linux/_G_config.h: Likewise. * include/wchar.h: Change mbstate_t to __mbstate_t. * libio/Makefile (routines): Add wfiledoalloc, oldiofgetpos, oldiofgetpos64, oldiofsetpos, oldiofsetpos64, fputwc, fputwc_u, getwc, getwc_u, getwchar, getwchar_u, iofgetws, iofgetws_u, iofputws, iofputws_u, iogetwline, iowpadn, ioungetwc, putwc, putwc_u, putchar, putchar_u, swprintf, vwprintf, wprintf, wscanf, fwscanf, vwscanf, vswprintf, iovswscanf, swscanf, wgenops, wstrops, wfileops, and iofwide. (tests): Add tst_swprintf, tst_wprintf, tst_swscanf, and tst_wscanf. * libio/Versions: Add _IO_fgetpos, _IO_fgetpos64, _IO_fsetpos, _IO_fsetpos64, fgetpos, fgetpos64, fgetwc, fgetwc_unlocked, fgetws, fgetws_unlocked, fputwc, fputwc_unlocked, fputws, fputws_unlocked, fsetpos, fsetpos64, fwide, fwprintf, fwscanf, getwc, getwc_unlocked, getwchar, getwchar_unlocked, putwc, putwc_unlocked, putwchar, putwchar_unlocked, swprintf, swscanf, ungetwc, vfwprintf, vswprintf, vwprintf, vfwscanf, vswscanf, vwscanf, wprintf, and wscanf to GLIBC_2.2 for libc. * libio/libio.h: Define codecvt struct. Define _IO_wide_data. Extend _IO_file contain pointer to codecvt, widedata and mode. (_IO_getwc_unlocked): New macro. (_IO_putwc_unlocked): New macro. (_IO_fwide): New macro. * libio/libioP.h: Add new prototypes and adjust existing declarations. * libio/fileops.c (_IO_new_file_close_it): Reset normal or widedata buffers based on mode. (new_do_write): Set _IO_write_end to _IO_buf_end if stream is wide oriented. (_IO_new_file_overflow): Don't depend only on _IO_CURRENTLY_PUTTING flag to be enough to signal unallocated buffer. For wide oriented stream don't make it linebuffered. Don't use _IO_do_flush, use _IO_new_do_write directly. (_IO_new_file_seekoff): Change return value type to _IO_off64_t. (_IO_file_seek): Likewise. * libio/genops.c (_IO_least_marker): Make global. (__underflow): Orient stream if not already done. (__uflow): Likewise. (_IO_default_seekpos): Change to type _IO_off64_t. (_IO_default_seekoff): Likewise. (_IO_default_seek): Likewise. (_IO_no_init): New function. Similar to _IO_init but allows to orient in initialization. * libio/iolibio.h: Add prototype for _IO_vswprintf. Change _IO_pos_BAD to use _IO_off64_t. * libio/ftello.c: Use _IO_off_t. For now abort when use with wide char stream. * libio/ftello64.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofopncook.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * libio/oldfileops.c: Likewise. * libio/iofgetpos.c: Store state of conversion if necessary. * libio/iofgetpos64.c: Likewise. * libio/iofsetpos.c: Restore conversion state if necessary. * libio/iofsetpos64.c: Likewise. * libio/iofdopen.c: Initialize so that stream can be wide oriented. * libio/iofopen.c: Likewise. * libio/iofopen64.c: Likewise. * libio/iopopen.c: Likewise. * libio/iovdprintf.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/memstream.c: Likewise. * libio/obprintf.c: Likewise. * libio/iofputs.c: Orient stream if not already happened. * libio/iofputs_u.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iofwrite_u.c: Likewise. * libio/ioputs.c: Likewise. * libio/iosetbuffer.c: Handle not yet oriented stream. * libio/iosetvbuf.c: Likewise. * libio/oldstdfiles.c: Adjust FILEBUF_LITERAL call. * libio/stdfiles.c: Likewise. * libio/strops.c (_IO_str_overflow): Correctly free buffer after failed allocation. (_IO_str_seekoff): Use _IO_off64_t. * libio/vasprintf.c: Pre-orient stream. * libio/vsnprintf.c: Likewise. * libio/fputwc.c: New file. * libio/fputwc_u.c: New file. * libio/fwprintf.c: New file. * libio/fwscanf.c: New file. * libio/getwc.c: New file. * libio/getwc_u.c: New file. * libio/getwchar.c: New file. * libio/getwchar_u.c: New file. * libio/iofgetws.c: New file. * libio/iofgetws_u.c: New file. * libio/iofputws.c: New file. * libio/iofputws_u.c: New file. * libio/iofwide.c: New file. * libio/iogetwline.c: New file. * libio/ioungetwc.c: New file. * libio/iovswscanf.c: New file. * libio/iowpadn.c: New file. * libio/oldiofgetpos.c: New file. * libio/oldiofgetpos64.c: New file. * libio/oldiofsetpos.c: New file. * libio/oldiofsetpos64.c: New file. * libio/putwc.c: New file. * libio/putwc_u.c: New file. * libio/putwchar.c: New file. * libio/putwchar_u.c: New file. * libio/swprintf.c: New file. * libio/swscanf.c: New file. * libio/tst_swprintf.c: New file. * libio/tst_swscanf.c: New file. * libio/tst_wprintf.c: New file. * libio/tst_wscanf.c: New file. * libio/tst_wscanf.input: New file. * libio/vswprintf.c: New file. * libio/vwprintf.c: New file. * libio/vwscanf.c: New file. * libio/wfiledoalloc.c: New file. * libio/wfileops.c: New file. * libio/wgenops.c: New file. * libio/wprintf.c: New file. * libio/wscanf.c: New file. * libio/wstrops.c: New file. * stdio-common/Makefile (routines): Add _itowa, itowa-digits, vfwprintf, and vfwscanf. * stdio-common/_itoa.c (base_table): Rename to _IO_base_table and make global. * stdio-common/_itowa.c: New file. * stdio-common/_itowa.h: New file. * stdio-common/itoa-digits.c: Minimal optimization. * stdio-common/itowa-digits.c: New file. * stdio-common/printf-parse.h: Allow use in wide character context. * stdio-common/printf-prs.c: Define ISASCII and MBRLEN. * stdio-common/printf.h (printf_info): Add wide bit. * stdio-common/printf_fp.c: Determine from wide bit whether stream is wide oriented or not. * stdio-common/printf_size.c: Likewise. * sysdeps/generic/printf_fphex.c: Likewise. * stdlib/strfmon.c: Call __printf_fp with wide bit cleared. * stdio-common/vfprintf.c: Rewrite to allow use in wide character context. * stdio-common/vfscand.c: Likewise. * stdio-common/vfwprintf.c: New file. * stdio-common/vfwscanf.c: New file. * time/Makefile (routines): Add wcsftime. (tests): Add tst_wcsftime. * time/Versions: Add wcsftime to GLIBC_2.2 for libc. * time/strftime.c: Make usable as wcsftime. * time/wcsftime.c: New file. * time/tst_wcsftime.c: New file. * wcsmbs/Makefile (routines): Add wmempcpy and wcschrnul. * wcsmbs/Versions: Add wmempcpy and wcschrnul to GLIBC_2.2 for libc. * wcsmbs/wcschrnul.c: New file. * wcsmbs/wmemcpy.c: New file. * wcsmbs/wmemcpy.c: Rename to __wmemcpy and make wmemcpy weak alias. * wcsmbs/wmemmove.c: Likewise for wmemmove. * manual/stdio.texi: Document is_char and wide element if printf_info. * manual/time.texi: Document wcsftime. * include/wchar.h: Add prototypes for __wmemcpy, __wmempcpy, __wmemmove, __wcschrnul, and __vfwscanf. * locale/langinfo.h: Add new LC_TIME entries for wchar_t data. * locale/C-time.c: Adapt for above change. * locale/categories.def: Likewise. * locale/localeinfo.h: Likewise. * localedata/Makefile: Don't run tests for now.
This commit is contained in:
Ulrich Drepper
181
wcsmbs/wchar.h
181
wcsmbs/wchar.h
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1995, 1996, 1997, 1998, 1999 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
|
||||
@ -22,19 +22,24 @@
|
||||
*/
|
||||
|
||||
#ifndef _WCHAR_H
|
||||
#define _WCHAR_H 1
|
||||
|
||||
#include <features.h>
|
||||
#ifndef __need_mbstate_t
|
||||
# define _WCHAR_H 1
|
||||
# include <features.h>
|
||||
#endif
|
||||
|
||||
#ifdef _WCHAR_H
|
||||
/* Get FILE definition. */
|
||||
#define __need_FILE
|
||||
#include <stdio.h>
|
||||
# define __need_FILE
|
||||
# include <stdio.h>
|
||||
# include <stdarg.h>
|
||||
|
||||
/* Get size_t, wchar_t, wint_t and NULL from <stddef.h>. */
|
||||
#define __need_size_t
|
||||
#define __need_wchar_t
|
||||
# define __need_size_t
|
||||
# define __need_wchar_t
|
||||
# define __need_NULL
|
||||
#endif
|
||||
#define __need_wint_t
|
||||
#define __need_NULL
|
||||
#include <stddef.h>
|
||||
|
||||
/* We try to get wint_t from <stddef.h>, but not all GCC versions define it
|
||||
@ -49,12 +54,24 @@ typedef unsigned int wint_t;
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef __mbstate_t_defined
|
||||
# define __mbstate_t_defined 1
|
||||
/* Conversion state information. */
|
||||
typedef struct
|
||||
{
|
||||
int count; /* Number of bytes needed for the current character. */
|
||||
wint_t value; /* Value so far. */
|
||||
} mbstate_t;
|
||||
} __mbstate_t;
|
||||
#endif
|
||||
#undef __need_mbstate_t
|
||||
|
||||
|
||||
/* The rest of the file is only used if used if __need_mbstate_t is not
|
||||
defined. */
|
||||
#ifdef _WCHAR_H
|
||||
|
||||
/* Public type. */
|
||||
typedef __mbstate_t mbstate_t;
|
||||
|
||||
#ifndef WCHAR_MIN
|
||||
/* These constants might also be defined in <inttypes.h>. */
|
||||
@ -150,6 +167,12 @@ extern wchar_t *wcschr __P ((__const wchar_t *__wcs, wchar_t __wc));
|
||||
/* Find the last occurrence of WC in WCS. */
|
||||
extern wchar_t *wcsrchr __P ((__const wchar_t *__wcs, wchar_t __wc));
|
||||
|
||||
#ifdef __USE_GNU
|
||||
/* This funciton is similar to `wcschr'. But it returns a pointer to
|
||||
the closing NUL wide character in case C is not found in S. */
|
||||
extern wchar_t *wcschrnul __P ((__const wchar_t *__s, wchar_t __wc));
|
||||
#endif
|
||||
|
||||
/* 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,
|
||||
@ -204,6 +227,13 @@ extern wchar_t *wmemmove __P ((wchar_t *__s1, __const wchar_t *__s2,
|
||||
/* Set N wide characters of S to C. */
|
||||
extern wchar_t *wmemset __P ((wchar_t *__s, wchar_t __c, size_t __n));
|
||||
|
||||
#ifdef __USE_GNU
|
||||
/* Copy N wide characters of SRC to DEST and return pointer to following
|
||||
wide character. */
|
||||
extern wchar_t *wmempcpy __P ((wchar_t *__restrict __s1,
|
||||
__const wchar_t *__restrict __s2, size_t __n));
|
||||
#endif
|
||||
|
||||
|
||||
/* Determine whether C constitutes a valid (one-byte) multibyte
|
||||
character. */
|
||||
@ -488,6 +518,137 @@ extern wchar_t *wcpncpy __P ((wchar_t *__dest, __const wchar_t *__src,
|
||||
#endif /* use GNU */
|
||||
|
||||
|
||||
/* Wide character I/O functions. */
|
||||
|
||||
/* Select orientation for stream. */
|
||||
extern int fwide __P ((FILE *__fp, int __mode));
|
||||
|
||||
|
||||
/* Write formatted output to STREAM. */
|
||||
extern int fwprintf __P ((FILE *__restrict __stream,
|
||||
__const wchar_t *__restrict __format, ...))
|
||||
/* __attribute__ ((__format__ (__wprintf__, 2, 3))) */;
|
||||
/* Write formatted output to stdout. */
|
||||
extern int wprintf __P ((__const wchar_t *__restrict __format, ...))
|
||||
/* __attribute__ ((__format__ (__wprintf__, 1, 2))) */;
|
||||
/* Write formatted output of at most N characters to S. */
|
||||
extern int swprintf __P ((wchar_t *__restrict __s, size_t __n,
|
||||
__const wchar_t *__restrict __format, ...))
|
||||
/* __attribute__ ((__format__ (__wprintf__, 3, 4))) */;
|
||||
|
||||
/* Write formatted output to S from argument list ARG. */
|
||||
extern int vfwprintf __P ((FILE *__restrict __s,
|
||||
__const wchar_t *__restrict __format,
|
||||
va_list __arg))
|
||||
/* __attribute__ ((__format__ (__wprintf__, 2, 0))) */;
|
||||
/* Write formatted output to stdout from argument list ARG. */
|
||||
extern int vwprintf __P ((__const wchar_t *__restrict __format,
|
||||
va_list __arg))
|
||||
/* __attribute__ ((__format__ (__wprintf__, 1, 0))) */;
|
||||
/* Write formatted output of at most N character to S from argument
|
||||
list ARG. */
|
||||
extern int vswprintf __P ((wchar_t *__restrict __s, size_t __n,
|
||||
__const wchar_t *__restrict __format,
|
||||
va_list __arg))
|
||||
/* __attribute__ ((__format__ (__wprintf__, 3, 0))) */;
|
||||
|
||||
|
||||
/* Read formatted input from STREAM. */
|
||||
extern int fwscanf __P ((FILE *__restrict __stream,
|
||||
__const wchar_t *__restrict __format, ...))
|
||||
/* __attribute__ ((__format__ (__wscanf__, 2, 3))) */;
|
||||
/* Read formatted input from stdin. */
|
||||
extern int wscanf __P ((__const wchar_t *__restrict __format, ...))
|
||||
/* __attribute__ ((__format__ (__wscanf__, 1, 2))) */;
|
||||
/* Read formatted input from S. */
|
||||
extern int swscanf __P ((__const wchar_t *__restrict __s,
|
||||
__const wchar_t *__restrict __format, ...))
|
||||
/* __attribute__ ((__format__ (__wscanf__, 2, 3))) */;
|
||||
|
||||
/* Read formatted input from S into argument list ARG. */
|
||||
extern int vfwscanf __P ((FILE *__restrict __s,
|
||||
__const wchar_t *__restrict __format, va_list __arg))
|
||||
/* __attribute__ ((__format__ (__wscanf__, 2, 0))) */;
|
||||
/* Read formatted input from stdin into argument list ARG. */
|
||||
extern int vwscanf __P ((__const wchar_t *__restrict __format, va_list __arg))
|
||||
/* __attribute__ ((__format__ (__wscanf__, 1, 0))) */;
|
||||
/* Read formatted input from S into argument list ARG. */
|
||||
extern int vswscanf __P ((__const wchar_t *__restrict __s,
|
||||
__const wchar_t *__restrict __format, va_list __arg))
|
||||
/* __attribute__ ((__format__ (__wscanf__, 2, 0))) */;
|
||||
|
||||
|
||||
/* Read a character from STREAM. */
|
||||
extern wint_t fgetwc __P ((FILE *__stream));
|
||||
extern wint_t getwc __P ((FILE *__stream));
|
||||
|
||||
/* Read a character from stdin. */
|
||||
extern wint_t getwchar __P ((void));
|
||||
|
||||
#ifdef __USE_GNU
|
||||
/* These are defined to be equivalent to the `char' functions defined
|
||||
in POSIX.1:1996. */
|
||||
extern wint_t getwc_unlocked __P ((FILE *__stream));
|
||||
extern wint_t getwchar_unlocked __P ((void));
|
||||
|
||||
/* This is the wide character version of a GNU extension. */
|
||||
extern wint_t fgetwc_unlocked __P ((FILE *__stream));
|
||||
#endif /* Use POSIX or MISC. */
|
||||
|
||||
|
||||
/* Write a character to STREAM. */
|
||||
extern wint_t fputwc __P ((wint_t __wc, FILE *__stream));
|
||||
extern wint_t putwc __P ((wint_t __wc, FILE *__stream));
|
||||
|
||||
/* Write a character to stdout. */
|
||||
extern wint_t putwchar __P ((wint_t __wc));
|
||||
|
||||
#ifdef __USE_GNU
|
||||
/* Faster version when locking is not necessary. */
|
||||
extern wint_t fputwc_unlocked __P ((wint_t __wc, FILE *__stream));
|
||||
|
||||
/* These are defined to be equivalent to the `char' functions defined
|
||||
in POSIX.1:1996. */
|
||||
extern wint_t putwc_unlocked __P ((wint_t __wc, FILE *__stream));
|
||||
extern wint_t putwchar_unlocked __P ((wint_t __wc));
|
||||
#endif
|
||||
|
||||
|
||||
/* Get a newline-terminated wide character string of finite length
|
||||
from STREAM. */
|
||||
extern wchar_t *fgetws __P ((wchar_t *__restrict __ws, int __n,
|
||||
FILE *__restrict __stream));
|
||||
|
||||
#ifdef __USE_GNU
|
||||
/* This function does the same as `fgetws' but does not lock the stream. */
|
||||
extern wchar_t *fgetws_unlocked __P ((wchar_t *__restrict __ws, int __n,
|
||||
FILE *__restrict __stream));
|
||||
#endif
|
||||
|
||||
|
||||
/* Write a string to STREAM. */
|
||||
extern int fputws __P ((__const wchar_t *__restrict __ws,
|
||||
FILE *__restrict __stream));
|
||||
|
||||
#ifdef __USE_GNU
|
||||
/* This function does the same as `fputws' but does not lock the stream. */
|
||||
extern int fputws_unlocked __P ((__const wchar_t *__restrict __ws,
|
||||
FILE *__restrict __stream));
|
||||
#endif
|
||||
|
||||
|
||||
/* Push a character back onto the input buffer of STREAM. */
|
||||
extern wint_t ungetwc __P ((wint_t __wc, FILE *__stream));
|
||||
|
||||
|
||||
/* Format TP into S according to FORMAT.
|
||||
Write no more than MAXSIZE wide characters and return the number
|
||||
of wide characters written, or 0 if it would exceed MAXSIZE. */
|
||||
extern size_t wcsftime __P ((wchar_t *__restrict __s, size_t __maxsize,
|
||||
__const wchar_t *__restrict __format,
|
||||
__const struct tm *__restrict __tp));
|
||||
|
||||
|
||||
/* The X/Open standard demands that most of the functions defined in
|
||||
the <wctype.h> header must also appear here. This is probably
|
||||
because some X/Open members wrote their implementation before the
|
||||
@ -501,4 +662,6 @@ extern wchar_t *wcpncpy __P ((wchar_t *__dest, __const wchar_t *__src,
|
||||
|
||||
__END_DECLS
|
||||
|
||||
#endif /* _WCHAR_H defined */
|
||||
|
||||
#endif /* wchar.h */
|
||||
|
||||
Reference in New Issue
Block a user