2008-12-10 Corinna Vinschen <corinna@vinschen.de>
Implement basic wide char stdio functionality, based on FreeBSD.
* libc/include/stdio.h (__SORD): Define.
(__SWID): Define.
* libc/include/wchar.h: Add declarations for new wide char functions.
(getwc): Define as macro.
(getwchar): Ditto.
(putwc): Ditto.
(putwchar): Ditto.
* libc/include/sys/reent.h (struct __sFILE): Add _mbstate member.
(struct __sFILE64): Ditto.
* libc/stdio/Makefile.am (ELIX_4_SOURCES): Add fgetwc.c, fgetws.c,
fputwc.c, fputws.c, fwide.c, getwc.c, getwchar.c, putwc.c, putwchar.c
and ungetwc.c.
(CHEWOUT_FILES): Add fgetwc.def, fgetws.def, fputwc.def, fputws.def,
fwide.def, getwc.def, getwchar.def, putwc.def, putwchar.def and
ungetwc.def.
Add header dependency rules for the new files.
* libc/stdio/Makefile.in: Regenerate.
* libc/stdio/fgetwc.c: New file, implementing fgetwc and _fgetwc_r.
* libc/stdio/fgetws.c: New file, implementing fgetws and _fgetws_r.
* libc/stdio/findfp.c (std): Initialize FILE's _mbstate member.
(__sfmoreglue): Ditto.
* libc/stdio/fputs.c (_fputs_r): Set stream orientation.
* libc/stdio/fputwc.c: New file, implementing fputwc and _fputwc_r.
* libc/stdio/fputws.c: New file, implementing fputws and _fputws_r.
* libc/stdio/fread.c (_fread_r): Set stream orientation.
* libc/stdio/freopen.c (_freopen_r): Reset stream orientation. Reset
_mbstate.
* libc/stdio/fseek.c (_fseek_r): Reset _mbstate.
* libc/stdio/fwide.c: New file, implementing fwide and _fwide_r.
* libc/stdio/fwrite.c (_fwrite_r): Set stream orientation.
* libc/stdio/getwc.c: New file, implementing getwc and _getwc_r.
* libc/stdio/getwchar.c: New file, implementing getwchar and
_getwchar_r.
* libc/stdio/local.h (ORIENT): New macro.
* libc/stdio/puts.c (_puts_r): Set stream orientation.
* libc/stdio/putwc.c: New file, implementing putwc and _putwc_r.
* libc/stdio/putwchar.c: New file, implementing putwchar and
_putwchar_r.
* libc/stdio/refill.c (__srefill_r): Set stream orientation.
* libc/stdio/stdio.tex: Add documentation for new functions.
* libc/stdio/ungetc.c (_ungetc_r): Set stream orientation.
* libc/stdio/ungetwc.c: New file, implementing ungetwc and _ungetwc_r.
* libc/stdio/vfscanf.c (__SVFSCANF_R): Set stream orientation.
* libc/stdio/wbuf.c (__swbuf_r): Ditto.
2008-12-11 07:43:12 +08:00
|
|
|
/*-
|
|
|
|
* Copyright (c) 2002-2004 Tim J. Robbins.
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
FUNCTION
|
|
|
|
<<fgetwc>>, <<getwc>>---get a wide character from a file or stream
|
|
|
|
|
|
|
|
INDEX
|
|
|
|
fgetwc
|
|
|
|
INDEX
|
|
|
|
_fgetwc_r
|
|
|
|
INDEX
|
|
|
|
getwc
|
|
|
|
INDEX
|
|
|
|
_getwc_r
|
|
|
|
|
|
|
|
ANSI_SYNOPSIS
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <wchar.h>
|
|
|
|
wint_t fgetwc(FILE *<[fp]>);
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <wchar.h>
|
|
|
|
wint_t _fgetwc_r(struct _reent *<[ptr]>, FILE *<[fp]>);
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <wchar.h>
|
|
|
|
wint_t getwc(FILE *<[fp]>);
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <wchar.h>
|
|
|
|
wint_t _getwc_r(struct _reent *<[ptr]>, FILE *<[fp]>);
|
|
|
|
|
|
|
|
TRAD_SYNOPSIS
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <wchar.h>
|
|
|
|
wint_t fgetwc(<[fp]>)
|
|
|
|
FILE *<[fp]>;
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <wchar.h>
|
|
|
|
wint_t _fgetwc_r(<[ptr]>, <[fp]>)
|
|
|
|
struct _reent *<[ptr]>;
|
|
|
|
FILE *<[fp]>;
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <wchar.h>
|
|
|
|
wint_t getwc(<[fp]>)
|
|
|
|
FILE *<[fp]>;
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <wchar.h>
|
|
|
|
wint_t _getwc_r(<[ptr]>, <[fp]>)
|
|
|
|
struct _reent *<[ptr]>;
|
|
|
|
FILE *<[fp]>;
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
Use <<fgetwc>> to get the next wide character from the file or stream
|
|
|
|
identified by <[fp]>. As a side effect, <<fgetwc>> advances the file's
|
|
|
|
current position indicator.
|
|
|
|
|
|
|
|
The <<getwc>> function or macro functions identically to <<fgetwc>>. It
|
|
|
|
may be implemented as a macro, and may evaluate its argument more than
|
|
|
|
once. There is no reason ever to use it.
|
|
|
|
|
|
|
|
<<_fgetwc_r>> and <<_getwc_r>> are simply reentrant versions of
|
|
|
|
<<fgetwc>> and <<getwc>> that are passed the additional reentrant
|
|
|
|
structure pointer argument: <[ptr]>.
|
|
|
|
|
|
|
|
RETURNS
|
|
|
|
The next wide character cast to <<wint_t>>), unless there is no more data,
|
|
|
|
or the host system reports a read error; in either of these situations,
|
|
|
|
<<fgetwc>> and <<getwc>> return <<WEOF>>.
|
|
|
|
|
|
|
|
You can distinguish the two situations that cause an <<EOF>> result by
|
|
|
|
using the <<ferror>> and <<feof>> functions.
|
|
|
|
|
|
|
|
PORTABILITY
|
|
|
|
C99, POSIX.1-2001
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <_ansi.h>
|
|
|
|
#include <reent.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <wchar.h>
|
|
|
|
#include "local.h"
|
|
|
|
|
|
|
|
static wint_t
|
|
|
|
_DEFUN(__fgetwc, (ptr, fp),
|
|
|
|
struct _reent *ptr _AND
|
|
|
|
register FILE *fp)
|
|
|
|
{
|
|
|
|
wchar_t wc;
|
|
|
|
size_t nconv;
|
|
|
|
|
|
|
|
if (fp->_r <= 0 && __srefill_r (ptr, fp))
|
|
|
|
return (WEOF);
|
|
|
|
if (MB_CUR_MAX == 1)
|
|
|
|
{
|
|
|
|
/* Fast path for single-byte encodings. */
|
|
|
|
wc = *fp->_p++;
|
|
|
|
fp->_r--;
|
|
|
|
return (wc);
|
|
|
|
}
|
|
|
|
do
|
|
|
|
{
|
* libc/include/wchar.h (fwscanf, swscanf, vfwscanf, vswscanf, vwscanf,
wscanf): Declare.
(_fwscanf_r, _swscanf_r, _vfwscanf_r, _vswscanf_r, _vwscanf_r,
_wscanf_r): Declare.
* libc/stdio/Makefile.am: Add new wscanf files.
* libc/stdio/Makefile.in: Regenerate.
* libc/stdio/fwscanf.c: New file.
* libc/stdio/local.h (__svfwscanf_r, __ssvfwscanf_r, __svfiwscanf_r,
__ssvfiwscanf_r): Declare.
* libc/stdio/stdio.tex: Add new documentation references.
* libc/stdio/swscanf.c: New file.
* libc/stdio/vfwscanf.c: New file.
* libc/stdio/vswscanf.c: New file.
* libc/stdio/vwscanf.c: New file.
* libc/stdio/wscanf.c: New file.
* libc/stdio/vfscanf.c (_sungetc_r): Make externaly available. Only
define if INTEGER_ONLY is defined. Declare otherwise.
(__ssrefill_r): Ditto.
(_sfread_r): Ditto.
Remove static eofread/eofread1 functions and use __seofread
function instead, throughout.
* libc/stdio/local.h (__seofread): Declare.
* libc/stdio/stdio.c (__seofread): Define.
* libc/stdio/fgetwc.c (__fgetwc): Fix compiler warning.
* libc/stdio/fgetws.c (_fgetws_r): Ditto.
* libc/stdio/fread.c (_fread_r): Ditto.
* libc/stdio/vfprintf.c: Ditto.
* libc/stdio/vswprintf.c: Ditto.
2009-03-11 19:53:22 +08:00
|
|
|
nconv = _mbrtowc_r (ptr, &wc, (char *) fp->_p, fp->_r, &fp->_mbstate);
|
2008-12-10 Corinna Vinschen <corinna@vinschen.de>
Implement basic wide char stdio functionality, based on FreeBSD.
* libc/include/stdio.h (__SORD): Define.
(__SWID): Define.
* libc/include/wchar.h: Add declarations for new wide char functions.
(getwc): Define as macro.
(getwchar): Ditto.
(putwc): Ditto.
(putwchar): Ditto.
* libc/include/sys/reent.h (struct __sFILE): Add _mbstate member.
(struct __sFILE64): Ditto.
* libc/stdio/Makefile.am (ELIX_4_SOURCES): Add fgetwc.c, fgetws.c,
fputwc.c, fputws.c, fwide.c, getwc.c, getwchar.c, putwc.c, putwchar.c
and ungetwc.c.
(CHEWOUT_FILES): Add fgetwc.def, fgetws.def, fputwc.def, fputws.def,
fwide.def, getwc.def, getwchar.def, putwc.def, putwchar.def and
ungetwc.def.
Add header dependency rules for the new files.
* libc/stdio/Makefile.in: Regenerate.
* libc/stdio/fgetwc.c: New file, implementing fgetwc and _fgetwc_r.
* libc/stdio/fgetws.c: New file, implementing fgetws and _fgetws_r.
* libc/stdio/findfp.c (std): Initialize FILE's _mbstate member.
(__sfmoreglue): Ditto.
* libc/stdio/fputs.c (_fputs_r): Set stream orientation.
* libc/stdio/fputwc.c: New file, implementing fputwc and _fputwc_r.
* libc/stdio/fputws.c: New file, implementing fputws and _fputws_r.
* libc/stdio/fread.c (_fread_r): Set stream orientation.
* libc/stdio/freopen.c (_freopen_r): Reset stream orientation. Reset
_mbstate.
* libc/stdio/fseek.c (_fseek_r): Reset _mbstate.
* libc/stdio/fwide.c: New file, implementing fwide and _fwide_r.
* libc/stdio/fwrite.c (_fwrite_r): Set stream orientation.
* libc/stdio/getwc.c: New file, implementing getwc and _getwc_r.
* libc/stdio/getwchar.c: New file, implementing getwchar and
_getwchar_r.
* libc/stdio/local.h (ORIENT): New macro.
* libc/stdio/puts.c (_puts_r): Set stream orientation.
* libc/stdio/putwc.c: New file, implementing putwc and _putwc_r.
* libc/stdio/putwchar.c: New file, implementing putwchar and
_putwchar_r.
* libc/stdio/refill.c (__srefill_r): Set stream orientation.
* libc/stdio/stdio.tex: Add documentation for new functions.
* libc/stdio/ungetc.c (_ungetc_r): Set stream orientation.
* libc/stdio/ungetwc.c: New file, implementing ungetwc and _ungetwc_r.
* libc/stdio/vfscanf.c (__SVFSCANF_R): Set stream orientation.
* libc/stdio/wbuf.c (__swbuf_r): Ditto.
2008-12-11 07:43:12 +08:00
|
|
|
if (nconv == (size_t)-1)
|
|
|
|
break;
|
|
|
|
else if (nconv == (size_t)-2)
|
|
|
|
continue;
|
|
|
|
else if (nconv == 0)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Assume that the only valid representation of
|
|
|
|
* the null wide character is a single null byte.
|
|
|
|
*/
|
|
|
|
fp->_p++;
|
|
|
|
fp->_r--;
|
|
|
|
return (L'\0');
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fp->_p += nconv;
|
|
|
|
fp->_r -= nconv;
|
|
|
|
return (wc);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while (__srefill_r(ptr, fp) == 0);
|
|
|
|
fp->_flags |= __SERR;
|
|
|
|
errno = EILSEQ;
|
|
|
|
return (WEOF);
|
|
|
|
}
|
|
|
|
|
|
|
|
wint_t
|
|
|
|
_DEFUN(_fgetwc_r, (ptr, fp),
|
|
|
|
struct _reent *ptr _AND
|
|
|
|
register FILE *fp)
|
|
|
|
{
|
|
|
|
wint_t r;
|
|
|
|
|
|
|
|
_flockfile (fp);
|
|
|
|
ORIENT(fp, 1);
|
|
|
|
r = __fgetwc (ptr, fp);
|
|
|
|
_funlockfile (fp);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
wint_t
|
|
|
|
_DEFUN(fgetwc, (fp),
|
|
|
|
FILE *fp)
|
|
|
|
{
|
|
|
|
CHECK_INIT(_REENT, fp);
|
|
|
|
return _fgetwc_r (_REENT, fp);
|
|
|
|
}
|