* 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
|
|
|
/*-
|
|
|
|
* Copyright (c) 1990 The Regents of the University of California.
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms are permitted
|
|
|
|
* provided that the above copyright notice and this paragraph are
|
|
|
|
* duplicated in all such forms and that any documentation,
|
2020-01-29 02:54:53 +08:00
|
|
|
* and/or other materials related to such
|
* 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
|
|
|
* distribution and use acknowledge that the software was developed
|
|
|
|
* by the University of California, Berkeley. The name of the
|
|
|
|
* University may not be used to endorse or promote products derived
|
|
|
|
* from this software without specific prior written permission.
|
|
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
|
|
|
|
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
|
|
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
FUNCTION
|
|
|
|
<<vfwscanf>>, <<vwscanf>>, <<vswscanf>>---scan and format argument list from wide character input
|
|
|
|
|
|
|
|
INDEX
|
|
|
|
vfwscanf
|
|
|
|
INDEX
|
|
|
|
_vfwscanf
|
|
|
|
INDEX
|
|
|
|
vwscanf
|
|
|
|
INDEX
|
|
|
|
_vwscanf
|
|
|
|
INDEX
|
|
|
|
vswscanf
|
|
|
|
INDEX
|
|
|
|
_vswscanf
|
|
|
|
|
2017-11-30 16:05:02 +08:00
|
|
|
SYNOPSIS
|
* 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
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdarg.h>
|
2013-11-27 01:21:01 +08:00
|
|
|
int vwscanf(const wchar_t *__restrict <[fmt]>, va_list <[list]>);
|
|
|
|
int vfwscanf(FILE *__restrict <[fp]>,
|
|
|
|
const wchar_t *__restrict <[fmt]>, va_list <[list]>);
|
|
|
|
int vswscanf(const wchar_t *__restrict <[str]>,
|
|
|
|
const wchar_t *__restrict <[fmt]>, va_list <[list]>);
|
* 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
|
|
|
|
|
|
|
int _vwscanf(struct _reent *<[reent]>, const wchar_t *<[fmt]>,
|
|
|
|
va_list <[list]>);
|
2013-11-27 01:21:01 +08:00
|
|
|
int _vfwscanf(struct _reent *<[reent]>, FILE *<[fp]>,
|
|
|
|
const wchar_t *<[fmt]>, va_list <[list]>);
|
* 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
|
|
|
int _vswscanf(struct _reent *<[reent]>, const wchar_t *<[str]>,
|
|
|
|
const wchar_t *<[fmt]>, va_list <[list]>);
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
<<vwscanf>>, <<vfwscanf>>, and <<vswscanf>> are (respectively) variants
|
|
|
|
of <<wscanf>>, <<fwscanf>>, and <<swscanf>>. They differ only in
|
|
|
|
allowing their caller to pass the variable argument list as a
|
|
|
|
<<va_list>> object (initialized by <<va_start>>) rather than
|
|
|
|
directly accepting a variable number of arguments.
|
|
|
|
|
|
|
|
RETURNS
|
|
|
|
The return values are consistent with the corresponding functions:
|
|
|
|
<<vwscanf>> returns the number of input fields successfully scanned,
|
|
|
|
converted, and stored; the return value does not include scanned
|
|
|
|
fields which were not stored.
|
|
|
|
|
|
|
|
If <<vwscanf>> attempts to read at end-of-file, the return value
|
|
|
|
is <<EOF>>.
|
|
|
|
|
|
|
|
If no fields were stored, the return value is <<0>>.
|
|
|
|
|
|
|
|
The routines <<_vwscanf>>, <<_vfwscanf>>, and <<_vswscanf>> are
|
|
|
|
reentrant versions which take an additional first parameter which points
|
|
|
|
to the reentrancy structure.
|
|
|
|
|
|
|
|
PORTABILITY
|
|
|
|
C99, POSIX-1.2008
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <_ansi.h>
|
|
|
|
#include <reent.h>
|
|
|
|
#include <newlib.h>
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <wctype.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <limits.h>
|
|
|
|
#include <wchar.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <stdarg.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include "local.h"
|
|
|
|
|
|
|
|
#ifdef INTEGER_ONLY
|
|
|
|
#define VFWSCANF vfiwscanf
|
|
|
|
#define _VFWSCANF_R _vfiwscanf_r
|
|
|
|
#define __SVFWSCANF __svfiwscanf
|
|
|
|
#ifdef STRING_ONLY
|
|
|
|
# define __SVFWSCANF_R __ssvfiwscanf_r
|
|
|
|
#else
|
|
|
|
# define __SVFWSCANF_R __svfiwscanf_r
|
|
|
|
#endif
|
|
|
|
#else
|
|
|
|
#define VFWSCANF vfwscanf
|
|
|
|
#define _VFWSCANF_R _vfwscanf_r
|
|
|
|
#define __SVFWSCANF __svfwscanf
|
|
|
|
#ifdef STRING_ONLY
|
|
|
|
# define __SVFWSCANF_R __ssvfwscanf_r
|
|
|
|
#else
|
|
|
|
# define __SVFWSCANF_R __svfwscanf_r
|
|
|
|
#endif
|
|
|
|
#ifndef NO_FLOATING_POINT
|
|
|
|
#define FLOATING_POINT
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef STRING_ONLY
|
2012-05-30 16:58:42 +08:00
|
|
|
#undef _newlib_flockfile_start
|
|
|
|
#undef _newlib_flockfile_exit
|
|
|
|
#undef _newlib_flockfile_end
|
|
|
|
#define _newlib_flockfile_start(x) {}
|
|
|
|
#define _newlib_flockfile_exit(x) {}
|
|
|
|
#define _newlib_flockfile_end(x) {}
|
* 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
|
|
|
#define _ungetwc_r _sungetwc_r
|
|
|
|
#define __srefill_r __ssrefill_r
|
|
|
|
#define _fgetwc_r _sfgetwc_r
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef FLOATING_POINT
|
|
|
|
#include <math.h>
|
|
|
|
#include <float.h>
|
2013-12-20 02:50:00 +08:00
|
|
|
#include <locale.h>
|
2013-12-19 03:23:33 +08:00
|
|
|
#ifdef __HAVE_LOCALE_INFO_EXTENDED__
|
2016-07-19 22:48:07 +08:00
|
|
|
#include "../locale/setlocale.h"
|
2013-12-19 03:23:33 +08:00
|
|
|
#endif
|
* 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
|
|
|
|
|
|
|
/* Currently a test is made to see if long double processing is warranted.
|
|
|
|
This could be changed in the future should the _ldtoa_r code be
|
|
|
|
preferred over _dtoa_r. */
|
|
|
|
#define _NO_LONGDBL
|
|
|
|
#if defined _WANT_IO_LONG_DOUBLE && (LDBL_MANT_DIG > DBL_MANT_DIG)
|
|
|
|
#undef _NO_LONGDBL
|
2017-12-04 10:41:16 +08:00
|
|
|
extern _LONG_DOUBLE _wcstold_r (wchar_t *s, wchar_t **sptr);
|
* 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
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "floatio.h"
|
|
|
|
|
|
|
|
#if ((MAXEXP+MAXFRACT+3) > MB_LEN_MAX)
|
|
|
|
# define BUF (MAXEXP+MAXFRACT+3) /* 3 = sign + decimal point + NUL */
|
|
|
|
#else
|
|
|
|
# define BUF MB_LEN_MAX
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* An upper bound for how long a long prints in decimal. 4 / 13 approximates
|
|
|
|
log (2). Add one char for roundoff compensation and one for the sign. */
|
|
|
|
#define MAX_LONG_LEN ((CHAR_BIT * sizeof (long) - 1) * 4 / 13 + 2)
|
|
|
|
#else
|
|
|
|
#define BUF 40
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#define _NO_LONGLONG
|
|
|
|
#if defined _WANT_IO_LONG_LONG \
|
|
|
|
&& (defined __GNUC__ || __STDC_VERSION__ >= 199901L)
|
|
|
|
# undef _NO_LONGLONG
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#define _NO_POS_ARGS
|
|
|
|
#ifdef _WANT_IO_POS_ARGS
|
|
|
|
# undef _NO_POS_ARGS
|
|
|
|
# ifdef NL_ARGMAX
|
|
|
|
# define MAX_POS_ARGS NL_ARGMAX
|
|
|
|
# else
|
|
|
|
# define MAX_POS_ARGS 32
|
|
|
|
# endif
|
|
|
|
|
|
|
|
static void * get_arg (int, va_list *, int *, void **);
|
|
|
|
#endif /* _WANT_IO_POS_ARGS */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Flags used during conversion.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define LONG 0x01 /* l: long or double */
|
|
|
|
#define LONGDBL 0x02 /* L/ll: long double or long long */
|
|
|
|
#define SHORT 0x04 /* h: short */
|
|
|
|
#define CHAR 0x08 /* hh: 8 bit integer */
|
|
|
|
#define SUPPRESS 0x10 /* suppress assignment */
|
|
|
|
#define POINTER 0x20 /* weird %p pointer (`fake hex') */
|
|
|
|
#define NOSKIP 0x40 /* do not skip blanks */
|
2017-12-01 04:50:23 +08:00
|
|
|
#define MALLOC 0x80 /* handle 'm' modifier */
|
* 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
|
|
|
|
|
|
|
/*
|
|
|
|
* The following are used in numeric conversions only:
|
|
|
|
* SIGNOK, NDIGITS, DPTOK, and EXPOK are for floating point;
|
|
|
|
* SIGNOK, NDIGITS, PFXOK, and NZDIGITS are for integral.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define SIGNOK 0x80 /* +/- is (still) legal */
|
|
|
|
#define NDIGITS 0x100 /* no digits detected */
|
|
|
|
|
|
|
|
#define DPTOK 0x200 /* (float) decimal point is still legal */
|
|
|
|
#define EXPOK 0x400 /* (float) exponent (e+3, etc) still legal */
|
|
|
|
|
|
|
|
#define PFXOK 0x200 /* 0x prefix is (still) legal */
|
|
|
|
#define NZDIGITS 0x400 /* no zero digits detected */
|
|
|
|
#define HAVESIGN 0x10000 /* sign detected */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Conversion types.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define CT_CHAR 0 /* %c conversion */
|
|
|
|
#define CT_CCL 1 /* %[...] conversion */
|
|
|
|
#define CT_STRING 2 /* %s conversion */
|
|
|
|
#define CT_INT 3 /* integer, i.e., wcstol or wcstoul */
|
|
|
|
#define CT_FLOAT 4 /* floating, i.e., wcstod */
|
|
|
|
|
|
|
|
#define INCCL(_c) \
|
|
|
|
(cclcompl ? (wmemchr(ccls, (_c), ccle - ccls) == NULL) : \
|
|
|
|
(wmemchr(ccls, (_c), ccle - ccls) != NULL))
|
|
|
|
|
|
|
|
/*
|
|
|
|
* vfwscanf
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef STRING_ONLY
|
|
|
|
|
|
|
|
#ifndef _REENT_ONLY
|
|
|
|
|
|
|
|
int
|
2017-12-04 11:43:30 +08:00
|
|
|
VFWSCANF (register FILE *__restrict fp,
|
2017-12-04 10:25:16 +08:00
|
|
|
const wchar_t *__restrict fmt,
|
* 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
|
|
|
va_list ap)
|
|
|
|
{
|
2013-04-30 05:06:23 +08:00
|
|
|
struct _reent *reent = _REENT;
|
|
|
|
|
|
|
|
CHECK_INIT(reent, fp);
|
|
|
|
return __SVFWSCANF_R (reent, fp, fmt, ap);
|
* 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
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2017-12-04 11:43:30 +08:00
|
|
|
__SVFWSCANF (register FILE *fp,
|
2017-12-04 10:25:16 +08:00
|
|
|
wchar_t const *fmt0,
|
* 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
|
|
|
va_list ap)
|
|
|
|
{
|
|
|
|
return __SVFWSCANF_R (_REENT, fp, fmt0, ap);
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* !_REENT_ONLY */
|
|
|
|
|
|
|
|
int
|
2017-12-04 11:43:30 +08:00
|
|
|
_VFWSCANF_R (struct _reent *data,
|
2017-12-04 09:31:41 +08:00
|
|
|
register FILE *fp,
|
2017-12-04 10:25:16 +08:00
|
|
|
const wchar_t *fmt,
|
* 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
|
|
|
va_list ap)
|
|
|
|
{
|
|
|
|
CHECK_INIT(data, fp);
|
|
|
|
return __SVFWSCANF_R (data, fp, fmt, ap);
|
|
|
|
}
|
|
|
|
#endif /* !STRING_ONLY */
|
|
|
|
|
|
|
|
#ifdef STRING_ONLY
|
|
|
|
/* When dealing with the swscanf family, we don't want to use the
|
|
|
|
* regular ungetwc which will drag in file I/O items we don't need.
|
|
|
|
* So, we create our own trimmed-down version. */
|
|
|
|
static wint_t
|
2017-12-04 11:43:30 +08:00
|
|
|
_sungetwc_r (struct _reent *data,
|
2017-12-04 09:31:41 +08:00
|
|
|
wint_t wc,
|
* 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
|
|
|
register FILE *fp)
|
|
|
|
{
|
|
|
|
if (wc == WEOF)
|
|
|
|
return (WEOF);
|
|
|
|
|
|
|
|
/* After ungetc, we won't be at eof anymore */
|
|
|
|
fp->_flags &= ~__SEOF;
|
|
|
|
|
svfwscanf: Simplify _sungetwc_r to eliminate apparent buffer overflow
svfwscanf replaces getwc and ungetwc_r. The comments in the code talk
about avoiding file operations, but they also need to bypass the
mbtowc calls as svfwscanf operates on wchar_t, not multibyte data,
which is a more important reason here; they would not work correctly
otherwise.
The ungetwc replacement has code which uses the 3 byte FILE _ubuf
field, but if wchar_t is 32-bits, this field is not large enough to
hold even one wchar_t value. Building in this mode generates warnings
about array overflow:
In file included from ../../newlib/libc/stdio/svfiwscanf.c:35:
../../newlib/libc/stdio/vfwscanf.c: In function '_sungetwc_r.isra':
../../newlib/libc/stdio/vfwscanf.c:316:12: warning: array subscript 4294967295 is above array bounds of 'unsigned char[3]' [-Warray-bounds]
316 | fp->_p = &fp->_ubuf[sizeof (fp->_ubuf) - sizeof (wchar_t)];
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../../newlib/libc/stdio/stdio.h:46,
from ../../newlib/libc/stdio/vfwscanf.c:82,
from ../../newlib/libc/stdio/svfiwscanf.c:35:
../../newlib/libc/include/sys/reent.h:216:17: note: while referencing '_ubuf'
216 | unsigned char _ubuf[3]; /* guarantee an ungetc() buffer */
| ^~~~~
However, the vfwscanf code *never* ungets data before the start of the
scanning operation, and *always* ungets data which matches the input
at that point, so the code always hits the block which backs up over
the input data and never hits the block which uses the _ubuf field.
In addition, the svfwscanf code will always start with the unget
buffer empty, so the ungetwc replacement never needs to support an
unget buffer at all.
Simplify the code by removing support for everything other than
backing up over the input data, leaving the check to make sure it
doesn't get underflowed in case the vfscanf code has a bug in it.
Signed-off-by: Keith Packard <keithp@keithp.com>
2021-08-18 02:51:52 +08:00
|
|
|
/* All ungetwc usage in scanf un-gets the current character, so
|
|
|
|
* just back up over the string if we aren't at the start
|
* 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
|
|
|
*/
|
svfwscanf: Simplify _sungetwc_r to eliminate apparent buffer overflow
svfwscanf replaces getwc and ungetwc_r. The comments in the code talk
about avoiding file operations, but they also need to bypass the
mbtowc calls as svfwscanf operates on wchar_t, not multibyte data,
which is a more important reason here; they would not work correctly
otherwise.
The ungetwc replacement has code which uses the 3 byte FILE _ubuf
field, but if wchar_t is 32-bits, this field is not large enough to
hold even one wchar_t value. Building in this mode generates warnings
about array overflow:
In file included from ../../newlib/libc/stdio/svfiwscanf.c:35:
../../newlib/libc/stdio/vfwscanf.c: In function '_sungetwc_r.isra':
../../newlib/libc/stdio/vfwscanf.c:316:12: warning: array subscript 4294967295 is above array bounds of 'unsigned char[3]' [-Warray-bounds]
316 | fp->_p = &fp->_ubuf[sizeof (fp->_ubuf) - sizeof (wchar_t)];
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../../newlib/libc/stdio/stdio.h:46,
from ../../newlib/libc/stdio/vfwscanf.c:82,
from ../../newlib/libc/stdio/svfiwscanf.c:35:
../../newlib/libc/include/sys/reent.h:216:17: note: while referencing '_ubuf'
216 | unsigned char _ubuf[3]; /* guarantee an ungetc() buffer */
| ^~~~~
However, the vfwscanf code *never* ungets data before the start of the
scanning operation, and *always* ungets data which matches the input
at that point, so the code always hits the block which backs up over
the input data and never hits the block which uses the _ubuf field.
In addition, the svfwscanf code will always start with the unget
buffer empty, so the ungetwc replacement never needs to support an
unget buffer at all.
Simplify the code by removing support for everything other than
backing up over the input data, leaving the check to make sure it
doesn't get underflowed in case the vfscanf code has a bug in it.
Signed-off-by: Keith Packard <keithp@keithp.com>
2021-08-18 02:51:52 +08:00
|
|
|
if (fp->_bf._base != NULL && fp->_p > fp->_bf._base)
|
* 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
|
|
|
{
|
|
|
|
fp->_p -= sizeof (wchar_t);
|
|
|
|
fp->_r += sizeof (wchar_t);
|
|
|
|
}
|
|
|
|
|
|
|
|
return wc;
|
|
|
|
}
|
|
|
|
|
2017-12-04 10:41:16 +08:00
|
|
|
extern int __ssrefill_r (struct _reent *ptr, register FILE * fp);
|
* 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
|
|
|
|
|
|
|
static size_t
|
2017-12-04 11:43:30 +08:00
|
|
|
_sfgetwc_r (struct _reent * ptr,
|
* 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
|
|
|
FILE * fp)
|
|
|
|
{
|
|
|
|
wchar_t wc;
|
|
|
|
|
|
|
|
if (fp->_r <= 0 && __ssrefill_r (ptr, fp))
|
|
|
|
return (WEOF);
|
|
|
|
wc = *(wchar_t *) fp->_p;
|
|
|
|
fp->_p += sizeof (wchar_t);
|
|
|
|
fp->_r -= sizeof (wchar_t);
|
|
|
|
return (wc);
|
|
|
|
}
|
|
|
|
#endif /* STRING_ONLY */
|
|
|
|
|
|
|
|
int
|
2017-12-04 11:43:30 +08:00
|
|
|
__SVFWSCANF_R (struct _reent *rptr,
|
2017-12-04 09:31:41 +08:00
|
|
|
register FILE *fp,
|
2017-12-04 10:25:16 +08:00
|
|
|
wchar_t const *fmt0,
|
* 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
|
|
|
va_list ap)
|
|
|
|
{
|
|
|
|
register wchar_t *fmt = (wchar_t *) fmt0;
|
|
|
|
register wint_t c; /* character from format, or conversion */
|
|
|
|
register size_t width; /* field width, or 0 */
|
|
|
|
register wchar_t *p = NULL; /* points into all kinds of strings */
|
|
|
|
register int n; /* handy integer */
|
|
|
|
register int flags; /* flags as defined above */
|
|
|
|
register wchar_t *p0; /* saves original value of p when necessary */
|
|
|
|
int nassigned; /* number of fields assigned */
|
|
|
|
int nread; /* number of characters consumed from fp */
|
|
|
|
#ifndef _NO_POS_ARGS
|
|
|
|
int N; /* arg number */
|
|
|
|
int arg_index = 0; /* index into args processed directly */
|
|
|
|
int numargs = 0; /* number of varargs read */
|
|
|
|
void *args[MAX_POS_ARGS]; /* positional args read */
|
|
|
|
int is_pos_arg; /* is current format positional? */
|
|
|
|
#endif
|
|
|
|
int base = 0; /* base argument to wcstol/wcstoul */
|
|
|
|
|
|
|
|
mbstate_t mbs; /* value to keep track of multibyte state */
|
|
|
|
|
2017-12-04 10:41:16 +08:00
|
|
|
#define CCFN_PARAMS (struct _reent *, const wchar_t *, wchar_t **, int)
|
* 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
|
|
|
unsigned long (*ccfn)CCFN_PARAMS=0; /* conversion function (wcstol/wcstoul) */
|
|
|
|
wchar_t buf[BUF]; /* buffer for numeric conversions */
|
|
|
|
const wchar_t *ccls; /* character class start */
|
|
|
|
const wchar_t *ccle; /* character class end */
|
|
|
|
int cclcompl = 0; /* ccl is complemented? */
|
|
|
|
wint_t wi; /* handy wint_t */
|
|
|
|
char *mbp = NULL; /* multibyte string pointer for %c %s %[ */
|
|
|
|
size_t nconv; /* number of bytes in mb. conversion */
|
2017-12-02 00:18:26 +08:00
|
|
|
char mbbuf[MB_LEN_MAX]; /* temporary mb. character buffer */
|
* 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
|
|
|
|
|
|
|
char *cp;
|
|
|
|
short *sp;
|
|
|
|
int *ip;
|
|
|
|
#ifdef FLOATING_POINT
|
|
|
|
float *flp;
|
|
|
|
_LONG_DOUBLE *ldp;
|
|
|
|
double *dp;
|
2013-12-19 03:23:33 +08:00
|
|
|
wchar_t decpt;
|
* 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
|
|
|
#endif
|
|
|
|
long *lp;
|
|
|
|
#ifndef _NO_LONGLONG
|
|
|
|
long long *llp;
|
|
|
|
#endif
|
2017-12-01 04:50:23 +08:00
|
|
|
#ifdef _WANT_IO_C99_FORMATS
|
|
|
|
#define _WANT_IO_POSIX_EXTENSIONS
|
|
|
|
#endif
|
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
|
|
|
/* POSIX requires that fwscanf frees all allocated strings from 'm'
|
|
|
|
conversions in case it returns EOF. m_ptr is used to keep track.
|
|
|
|
It will be allocated on the stack the first time an 'm' conversion
|
|
|
|
takes place, and it will be free'd on return from the function.
|
|
|
|
This implementation tries to save space by only allocating 8
|
|
|
|
pointer slots at a time. Most scenarios should never have to call
|
|
|
|
realloc again. This implementation allows only up to 65528 'm'
|
|
|
|
conversions per fwscanf invocation for now. That should be enough
|
|
|
|
for almost all scenarios, right? */
|
|
|
|
struct m_ptrs {
|
|
|
|
void ***m_arr; /* Array of pointer args to 'm' conversion */
|
|
|
|
uint16_t m_siz; /* Number of slots in m_arr */
|
|
|
|
uint16_t m_cnt; /* Number of valid entries in m_arr */
|
|
|
|
} *m_ptr = NULL;
|
|
|
|
#define init_m_ptr() \
|
|
|
|
do \
|
|
|
|
{ \
|
|
|
|
if (!m_ptr) \
|
|
|
|
{ \
|
|
|
|
m_ptr = (struct m_ptrs *) alloca (sizeof *m_ptr); \
|
|
|
|
m_ptr->m_arr = NULL; \
|
|
|
|
m_ptr->m_siz = 0; \
|
|
|
|
m_ptr->m_cnt = 0; \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
while (0)
|
|
|
|
#define push_m_ptr(arg) \
|
|
|
|
do \
|
|
|
|
{ \
|
|
|
|
if (m_ptr->m_cnt >= m_ptr->m_siz) \
|
|
|
|
{ \
|
|
|
|
void ***n = NULL; \
|
|
|
|
\
|
|
|
|
if (m_ptr->m_siz + 8 > 0 && m_ptr->m_siz + 8 < UINT16_MAX) \
|
|
|
|
n = (void ***) realloc (m_ptr->m_arr, \
|
|
|
|
(m_ptr->m_siz + 8) * \
|
|
|
|
sizeof (void **)); \
|
|
|
|
if (!n) \
|
|
|
|
{ \
|
|
|
|
nassigned = EOF; \
|
|
|
|
goto match_failure; \
|
|
|
|
} \
|
|
|
|
m_ptr->m_arr = n; \
|
|
|
|
m_ptr->m_siz += 8; \
|
|
|
|
} \
|
|
|
|
m_ptr->m_arr[m_ptr->m_cnt++] = (void **) (arg); \
|
|
|
|
} \
|
|
|
|
while (0)
|
|
|
|
#define alloc_m_ptr(_type, _p, _p0, _p_p, _w) \
|
|
|
|
({ \
|
|
|
|
_p_p = GET_ARG (N, ap, _type **); \
|
|
|
|
if (!_p_p) \
|
|
|
|
goto match_failure; \
|
|
|
|
_p0 = (_type *) malloc ((_w) * sizeof (_type)); \
|
|
|
|
if (!_p0) \
|
|
|
|
{ \
|
|
|
|
nassigned = EOF; \
|
|
|
|
goto match_failure; \
|
|
|
|
} \
|
|
|
|
*_p_p = _p0; \
|
|
|
|
push_m_ptr (_p_p); \
|
|
|
|
_p = _p0; \
|
|
|
|
_w; \
|
|
|
|
})
|
2017-12-02 00:18:26 +08:00
|
|
|
/* For char output, check if there's room for at least MB_CUR_MAX
|
|
|
|
characters. */
|
2017-12-01 04:50:23 +08:00
|
|
|
#define realloc_m_ptr(_type, _p, _p0, _p_p, _w) \
|
|
|
|
({ \
|
|
|
|
size_t _nw = (_w); \
|
|
|
|
ptrdiff_t _dif = _p - _p0; \
|
|
|
|
if (_p_p && \
|
|
|
|
((sizeof (_type) == 1 && _dif >= _nw - MB_CUR_MAX) \
|
2017-12-02 00:18:26 +08:00
|
|
|
|| _dif >= _nw)) \
|
2017-12-01 04:50:23 +08:00
|
|
|
{ \
|
|
|
|
_p0 = (_type *) realloc (_p0, (_nw << 1) * sizeof (_type)); \
|
|
|
|
if (!_p0) \
|
|
|
|
{ \
|
|
|
|
nassigned = EOF; \
|
|
|
|
goto match_failure; \
|
|
|
|
} \
|
|
|
|
_p = _p0 + _dif; \
|
|
|
|
*_p_p = _p0; \
|
|
|
|
_nw <<= 1; \
|
|
|
|
} \
|
|
|
|
_nw; \
|
|
|
|
})
|
|
|
|
#define shrink_m_ptr(_type, _p_p, _w, _cw) \
|
|
|
|
({ \
|
|
|
|
size_t _nw = (_w); \
|
|
|
|
if (_p_p && _nw < _cw) \
|
|
|
|
{ \
|
|
|
|
_type *_np_p = (_type *) \
|
|
|
|
realloc (*_p_p, _nw * sizeof (_type)); \
|
|
|
|
if (_np_p) \
|
|
|
|
*_p_p = _np_p; \
|
|
|
|
} \
|
|
|
|
})
|
|
|
|
#define free_m_ptr() \
|
|
|
|
do \
|
|
|
|
{ \
|
|
|
|
if (m_ptr) \
|
|
|
|
{ \
|
|
|
|
if (nassigned == EOF) \
|
|
|
|
{ \
|
|
|
|
int i; \
|
|
|
|
for (i = 0; i < m_ptr->m_cnt; ++i) \
|
|
|
|
{ \
|
|
|
|
free (*m_ptr->m_arr[i]); \
|
|
|
|
*m_ptr->m_arr[i] = NULL; \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
if (m_ptr->m_arr) \
|
|
|
|
free (m_ptr->m_arr); \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
while (0)
|
|
|
|
#endif
|
* 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
|
|
|
|
|
|
|
/* `basefix' is used to avoid `if' tests in the integer scanner */
|
2017-12-04 10:25:16 +08:00
|
|
|
static const short basefix[17] =
|
* 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
|
|
|
{10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
|
|
|
|
|
|
|
|
/* Macro to support positional arguments */
|
|
|
|
#ifndef _NO_POS_ARGS
|
|
|
|
# define GET_ARG(n, ap, type) \
|
|
|
|
((type) (is_pos_arg \
|
|
|
|
? (n < numargs \
|
|
|
|
? args[n] \
|
|
|
|
: get_arg (n, &ap, &numargs, args)) \
|
|
|
|
: (arg_index++ < numargs \
|
|
|
|
? args[n] \
|
|
|
|
: (numargs < MAX_POS_ARGS \
|
|
|
|
? args[numargs++] = va_arg (ap, void *) \
|
|
|
|
: va_arg (ap, void *)))))
|
|
|
|
#else
|
|
|
|
# define GET_ARG(n, ap, type) (va_arg (ap, type))
|
|
|
|
#endif
|
|
|
|
|
2013-12-19 03:23:33 +08:00
|
|
|
#ifdef FLOATING_POINT
|
|
|
|
#ifdef _MB_CAPABLE
|
|
|
|
#ifdef __HAVE_LOCALE_INFO_EXTENDED__
|
|
|
|
decpt = *__get_current_numeric_locale ()->wdecimal_point;
|
|
|
|
#else
|
|
|
|
{
|
|
|
|
size_t nconv;
|
|
|
|
|
2013-12-20 02:50:00 +08:00
|
|
|
memset (&mbs, '\0', sizeof (mbs));
|
|
|
|
nconv = _mbrtowc_r (rptr, &decpt,
|
|
|
|
_localeconv_r (rptr)->decimal_point,
|
|
|
|
MB_CUR_MAX, &mbs);
|
2013-12-19 03:23:33 +08:00
|
|
|
if (nconv == (size_t) -1 || nconv == (size_t) -2)
|
|
|
|
decpt = L'.';
|
|
|
|
}
|
|
|
|
#endif /* !__HAVE_LOCALE_INFO_EXTENDED__ */
|
|
|
|
#else
|
2013-12-20 02:50:00 +08:00
|
|
|
decpt = (wchar_t) *_localeconv_r (rptr)->decimal_point;
|
2013-12-19 03:23:33 +08:00
|
|
|
#endif /* !_MB_CAPABLE */
|
|
|
|
#endif /* FLOATING_POINT */
|
|
|
|
|
2012-05-30 16:58:42 +08:00
|
|
|
_newlib_flockfile_start (fp);
|
* 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
|
|
|
|
|
|
|
ORIENT (fp, 1);
|
|
|
|
|
|
|
|
nassigned = 0;
|
|
|
|
nread = 0;
|
|
|
|
ccls = ccle = NULL;
|
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
c = *fmt++;
|
|
|
|
if (c == L'\0')
|
|
|
|
goto all_done;
|
|
|
|
if (iswspace (c))
|
|
|
|
{
|
|
|
|
while ((c = _fgetwc_r (rptr, fp)) != WEOF && iswspace(c))
|
|
|
|
;
|
|
|
|
if (c != WEOF)
|
|
|
|
_ungetwc_r (rptr, c, fp);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (c != L'%')
|
|
|
|
goto literal;
|
|
|
|
width = 0;
|
|
|
|
flags = 0;
|
|
|
|
#ifndef _NO_POS_ARGS
|
|
|
|
N = arg_index;
|
|
|
|
is_pos_arg = 0;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
* switch on the format. continue if done; break once format
|
|
|
|
* type is derived.
|
|
|
|
*/
|
|
|
|
|
|
|
|
again:
|
|
|
|
c = *fmt++;
|
|
|
|
|
|
|
|
switch (c)
|
|
|
|
{
|
|
|
|
case L'%':
|
|
|
|
literal:
|
|
|
|
if ((wi = _fgetwc_r (rptr, fp)) == WEOF)
|
|
|
|
goto input_failure;
|
|
|
|
if (wi != c)
|
|
|
|
{
|
|
|
|
_ungetwc_r (rptr, wi, fp);
|
|
|
|
goto input_failure;
|
|
|
|
}
|
|
|
|
nread++;
|
|
|
|
continue;
|
|
|
|
|
|
|
|
case L'*':
|
2017-12-01 04:50:23 +08:00
|
|
|
if ((flags & (CHAR | SHORT | LONG | LONGDBL | SUPPRESS | MALLOC))
|
newlib: vf[w]scanf: add validity checks
POSIX requires that directive characters appear in a certain sequence:
1. '%' or '%<n>$'
2. optional '*'
3. optional field width digits
4. optional 'm' (not yet implemented)
5. optional length modifier ('l', 'L', 'll', 'h', 'hh', 'j', 't', 'z')
6. conversion specifier ('d', 's', etc)
Add a few basic validity checks to that effect, otherwise reject
directive as match failure.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
2017-11-30 18:55:27 +08:00
|
|
|
|| width)
|
2019-06-01 16:33:19 +08:00
|
|
|
goto match_failure;
|
* 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
|
|
|
flags |= SUPPRESS;
|
|
|
|
goto again;
|
|
|
|
case L'l':
|
newlib: vf[w]scanf: add validity checks
POSIX requires that directive characters appear in a certain sequence:
1. '%' or '%<n>$'
2. optional '*'
3. optional field width digits
4. optional 'm' (not yet implemented)
5. optional length modifier ('l', 'L', 'll', 'h', 'hh', 'j', 't', 'z')
6. conversion specifier ('d', 's', etc)
Add a few basic validity checks to that effect, otherwise reject
directive as match failure.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
2017-11-30 18:55:27 +08:00
|
|
|
if (flags & (CHAR | SHORT | LONG | LONGDBL))
|
|
|
|
goto match_failure;
|
* 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
|
|
|
#if defined _WANT_IO_C99_FORMATS || !defined _NO_LONGLONG
|
|
|
|
if (*fmt == L'l') /* Check for 'll' = long long (SUSv3) */
|
|
|
|
{
|
|
|
|
++fmt;
|
|
|
|
flags |= LONGDBL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
flags |= LONG;
|
|
|
|
goto again;
|
|
|
|
case L'L':
|
newlib: vf[w]scanf: add validity checks
POSIX requires that directive characters appear in a certain sequence:
1. '%' or '%<n>$'
2. optional '*'
3. optional field width digits
4. optional 'm' (not yet implemented)
5. optional length modifier ('l', 'L', 'll', 'h', 'hh', 'j', 't', 'z')
6. conversion specifier ('d', 's', etc)
Add a few basic validity checks to that effect, otherwise reject
directive as match failure.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
2017-11-30 18:55:27 +08:00
|
|
|
if (flags & (CHAR | SHORT | LONG | LONGDBL))
|
|
|
|
goto match_failure;
|
* 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
|
|
|
flags |= LONGDBL;
|
|
|
|
goto again;
|
|
|
|
case L'h':
|
|
|
|
#ifdef _WANT_IO_C99_FORMATS
|
newlib: vf[w]scanf: add validity checks
POSIX requires that directive characters appear in a certain sequence:
1. '%' or '%<n>$'
2. optional '*'
3. optional field width digits
4. optional 'm' (not yet implemented)
5. optional length modifier ('l', 'L', 'll', 'h', 'hh', 'j', 't', 'z')
6. conversion specifier ('d', 's', etc)
Add a few basic validity checks to that effect, otherwise reject
directive as match failure.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
2017-11-30 18:55:27 +08:00
|
|
|
if (flags & (CHAR | SHORT | LONG | LONGDBL))
|
|
|
|
goto match_failure;
|
* 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
|
|
|
if (*fmt == 'h') /* Check for 'hh' = char int (SUSv3) */
|
|
|
|
{
|
|
|
|
++fmt;
|
|
|
|
flags |= CHAR;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
flags |= SHORT;
|
|
|
|
goto again;
|
|
|
|
#ifdef _WANT_IO_C99_FORMATS
|
|
|
|
case L'j': /* intmax_t */
|
newlib: vf[w]scanf: add validity checks
POSIX requires that directive characters appear in a certain sequence:
1. '%' or '%<n>$'
2. optional '*'
3. optional field width digits
4. optional 'm' (not yet implemented)
5. optional length modifier ('l', 'L', 'll', 'h', 'hh', 'j', 't', 'z')
6. conversion specifier ('d', 's', etc)
Add a few basic validity checks to that effect, otherwise reject
directive as match failure.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
2017-11-30 18:55:27 +08:00
|
|
|
if (flags & (CHAR | SHORT | LONG | LONGDBL))
|
|
|
|
goto match_failure;
|
* 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
|
|
|
if (sizeof (intmax_t) == sizeof (long))
|
|
|
|
flags |= LONG;
|
|
|
|
else
|
|
|
|
flags |= LONGDBL;
|
|
|
|
goto again;
|
|
|
|
case L't': /* ptrdiff_t */
|
newlib: vf[w]scanf: add validity checks
POSIX requires that directive characters appear in a certain sequence:
1. '%' or '%<n>$'
2. optional '*'
3. optional field width digits
4. optional 'm' (not yet implemented)
5. optional length modifier ('l', 'L', 'll', 'h', 'hh', 'j', 't', 'z')
6. conversion specifier ('d', 's', etc)
Add a few basic validity checks to that effect, otherwise reject
directive as match failure.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
2017-11-30 18:55:27 +08:00
|
|
|
if (flags & (CHAR | SHORT | LONG | LONGDBL))
|
|
|
|
goto match_failure;
|
* 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
|
|
|
if (sizeof (ptrdiff_t) < sizeof (int))
|
|
|
|
/* POSIX states ptrdiff_t is 16 or more bits, as
|
|
|
|
is short. */
|
|
|
|
flags |= SHORT;
|
|
|
|
else if (sizeof (ptrdiff_t) == sizeof (int))
|
|
|
|
/* no flag needed */;
|
|
|
|
else if (sizeof (ptrdiff_t) <= sizeof (long))
|
|
|
|
flags |= LONG;
|
|
|
|
else
|
|
|
|
/* POSIX states that at least one programming
|
|
|
|
environment must support ptrdiff_t no wider than
|
|
|
|
long, but that means other environments can
|
|
|
|
have ptrdiff_t as wide as long long. */
|
|
|
|
flags |= LONGDBL;
|
|
|
|
goto again;
|
|
|
|
case L'z': /* size_t */
|
newlib: vf[w]scanf: add validity checks
POSIX requires that directive characters appear in a certain sequence:
1. '%' or '%<n>$'
2. optional '*'
3. optional field width digits
4. optional 'm' (not yet implemented)
5. optional length modifier ('l', 'L', 'll', 'h', 'hh', 'j', 't', 'z')
6. conversion specifier ('d', 's', etc)
Add a few basic validity checks to that effect, otherwise reject
directive as match failure.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
2017-11-30 18:55:27 +08:00
|
|
|
if (flags & (CHAR | SHORT | LONG | LONGDBL))
|
|
|
|
goto match_failure;
|
* 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
|
|
|
if (sizeof (size_t) < sizeof (int))
|
|
|
|
/* POSIX states size_t is 16 or more bits, as is short. */
|
|
|
|
flags |= SHORT;
|
|
|
|
else if (sizeof (size_t) == sizeof (int))
|
|
|
|
/* no flag needed */;
|
|
|
|
else if (sizeof (size_t) <= sizeof (long))
|
|
|
|
flags |= LONG;
|
|
|
|
else
|
|
|
|
/* POSIX states that at least one programming
|
|
|
|
environment must support size_t no wider than
|
|
|
|
long, but that means other environments can
|
|
|
|
have size_t as wide as long long. */
|
|
|
|
flags |= LONGDBL;
|
|
|
|
goto again;
|
|
|
|
#endif /* _WANT_IO_C99_FORMATS */
|
2017-12-01 04:50:23 +08:00
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
|
|
|
case 'm':
|
|
|
|
if (flags & (CHAR | SHORT | LONG | LONGDBL | MALLOC))
|
|
|
|
goto match_failure;
|
|
|
|
init_m_ptr ();
|
|
|
|
flags |= MALLOC;
|
|
|
|
goto again;
|
|
|
|
#endif
|
* 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
|
|
|
|
|
|
|
case L'0':
|
|
|
|
case L'1':
|
|
|
|
case L'2':
|
|
|
|
case L'3':
|
|
|
|
case L'4':
|
|
|
|
case L'5':
|
|
|
|
case L'6':
|
|
|
|
case L'7':
|
|
|
|
case L'8':
|
|
|
|
case L'9':
|
2017-12-01 04:50:23 +08:00
|
|
|
if (flags & (CHAR | SHORT | LONG | LONGDBL | MALLOC))
|
newlib: vf[w]scanf: add validity checks
POSIX requires that directive characters appear in a certain sequence:
1. '%' or '%<n>$'
2. optional '*'
3. optional field width digits
4. optional 'm' (not yet implemented)
5. optional length modifier ('l', 'L', 'll', 'h', 'hh', 'j', 't', 'z')
6. conversion specifier ('d', 's', etc)
Add a few basic validity checks to that effect, otherwise reject
directive as match failure.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
2017-11-30 18:55:27 +08:00
|
|
|
goto match_failure;
|
* 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
|
|
|
width = width * 10 + c - L'0';
|
|
|
|
goto again;
|
|
|
|
|
|
|
|
#ifndef _NO_POS_ARGS
|
|
|
|
case L'$':
|
2017-12-01 04:50:23 +08:00
|
|
|
if (flags & (CHAR | SHORT | LONG | LONGDBL | SUPPRESS | MALLOC))
|
newlib: vf[w]scanf: add validity checks
POSIX requires that directive characters appear in a certain sequence:
1. '%' or '%<n>$'
2. optional '*'
3. optional field width digits
4. optional 'm' (not yet implemented)
5. optional length modifier ('l', 'L', 'll', 'h', 'hh', 'j', 't', 'z')
6. conversion specifier ('d', 's', etc)
Add a few basic validity checks to that effect, otherwise reject
directive as match failure.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
2017-11-30 18:55:27 +08:00
|
|
|
goto match_failure;
|
* 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
|
|
|
if (width <= MAX_POS_ARGS)
|
|
|
|
{
|
|
|
|
N = width - 1;
|
|
|
|
is_pos_arg = 1;
|
|
|
|
width = 0;
|
|
|
|
goto again;
|
|
|
|
}
|
|
|
|
rptr->_errno = EINVAL;
|
|
|
|
goto input_failure;
|
|
|
|
#endif /* !_NO_POS_ARGS */
|
|
|
|
|
|
|
|
case L'd':
|
|
|
|
c = CT_INT;
|
|
|
|
ccfn = (unsigned long (*)CCFN_PARAMS)_wcstol_r;
|
|
|
|
base = 10;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case L'i':
|
|
|
|
c = CT_INT;
|
|
|
|
ccfn = (unsigned long (*)CCFN_PARAMS)_wcstol_r;
|
|
|
|
base = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case L'o':
|
|
|
|
c = CT_INT;
|
|
|
|
ccfn = _wcstoul_r;
|
|
|
|
base = 8;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case L'u':
|
|
|
|
c = CT_INT;
|
|
|
|
ccfn = _wcstoul_r;
|
|
|
|
base = 10;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case L'X':
|
|
|
|
case L'x':
|
|
|
|
flags |= PFXOK; /* enable 0x prefixing */
|
|
|
|
c = CT_INT;
|
|
|
|
ccfn = _wcstoul_r;
|
|
|
|
base = 16;
|
|
|
|
break;
|
|
|
|
|
|
|
|
#ifdef FLOATING_POINT
|
|
|
|
# ifdef _WANT_IO_C99_FORMATS
|
|
|
|
case L'A':
|
|
|
|
case L'a':
|
|
|
|
case L'F':
|
|
|
|
# endif
|
|
|
|
case L'E':
|
|
|
|
case L'G':
|
|
|
|
case L'e':
|
|
|
|
case L'f':
|
|
|
|
case L'g':
|
|
|
|
c = CT_FLOAT;
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef _WANT_IO_C99_FORMATS
|
|
|
|
case L'S':
|
|
|
|
flags |= LONG;
|
|
|
|
/* FALLTHROUGH */
|
|
|
|
#endif
|
|
|
|
|
|
|
|
case L's':
|
|
|
|
c = CT_STRING;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case L'[':
|
|
|
|
if (*fmt == '^')
|
|
|
|
{
|
|
|
|
cclcompl = 1;
|
|
|
|
++fmt;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
cclcompl = 0;
|
2017-12-05 00:05:11 +08:00
|
|
|
ccls = fmt;
|
* 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
|
|
|
if (*fmt == ']')
|
|
|
|
fmt++;
|
|
|
|
while (*fmt != '\0' && *fmt != ']')
|
|
|
|
fmt++;
|
|
|
|
ccle = fmt;
|
|
|
|
fmt++;
|
|
|
|
flags |= NOSKIP;
|
|
|
|
c = CT_CCL;
|
|
|
|
break;
|
|
|
|
|
|
|
|
#ifdef _WANT_IO_C99_FORMATS
|
|
|
|
case 'C':
|
|
|
|
flags |= LONG;
|
|
|
|
/* FALLTHROUGH */
|
|
|
|
#endif
|
|
|
|
|
|
|
|
case 'c':
|
|
|
|
flags |= NOSKIP;
|
|
|
|
c = CT_CHAR;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'p': /* pointer format is like hex */
|
|
|
|
flags |= POINTER | PFXOK;
|
|
|
|
c = CT_INT;
|
|
|
|
ccfn = _wcstoul_r;
|
|
|
|
base = 16;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'n':
|
|
|
|
if (flags & SUPPRESS) /* ??? */
|
|
|
|
continue;
|
|
|
|
#ifdef _WANT_IO_C99_FORMATS
|
|
|
|
if (flags & CHAR)
|
|
|
|
{
|
|
|
|
cp = GET_ARG (N, ap, char *);
|
|
|
|
*cp = nread;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
if (flags & SHORT)
|
|
|
|
{
|
|
|
|
sp = GET_ARG (N, ap, short *);
|
|
|
|
*sp = nread;
|
|
|
|
}
|
|
|
|
else if (flags & LONG)
|
|
|
|
{
|
|
|
|
lp = GET_ARG (N, ap, long *);
|
|
|
|
*lp = nread;
|
|
|
|
}
|
|
|
|
#ifndef _NO_LONGLONG
|
|
|
|
else if (flags & LONGDBL)
|
|
|
|
{
|
|
|
|
llp = GET_ARG (N, ap, long long*);
|
|
|
|
*llp = nread;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ip = GET_ARG (N, ap, int *);
|
|
|
|
*ip = nread;
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
|
2017-11-29 22:01:30 +08:00
|
|
|
default:
|
* 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
|
|
|
goto match_failure;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Consume leading white space, except for formats that
|
|
|
|
* suppress this.
|
|
|
|
*/
|
|
|
|
if ((flags & NOSKIP) == 0)
|
|
|
|
{
|
|
|
|
while ((wi = _fgetwc_r (rptr, fp)) != WEOF && iswspace (wi))
|
|
|
|
nread++;
|
|
|
|
if (wi == WEOF)
|
|
|
|
goto input_failure;
|
|
|
|
_ungetwc_r (rptr, wi, fp);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Do the conversion.
|
|
|
|
*/
|
|
|
|
switch (c)
|
|
|
|
{
|
|
|
|
|
|
|
|
case CT_CHAR:
|
|
|
|
/* scan arbitrary characters (sets NOSKIP) */
|
|
|
|
if (width == 0)
|
|
|
|
width = 1;
|
|
|
|
if (flags & LONG)
|
|
|
|
{
|
2017-12-01 04:50:23 +08:00
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
|
|
|
wchar_t **p_p = NULL;
|
|
|
|
wchar_t *p0 = NULL;
|
2017-12-01 20:47:26 +08:00
|
|
|
size_t p_siz = 0;
|
2017-12-01 04:50:23 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
if (flags & SUPPRESS)
|
|
|
|
;
|
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
|
|
|
else if (flags & MALLOC)
|
2017-12-01 20:47:26 +08:00
|
|
|
p_siz = alloc_m_ptr (wchar_t, p, p0, p_p, 32);
|
2017-12-01 04:50:23 +08:00
|
|
|
#endif
|
|
|
|
else
|
2015-08-04 03:51:16 +08:00
|
|
|
p = GET_ARG(N, ap, wchar_t *);
|
* 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
|
|
|
n = 0;
|
|
|
|
while (width-- != 0 && (wi = _fgetwc_r (rptr, fp)) != WEOF)
|
|
|
|
{
|
|
|
|
if (!(flags & SUPPRESS))
|
2017-12-01 20:47:26 +08:00
|
|
|
{
|
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
|
|
|
/* Check before ++ because we never add a \0 */
|
|
|
|
p_siz = realloc_m_ptr (wchar_t, p, p0, p_p, p_siz);
|
|
|
|
#endif
|
|
|
|
*p++ = (wchar_t) wi;
|
|
|
|
}
|
* 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
|
|
|
n++;
|
|
|
|
}
|
|
|
|
if (n == 0)
|
|
|
|
goto input_failure;
|
|
|
|
nread += n;
|
2017-12-01 04:50:23 +08:00
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
2017-12-01 20:47:26 +08:00
|
|
|
shrink_m_ptr (wchar_t, p_p, p - p0, p_siz);
|
2017-12-01 04:50:23 +08:00
|
|
|
#endif
|
* 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
|
|
|
if (!(flags & SUPPRESS))
|
|
|
|
nassigned++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2017-12-01 04:50:23 +08:00
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
|
|
|
char **mbp_p = NULL;
|
|
|
|
char *mbp0 = NULL;
|
2017-12-01 20:47:26 +08:00
|
|
|
size_t mbp_siz = 0;
|
2017-12-01 04:50:23 +08:00
|
|
|
#endif
|
|
|
|
|
|
|
|
if (flags & SUPPRESS)
|
2017-12-02 00:18:26 +08:00
|
|
|
mbp = mbbuf;
|
2017-12-01 04:50:23 +08:00
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
|
|
|
else if (flags & MALLOC)
|
2017-12-01 20:47:26 +08:00
|
|
|
mbp_siz = alloc_m_ptr (char, mbp, mbp0, mbp_p, 32);
|
2017-12-01 04:50:23 +08:00
|
|
|
#endif
|
|
|
|
else
|
2015-08-04 03:51:16 +08:00
|
|
|
mbp = GET_ARG(N, ap, char *);
|
* 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
|
|
|
n = 0;
|
2017-12-04 10:53:22 +08:00
|
|
|
memset ((void *)&mbs, '\0', sizeof (mbstate_t));
|
2017-12-02 00:18:26 +08:00
|
|
|
while (width != 0 && (wi = _fgetwc_r (rptr, fp)) != WEOF)
|
* 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
|
|
|
{
|
2017-12-02 00:18:26 +08:00
|
|
|
nconv = _wcrtomb_r (rptr, mbp, wi, &mbs);
|
|
|
|
if (nconv == (size_t) -1)
|
|
|
|
goto input_failure;
|
|
|
|
/* Ignore high surrogate in width counting */
|
|
|
|
if (nconv != 0 || mbs.__count != -4)
|
|
|
|
width--;
|
2017-12-01 20:47:26 +08:00
|
|
|
if (!(flags & SUPPRESS))
|
* 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
|
|
|
{
|
2017-12-02 00:18:26 +08:00
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
|
|
|
mbp_siz = realloc_m_ptr (char, mbp, mbp0, mbp_p, mbp_siz);
|
|
|
|
#endif
|
2017-12-01 20:47:26 +08:00
|
|
|
mbp += nconv;
|
* 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
|
|
|
}
|
|
|
|
n++;
|
|
|
|
}
|
|
|
|
if (n == 0)
|
|
|
|
goto input_failure;
|
|
|
|
nread += n;
|
2017-12-01 04:50:23 +08:00
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
2017-12-01 20:47:26 +08:00
|
|
|
shrink_m_ptr (char, mbp_p, mbp - mbp0, mbp_siz);
|
2017-12-01 04:50:23 +08:00
|
|
|
#endif
|
* 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
|
|
|
if (!(flags & SUPPRESS))
|
|
|
|
nassigned++;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case CT_CCL:
|
|
|
|
/* scan a (nonempty) character class (sets NOSKIP) */
|
|
|
|
if (width == 0)
|
2017-11-30 18:40:34 +08:00
|
|
|
width = SIZE_MAX; /* `infinity' */
|
* 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
|
|
|
/* take only those things in the class */
|
|
|
|
if ((flags & SUPPRESS) && (flags & LONG))
|
|
|
|
{
|
|
|
|
n = 0;
|
|
|
|
while ((wi = _fgetwc_r (rptr, fp)) != WEOF
|
|
|
|
&& width-- != 0 && INCCL (wi))
|
|
|
|
n++;
|
|
|
|
if (wi != WEOF)
|
|
|
|
_ungetwc_r (rptr, wi, fp);
|
|
|
|
if (n == 0)
|
|
|
|
goto match_failure;
|
|
|
|
}
|
|
|
|
else if (flags & LONG)
|
|
|
|
{
|
2017-12-01 04:50:23 +08:00
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
|
|
|
wchar_t **p_p = NULL;
|
|
|
|
size_t p_siz = 0;
|
|
|
|
|
|
|
|
if (flags & MALLOC)
|
|
|
|
p_siz = alloc_m_ptr (wchar_t, p, p0, p_p, 32);
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
p0 = p = GET_ARG(N, ap, wchar_t *);
|
* 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
|
|
|
while ((wi = _fgetwc_r (rptr, fp)) != WEOF
|
|
|
|
&& width-- != 0 && INCCL (wi))
|
2017-12-01 04:50:23 +08:00
|
|
|
{
|
|
|
|
*p++ = (wchar_t) wi;
|
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
|
|
|
p_siz = realloc_m_ptr (wchar_t, p, p0, p_p, p_siz);
|
|
|
|
#endif
|
|
|
|
}
|
* 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
|
|
|
if (wi != WEOF)
|
|
|
|
_ungetwc_r (rptr, wi, fp);
|
|
|
|
n = p - p0;
|
|
|
|
if (n == 0)
|
|
|
|
goto match_failure;
|
2015-08-04 03:51:16 +08:00
|
|
|
*p = L'\0';
|
2017-12-01 04:50:23 +08:00
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
|
|
|
shrink_m_ptr (wchar_t, p_p, n + 1, p_siz);
|
|
|
|
#endif
|
2015-08-04 03:51:16 +08:00
|
|
|
nassigned++;
|
* 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
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2017-12-01 04:50:23 +08:00
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
|
|
|
char **mbp_p = NULL;
|
|
|
|
char *mbp0 = NULL;
|
|
|
|
size_t mbp_siz = 0;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (flags & SUPPRESS)
|
2017-12-02 00:18:26 +08:00
|
|
|
mbp = mbbuf;
|
2017-12-01 04:50:23 +08:00
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
|
|
|
else if (flags & MALLOC)
|
|
|
|
mbp_siz = alloc_m_ptr (char, mbp, mbp0, mbp_p, 32);
|
|
|
|
#endif
|
|
|
|
else
|
2015-08-04 03:51:16 +08:00
|
|
|
mbp = GET_ARG(N, ap, char *);
|
* 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
|
|
|
n = 0;
|
2017-12-04 10:53:22 +08:00
|
|
|
memset ((void *) &mbs, '\0', sizeof (mbstate_t));
|
* 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
|
|
|
while ((wi = _fgetwc_r (rptr, fp)) != WEOF
|
2017-12-02 00:18:26 +08:00
|
|
|
&& width != 0 && INCCL (wi))
|
* 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
|
|
|
{
|
2017-12-02 00:18:26 +08:00
|
|
|
nconv = _wcrtomb_r (rptr, mbp, wi, &mbs);
|
|
|
|
if (nconv == (size_t) -1)
|
|
|
|
goto input_failure;
|
|
|
|
/* Ignore high surrogate in width counting */
|
|
|
|
if (nconv != 0 || mbs.__count != -4)
|
|
|
|
width--;
|
2017-12-01 20:47:26 +08:00
|
|
|
if (!(flags & SUPPRESS))
|
* 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
|
|
|
{
|
2017-12-01 20:47:26 +08:00
|
|
|
mbp += nconv;
|
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
|
|
|
mbp_siz = realloc_m_ptr (char, mbp, mbp0, mbp_p, mbp_siz);
|
|
|
|
#endif
|
* 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
|
|
|
}
|
|
|
|
n++;
|
|
|
|
}
|
|
|
|
if (wi != WEOF)
|
|
|
|
_ungetwc_r (rptr, wi, fp);
|
|
|
|
if (!(flags & SUPPRESS))
|
|
|
|
{
|
|
|
|
*mbp = 0;
|
2017-12-01 04:50:23 +08:00
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
|
|
|
shrink_m_ptr (char, mbp_p, mbp - mbp0 + 1, mbp_siz);
|
|
|
|
#endif
|
* 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
|
|
|
nassigned++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
nread += n;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case CT_STRING:
|
|
|
|
/* like CCL, but zero-length string OK, & no NOSKIP */
|
|
|
|
if (width == 0)
|
2017-11-30 18:40:34 +08:00
|
|
|
width = SIZE_MAX;
|
* 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
|
|
|
if ((flags & SUPPRESS) && (flags & LONG))
|
|
|
|
{
|
|
|
|
while ((wi = _fgetwc_r (rptr, fp)) != WEOF
|
|
|
|
&& width-- != 0 && !iswspace (wi))
|
|
|
|
nread++;
|
|
|
|
if (wi != WEOF)
|
|
|
|
_ungetwc_r (rptr, wi, fp);
|
|
|
|
}
|
|
|
|
else if (flags & LONG)
|
|
|
|
{
|
2017-12-01 04:50:23 +08:00
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
|
|
|
wchar_t **p_p = NULL;
|
|
|
|
size_t p_siz = 0;
|
|
|
|
|
|
|
|
if (flags & MALLOC)
|
|
|
|
p_siz = alloc_m_ptr (wchar_t, p, p0, p_p, 32);
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
p0 = p = GET_ARG(N, ap, wchar_t *);
|
* 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
|
|
|
while ((wi = _fgetwc_r (rptr, fp)) != WEOF
|
|
|
|
&& width-- != 0 && !iswspace (wi))
|
|
|
|
{
|
|
|
|
*p++ = (wchar_t) wi;
|
2017-12-01 04:50:23 +08:00
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
|
|
|
p_siz = realloc_m_ptr (wchar_t, p, p0, p_p, p_siz);
|
|
|
|
#endif
|
2017-12-01 20:47:26 +08:00
|
|
|
nread++;
|
* 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
|
|
|
}
|
|
|
|
if (wi != WEOF)
|
|
|
|
_ungetwc_r (rptr, wi, fp);
|
2015-08-04 03:51:16 +08:00
|
|
|
*p = L'\0';
|
2017-12-01 04:50:23 +08:00
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
|
|
|
shrink_m_ptr (wchar_t, p_p, p - p0 + 1, p_siz);
|
|
|
|
#endif
|
* 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
|
|
|
nassigned++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2017-12-01 04:50:23 +08:00
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
|
|
|
char **mbp_p = NULL;
|
|
|
|
char *mbp0 = NULL;
|
|
|
|
size_t mbp_siz = 0;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (flags & SUPPRESS)
|
2017-12-02 00:18:26 +08:00
|
|
|
mbp = mbbuf;
|
2017-12-01 04:50:23 +08:00
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
|
|
|
else if (flags & MALLOC)
|
|
|
|
mbp_siz = alloc_m_ptr (char, mbp, mbp0, mbp_p, 32);
|
|
|
|
#endif
|
|
|
|
else
|
2015-08-04 03:51:16 +08:00
|
|
|
mbp = GET_ARG(N, ap, char *);
|
2017-12-04 10:53:22 +08:00
|
|
|
memset ((void *) &mbs, '\0', sizeof (mbstate_t));
|
* 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
|
|
|
while ((wi = _fgetwc_r (rptr, fp)) != WEOF
|
2017-12-02 00:18:26 +08:00
|
|
|
&& width != 0 && !iswspace (wi))
|
* 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
|
|
|
{
|
2017-12-02 00:18:26 +08:00
|
|
|
nconv = wcrtomb(mbp, wi, &mbs);
|
|
|
|
if (nconv == (size_t)-1)
|
|
|
|
goto input_failure;
|
|
|
|
/* Ignore high surrogate in width counting */
|
|
|
|
if (nconv != 0 || mbs.__count != -4)
|
|
|
|
width--;
|
2017-12-01 20:47:26 +08:00
|
|
|
if (!(flags & SUPPRESS))
|
* 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
|
|
|
{
|
2017-12-01 20:47:26 +08:00
|
|
|
mbp += nconv;
|
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
|
|
|
mbp_siz = realloc_m_ptr (char, mbp, mbp0, mbp_p, mbp_siz);
|
|
|
|
#endif
|
* 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
|
|
|
}
|
|
|
|
nread++;
|
|
|
|
}
|
|
|
|
if (wi != WEOF)
|
|
|
|
_ungetwc_r (rptr, wi, fp);
|
|
|
|
if (!(flags & SUPPRESS))
|
|
|
|
{
|
|
|
|
*mbp = 0;
|
2017-12-01 04:50:23 +08:00
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
|
|
|
shrink_m_ptr (char, mbp_p, mbp - mbp0 + 1, mbp_siz);
|
|
|
|
#endif
|
* 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
|
|
|
nassigned++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
|
|
|
|
case CT_INT:
|
|
|
|
{
|
|
|
|
/* scan an integer as if by wcstol/wcstoul */
|
|
|
|
if (width == 0 || width > sizeof (buf) / sizeof (*buf) - 1)
|
|
|
|
width = sizeof(buf) / sizeof (*buf) - 1;
|
|
|
|
flags |= SIGNOK | NDIGITS | NZDIGITS;
|
|
|
|
for (p = buf; width; width--)
|
|
|
|
{
|
|
|
|
c = _fgetwc_r (rptr, fp);
|
|
|
|
/*
|
|
|
|
* Switch on the character; `goto ok' if we
|
|
|
|
* accept it as a part of number.
|
|
|
|
*/
|
|
|
|
switch (c)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* The digit 0 is always legal, but is special.
|
|
|
|
* For %i conversions, if no digits (zero or nonzero)
|
|
|
|
* have been scanned (only signs), we will have base==0.
|
|
|
|
* In that case, we should set it to 8 and enable 0x
|
|
|
|
* prefixing. Also, if we have not scanned zero digits
|
|
|
|
* before this, do not turn off prefixing (someone else
|
|
|
|
* will turn it off if we have scanned any nonzero digits).
|
|
|
|
*/
|
|
|
|
case L'0':
|
|
|
|
if (base == 0)
|
|
|
|
{
|
|
|
|
base = 8;
|
|
|
|
flags |= PFXOK;
|
|
|
|
}
|
|
|
|
if (flags & NZDIGITS)
|
|
|
|
flags &= ~(SIGNOK | NZDIGITS | NDIGITS);
|
|
|
|
else
|
|
|
|
flags &= ~(SIGNOK | PFXOK | NDIGITS);
|
|
|
|
goto ok;
|
|
|
|
|
|
|
|
/* 1 through 7 always legal */
|
|
|
|
case L'1':
|
|
|
|
case L'2':
|
|
|
|
case L'3':
|
|
|
|
case L'4':
|
|
|
|
case L'5':
|
|
|
|
case L'6':
|
|
|
|
case L'7':
|
|
|
|
base = basefix[base];
|
|
|
|
flags &= ~(SIGNOK | PFXOK | NDIGITS);
|
|
|
|
goto ok;
|
|
|
|
|
|
|
|
/* digits 8 and 9 ok iff decimal or hex */
|
|
|
|
case L'8':
|
|
|
|
case L'9':
|
|
|
|
base = basefix[base];
|
|
|
|
if (base <= 8)
|
|
|
|
break; /* not legal here */
|
|
|
|
flags &= ~(SIGNOK | PFXOK | NDIGITS);
|
|
|
|
goto ok;
|
|
|
|
|
|
|
|
/* letters ok iff hex */
|
|
|
|
case L'A':
|
|
|
|
case L'B':
|
|
|
|
case L'C':
|
|
|
|
case L'D':
|
|
|
|
case L'E':
|
|
|
|
case L'F':
|
|
|
|
case L'a':
|
|
|
|
case L'b':
|
|
|
|
case L'c':
|
|
|
|
case L'd':
|
|
|
|
case L'e':
|
|
|
|
case L'f':
|
|
|
|
/* no need to fix base here */
|
|
|
|
if (base <= 10)
|
|
|
|
break; /* not legal here */
|
|
|
|
flags &= ~(SIGNOK | PFXOK | NDIGITS);
|
|
|
|
goto ok;
|
|
|
|
|
|
|
|
/* sign ok only as first character */
|
|
|
|
case L'+':
|
|
|
|
case L'-':
|
|
|
|
if (flags & SIGNOK)
|
|
|
|
{
|
|
|
|
flags &= ~SIGNOK;
|
|
|
|
flags |= HAVESIGN;
|
|
|
|
goto ok;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* x ok iff flag still set & single 0 seen */
|
|
|
|
case L'x':
|
|
|
|
case L'X':
|
|
|
|
if ((flags & PFXOK) && p == buf + 1 + !!(flags & HAVESIGN))
|
|
|
|
{
|
|
|
|
base = 16;/* if %i */
|
|
|
|
flags &= ~PFXOK;
|
|
|
|
goto ok;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we got here, c is not a legal character
|
|
|
|
* for a number. Stop accumulating digits.
|
|
|
|
*/
|
|
|
|
if (c != WEOF)
|
|
|
|
_ungetwc_r (rptr, c, fp);
|
|
|
|
break;
|
|
|
|
ok:
|
|
|
|
/*
|
|
|
|
* c is legal: store it and look at the next.
|
|
|
|
*/
|
|
|
|
*p++ = (wchar_t) c;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* If we had only a sign, it is no good; push back the sign.
|
|
|
|
* If the number ends in `x', it was [sign] '0' 'x', so push back
|
|
|
|
* the x and treat it as [sign] '0'.
|
|
|
|
* Use of ungetc here and below assumes ASCII encoding; we are only
|
|
|
|
* pushing back 7-bit characters, so casting to unsigned char is
|
|
|
|
* not necessary.
|
|
|
|
*/
|
|
|
|
if (flags & NDIGITS)
|
|
|
|
{
|
|
|
|
if (p > buf)
|
|
|
|
_ungetwc_r (rptr, *--p, fp); /* [-+xX] */
|
|
|
|
goto match_failure;
|
|
|
|
}
|
|
|
|
c = p[-1];
|
|
|
|
if (c == L'x' || c == L'X')
|
|
|
|
{
|
|
|
|
--p;
|
|
|
|
_ungetwc_r (rptr, c, fp);
|
|
|
|
}
|
|
|
|
if ((flags & SUPPRESS) == 0)
|
|
|
|
{
|
|
|
|
unsigned long res;
|
|
|
|
|
|
|
|
*p = 0;
|
|
|
|
res = (*ccfn) (rptr, buf, (wchar_t **) NULL, base);
|
|
|
|
if (flags & POINTER)
|
|
|
|
{
|
|
|
|
void **vp = GET_ARG (N, ap, void **);
|
|
|
|
#ifndef _NO_LONGLONG
|
|
|
|
if (sizeof (uintptr_t) > sizeof (unsigned long))
|
|
|
|
{
|
|
|
|
unsigned long long resll;
|
|
|
|
resll = _wcstoull_r (rptr, buf, (wchar_t **) NULL, base);
|
|
|
|
*vp = (void *) (uintptr_t) resll;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif /* !_NO_LONGLONG */
|
|
|
|
*vp = (void *) (uintptr_t) res;
|
|
|
|
}
|
|
|
|
#ifdef _WANT_IO_C99_FORMATS
|
|
|
|
else if (flags & CHAR)
|
|
|
|
{
|
|
|
|
cp = GET_ARG (N, ap, char *);
|
|
|
|
*cp = res;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
else if (flags & SHORT)
|
|
|
|
{
|
|
|
|
sp = GET_ARG (N, ap, short *);
|
|
|
|
*sp = res;
|
|
|
|
}
|
|
|
|
else if (flags & LONG)
|
|
|
|
{
|
|
|
|
lp = GET_ARG (N, ap, long *);
|
|
|
|
*lp = res;
|
|
|
|
}
|
|
|
|
#ifndef _NO_LONGLONG
|
|
|
|
else if (flags & LONGDBL)
|
|
|
|
{
|
|
|
|
unsigned long long resll;
|
|
|
|
if (ccfn == _wcstoul_r)
|
|
|
|
resll = _wcstoull_r (rptr, buf, (wchar_t **) NULL, base);
|
|
|
|
else
|
|
|
|
resll = _wcstoll_r (rptr, buf, (wchar_t **) NULL, base);
|
|
|
|
llp = GET_ARG (N, ap, long long*);
|
|
|
|
*llp = resll;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ip = GET_ARG (N, ap, int *);
|
|
|
|
*ip = res;
|
|
|
|
}
|
|
|
|
nassigned++;
|
|
|
|
}
|
|
|
|
nread += p - buf;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
#ifdef FLOATING_POINT
|
|
|
|
case CT_FLOAT:
|
|
|
|
{
|
|
|
|
/* scan a floating point number as if by wcstod */
|
|
|
|
/* This code used to assume that the number of digits is reasonable.
|
|
|
|
However, ANSI / ISO C makes no such stipulation; we have to get
|
|
|
|
exact results even when there is an unreasonable amount of
|
|
|
|
leading zeroes. */
|
|
|
|
long leading_zeroes = 0;
|
|
|
|
long zeroes, exp_adjust;
|
|
|
|
wchar_t *exp_start = NULL;
|
|
|
|
unsigned width_left = 0;
|
|
|
|
char nancount = 0;
|
|
|
|
char infcount = 0;
|
|
|
|
#ifdef hardway
|
2016-10-23 03:43:28 +08:00
|
|
|
if (width == 0 || width > sizeof (buf) / sizeof (*buf) - 1)
|
* 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
|
|
|
#else
|
|
|
|
/* size_t is unsigned, hence this optimisation */
|
2016-10-23 03:43:28 +08:00
|
|
|
if (width - 1 > sizeof (buf) / sizeof (*buf) - 2)
|
* 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
|
|
|
#endif
|
|
|
|
{
|
2016-10-23 03:43:28 +08:00
|
|
|
width_left = width - (sizeof (buf) / sizeof (*buf) - 1);
|
|
|
|
width = sizeof (buf) / sizeof (*buf) - 1;
|
* 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
|
|
|
}
|
|
|
|
flags |= SIGNOK | NDIGITS | DPTOK | EXPOK;
|
|
|
|
zeroes = 0;
|
|
|
|
exp_adjust = 0;
|
|
|
|
for (p = buf; width; )
|
|
|
|
{
|
|
|
|
c = _fgetwc_r (rptr, fp);
|
|
|
|
/*
|
|
|
|
* This code mimicks the integer conversion
|
|
|
|
* code, but is much simpler.
|
|
|
|
*/
|
|
|
|
switch (c)
|
|
|
|
{
|
|
|
|
case L'0':
|
|
|
|
if (flags & NDIGITS)
|
|
|
|
{
|
|
|
|
flags &= ~SIGNOK;
|
|
|
|
zeroes++;
|
|
|
|
if (width_left)
|
|
|
|
{
|
|
|
|
width_left--;
|
|
|
|
width++;
|
|
|
|
}
|
|
|
|
goto fskip;
|
|
|
|
}
|
|
|
|
/* Fall through. */
|
|
|
|
case L'1':
|
|
|
|
case L'2':
|
|
|
|
case L'3':
|
|
|
|
case L'4':
|
|
|
|
case L'5':
|
|
|
|
case L'6':
|
|
|
|
case L'7':
|
|
|
|
case L'8':
|
|
|
|
case L'9':
|
|
|
|
if (nancount + infcount == 0)
|
|
|
|
{
|
|
|
|
flags &= ~(SIGNOK | NDIGITS);
|
|
|
|
goto fok;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case L'+':
|
|
|
|
case L'-':
|
|
|
|
if (flags & SIGNOK)
|
|
|
|
{
|
|
|
|
flags &= ~SIGNOK;
|
|
|
|
goto fok;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case L'n':
|
|
|
|
case L'N':
|
|
|
|
if (nancount == 0 && zeroes == 0
|
|
|
|
&& (flags & (NDIGITS | DPTOK | EXPOK)) ==
|
|
|
|
(NDIGITS | DPTOK | EXPOK))
|
|
|
|
{
|
|
|
|
flags &= ~(SIGNOK | DPTOK | EXPOK | NDIGITS);
|
|
|
|
nancount = 1;
|
|
|
|
goto fok;
|
|
|
|
}
|
|
|
|
if (nancount == 2)
|
|
|
|
{
|
|
|
|
nancount = 3;
|
|
|
|
goto fok;
|
|
|
|
}
|
|
|
|
if (infcount == 1 || infcount == 4)
|
|
|
|
{
|
|
|
|
infcount++;
|
|
|
|
goto fok;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case L'a':
|
|
|
|
case L'A':
|
|
|
|
if (nancount == 1)
|
|
|
|
{
|
|
|
|
nancount = 2;
|
|
|
|
goto fok;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case L'i':
|
|
|
|
if (infcount == 0 && zeroes == 0
|
|
|
|
&& (flags & (NDIGITS | DPTOK | EXPOK)) ==
|
|
|
|
(NDIGITS | DPTOK | EXPOK))
|
|
|
|
{
|
|
|
|
flags &= ~(SIGNOK | DPTOK | EXPOK | NDIGITS);
|
|
|
|
infcount = 1;
|
|
|
|
goto fok;
|
|
|
|
}
|
|
|
|
if (infcount == 3 || infcount == 5)
|
|
|
|
{
|
|
|
|
infcount++;
|
|
|
|
goto fok;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case L'f':
|
|
|
|
case L'F':
|
|
|
|
if (infcount == 2)
|
|
|
|
{
|
|
|
|
infcount = 3;
|
|
|
|
goto fok;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case L't':
|
|
|
|
case L'T':
|
|
|
|
if (infcount == 6)
|
|
|
|
{
|
|
|
|
infcount = 7;
|
|
|
|
goto fok;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case L'y':
|
|
|
|
case L'Y':
|
|
|
|
if (infcount == 7)
|
|
|
|
{
|
|
|
|
infcount = 8;
|
|
|
|
goto fok;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case L'e':
|
|
|
|
case L'E':
|
|
|
|
/* no exponent without some digits */
|
|
|
|
if ((flags & (NDIGITS | EXPOK)) == EXPOK
|
|
|
|
|| ((flags & EXPOK) && zeroes))
|
|
|
|
{
|
|
|
|
if (! (flags & DPTOK))
|
|
|
|
{
|
|
|
|
exp_adjust = zeroes - leading_zeroes;
|
|
|
|
exp_start = p;
|
|
|
|
}
|
|
|
|
flags =
|
|
|
|
(flags & ~(EXPOK | DPTOK)) |
|
|
|
|
SIGNOK | NDIGITS;
|
|
|
|
zeroes = 0;
|
|
|
|
goto fok;
|
|
|
|
}
|
|
|
|
break;
|
2013-12-19 03:23:33 +08:00
|
|
|
default:
|
|
|
|
if ((wchar_t) c == decpt && (flags & DPTOK))
|
|
|
|
{
|
|
|
|
flags &= ~(SIGNOK | DPTOK);
|
|
|
|
leading_zeroes = zeroes;
|
|
|
|
goto fok;
|
|
|
|
}
|
|
|
|
break;
|
* 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
|
|
|
}
|
|
|
|
if (c != WEOF)
|
|
|
|
_ungetwc_r (rptr, c, fp);
|
|
|
|
break;
|
|
|
|
fok:
|
|
|
|
*p++ = c;
|
|
|
|
fskip:
|
|
|
|
width--;
|
|
|
|
++nread;
|
|
|
|
}
|
|
|
|
if (zeroes)
|
|
|
|
flags &= ~NDIGITS;
|
|
|
|
/* We may have a 'N' or possibly even [sign] 'N' 'a' as the
|
|
|
|
start of 'NaN', only to run out of chars before it was
|
|
|
|
complete (or having encountered a non-matching char). So
|
|
|
|
check here if we have an outstanding nancount, and if so
|
|
|
|
put back the chars we did swallow and treat as a failed
|
|
|
|
match.
|
|
|
|
|
|
|
|
FIXME - we still don't handle NAN([0xdigits]). */
|
|
|
|
if (nancount - 1U < 2U) /* nancount && nancount < 3 */
|
|
|
|
{
|
|
|
|
/* Newlib's ungetc works even if we called __srefill in
|
|
|
|
the middle of a partial parse, but POSIX does not
|
|
|
|
guarantee that in all implementations of ungetc. */
|
|
|
|
while (p > buf)
|
|
|
|
{
|
|
|
|
_ungetwc_r (rptr, *--p, fp); /* [-+nNaA] */
|
|
|
|
--nread;
|
|
|
|
}
|
|
|
|
goto match_failure;
|
|
|
|
}
|
|
|
|
/* Likewise for 'inf' and 'infinity'. But be careful that
|
|
|
|
'infinite' consumes only 3 characters, leaving the stream
|
|
|
|
at the second 'i'. */
|
|
|
|
if (infcount - 1U < 7U) /* infcount && infcount < 8 */
|
|
|
|
{
|
|
|
|
if (infcount >= 3) /* valid 'inf', but short of 'infinity' */
|
|
|
|
while (infcount-- > 3)
|
|
|
|
{
|
|
|
|
_ungetwc_r (rptr, *--p, fp); /* [iInNtT] */
|
|
|
|
--nread;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
while (p > buf)
|
|
|
|
{
|
|
|
|
_ungetwc_r (rptr, *--p, fp); /* [-+iInN] */
|
|
|
|
--nread;
|
|
|
|
}
|
|
|
|
goto match_failure;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* If no digits, might be missing exponent digits
|
|
|
|
* (just give back the exponent) or might be missing
|
|
|
|
* regular digits, but had sign and/or decimal point.
|
|
|
|
*/
|
|
|
|
if (flags & NDIGITS)
|
|
|
|
{
|
|
|
|
if (flags & EXPOK)
|
|
|
|
{
|
|
|
|
/* no digits at all */
|
|
|
|
while (p > buf)
|
|
|
|
{
|
|
|
|
_ungetwc_r (rptr, *--p, fp); /* [-+.] */
|
|
|
|
--nread;
|
|
|
|
}
|
|
|
|
goto match_failure;
|
|
|
|
}
|
|
|
|
/* just a bad exponent (e and maybe sign) */
|
|
|
|
c = *--p;
|
|
|
|
--nread;
|
|
|
|
if (c != L'e' && c != L'E')
|
|
|
|
{
|
|
|
|
_ungetwc_r (rptr, c, fp); /* [-+] */
|
|
|
|
c = *--p;
|
|
|
|
--nread;
|
|
|
|
}
|
|
|
|
_ungetwc_r (rptr, c, fp); /* [eE] */
|
|
|
|
}
|
|
|
|
if ((flags & SUPPRESS) == 0)
|
|
|
|
{
|
|
|
|
double res = 0;
|
|
|
|
#ifdef _NO_LONGDBL
|
|
|
|
#define QUAD_RES res;
|
|
|
|
#else /* !_NO_LONG_DBL */
|
|
|
|
long double qres = 0;
|
|
|
|
#define QUAD_RES qres;
|
|
|
|
#endif /* !_NO_LONG_DBL */
|
|
|
|
long new_exp = 0;
|
|
|
|
|
|
|
|
*p = 0;
|
|
|
|
if ((flags & (DPTOK | EXPOK)) == EXPOK)
|
|
|
|
{
|
|
|
|
exp_adjust = zeroes - leading_zeroes;
|
|
|
|
new_exp = -exp_adjust;
|
|
|
|
exp_start = p;
|
|
|
|
}
|
|
|
|
else if (exp_adjust)
|
|
|
|
new_exp = _wcstol_r (rptr, (exp_start + 1), NULL, 10) - exp_adjust;
|
|
|
|
if (exp_adjust)
|
|
|
|
{
|
|
|
|
|
|
|
|
/* If there might not be enough space for the new exponent,
|
|
|
|
truncate some trailing digits to make room. */
|
2016-10-23 03:43:28 +08:00
|
|
|
if (exp_start >= buf + sizeof (buf) / sizeof (*buf)
|
|
|
|
- MAX_LONG_LEN)
|
|
|
|
exp_start = buf + sizeof (buf) / sizeof (*buf)
|
|
|
|
- MAX_LONG_LEN - 1;
|
* 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
|
|
|
swprintf (exp_start, MAX_LONG_LEN, L"e%ld", new_exp);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* FIXME: We don't have wcstold yet. */
|
|
|
|
#if 0//ndef _NO_LONGDBL /* !_NO_LONGDBL */
|
|
|
|
if (flags & LONGDBL)
|
|
|
|
qres = _wcstold_r (rptr, buf, NULL);
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
res = _wcstod_r (rptr, buf, NULL);
|
|
|
|
|
|
|
|
if (flags & LONG)
|
|
|
|
{
|
|
|
|
dp = GET_ARG (N, ap, double *);
|
|
|
|
*dp = res;
|
|
|
|
}
|
|
|
|
else if (flags & LONGDBL)
|
|
|
|
{
|
|
|
|
ldp = GET_ARG (N, ap, _LONG_DOUBLE *);
|
|
|
|
*ldp = QUAD_RES;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
flp = GET_ARG (N, ap, float *);
|
|
|
|
if (isnan (res))
|
2018-08-28 02:32:28 +08:00
|
|
|
*flp = nanf ("");
|
* 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
|
|
|
else
|
|
|
|
*flp = res;
|
|
|
|
}
|
|
|
|
nassigned++;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
#endif /* FLOATING_POINT */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
input_failure:
|
|
|
|
/* On read failure, return EOF failure regardless of matches; errno
|
|
|
|
should have been set prior to here. On EOF failure (including
|
|
|
|
invalid format string), return EOF if no matches yet, else number
|
|
|
|
of matches made prior to failure. */
|
2017-11-30 18:36:04 +08:00
|
|
|
nassigned = nassigned && !(fp->_flags & __SERR) ? nassigned : EOF;
|
* 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
|
|
|
match_failure:
|
|
|
|
all_done:
|
|
|
|
/* Return number of matches, which can be 0 on match failure. */
|
2012-05-30 16:58:42 +08:00
|
|
|
_newlib_flockfile_end (fp);
|
2017-12-01 04:50:23 +08:00
|
|
|
#ifdef _WANT_IO_POSIX_EXTENSIONS
|
|
|
|
free_m_ptr ();
|
|
|
|
#endif
|
* 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
|
|
|
return nassigned;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifndef _NO_POS_ARGS
|
|
|
|
/* Process all intermediate arguments. Fortunately, with wscanf, all
|
|
|
|
intermediate arguments are sizeof(void*), so we don't need to scan
|
|
|
|
ahead in the format string. */
|
|
|
|
static void *
|
|
|
|
get_arg (int n, va_list *ap, int *numargs_p, void **args)
|
|
|
|
{
|
|
|
|
int numargs = *numargs_p;
|
|
|
|
while (n >= numargs)
|
|
|
|
args[numargs++] = va_arg (*ap, void *);
|
|
|
|
*numargs_p = numargs;
|
|
|
|
return args[n];
|
|
|
|
}
|
|
|
|
#endif /* !_NO_POS_ARGS */
|