mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-22 23:17:28 +08:00
bc986b7ff6
The commit 3d94e07c49b5 has a few bugs which cause testsuite failure
in libstdc++. This is due to excess orientation check in __srefill_r()
and _ungetc_r(). Further, sscanf() family also calls ssvfscanf() family
with fp->_file == -1. This causes undesired orientation set/check for
sscanf() family. This patch fixes these problems.
Also, as in GLibC, do not set orientation in ungetc, and only set, but
do not check orientation in ungetwc.
Fixes: 3d94e07c49b5 ("newlib: libc: Fix crash on fprintf to a wide-oriented stream.")
Reported-by: Christophe Lyon <christophe.lyon@linaro.org>
Reported-by: Joel Sherrill <joel@rtems.org>
Co-developed-by: Corinna Vinschen <corinna@vinschen.de>
Signed-off-by: Takashi Yano <takashi.yano@nifty.ne.jp>
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
112 lines
3.0 KiB
C
112 lines
3.0 KiB
C
/*
|
|
* 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,
|
|
* and/or other materials related to such
|
|
* 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
|
|
<<getc>>---read a character (macro)
|
|
|
|
INDEX
|
|
getc
|
|
INDEX
|
|
_getc_r
|
|
|
|
SYNOPSIS
|
|
#include <stdio.h>
|
|
int getc(FILE *<[fp]>);
|
|
|
|
#include <stdio.h>
|
|
int _getc_r(struct _reent *<[ptr]>, FILE *<[fp]>);
|
|
|
|
DESCRIPTION
|
|
<<getc>> is a macro, defined in <<stdio.h>>. You can use <<getc>>
|
|
to get the next single character from the file or stream
|
|
identified by <[fp]>. As a side effect, <<getc>> advances the file's
|
|
current position indicator.
|
|
|
|
For a subroutine version of this macro, see <<fgetc>>.
|
|
|
|
The <<_getc_r>> function is simply the reentrant version of <<getc>>
|
|
which passes an additional reentrancy structure pointer argument: <[ptr]>.
|
|
|
|
RETURNS
|
|
The next character (read as an <<unsigned char>>, and cast to
|
|
<<int>>), unless there is no more data, or the host system reports a
|
|
read error; in either of these situations, <<getc>> returns <<EOF>>.
|
|
|
|
You can distinguish the two situations that cause an <<EOF>> result by
|
|
using the <<ferror>> and <<feof>> functions.
|
|
|
|
PORTABILITY
|
|
ANSI C requires <<getc>>; it suggests, but does not require, that
|
|
<<getc>> be implemented as a macro. The standard explicitly permits
|
|
macro implementations of <<getc>> to use the argument more than once;
|
|
therefore, in a portable program, you should not use an expression
|
|
with side effects as the <<getc>> argument.
|
|
|
|
Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
|
|
<<lseek>>, <<read>>, <<sbrk>>, <<write>>.
|
|
*/
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
static char sccsid[] = "%W% (Berkeley) %G%";
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
#include <_ansi.h>
|
|
#include <stdio.h>
|
|
#include "local.h"
|
|
|
|
/*
|
|
* A subroutine version of the macro getc.
|
|
*/
|
|
|
|
#undef getc
|
|
|
|
int
|
|
_getc_r (struct _reent *ptr,
|
|
register FILE *fp)
|
|
{
|
|
int result;
|
|
CHECK_INIT (ptr, fp);
|
|
if (ORIENT (fp, -1) != -1)
|
|
return EOF;
|
|
|
|
_newlib_flockfile_start (fp);
|
|
result = __sgetc_r (ptr, fp);
|
|
_newlib_flockfile_end (fp);
|
|
return result;
|
|
}
|
|
|
|
#ifndef _REENT_ONLY
|
|
|
|
int
|
|
getc (register FILE *fp)
|
|
{
|
|
int result;
|
|
struct _reent *reent = _REENT;
|
|
|
|
CHECK_INIT (reent, fp);
|
|
if (ORIENT (fp, -1) != -1)
|
|
return EOF;
|
|
|
|
_newlib_flockfile_start (fp);
|
|
result = __sgetc_r (reent, fp);
|
|
_newlib_flockfile_end (fp);
|
|
return result;
|
|
}
|
|
|
|
#endif /* !_REENT_ONLY */
|