OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update. 

2002-07-11  Ulrich Drepper  <drepper@redhat.com>

	* stdio-common/vfscanf.c (inchar): Restore errno from previous
	underflow operation if c == (W)EOF.
This commit is contained in:
Ulrich Drepper 2002-07-11 08:33:33 +00:00
parent 52e1b618f4
commit 7d68a8ec67
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2002-07-11 Ulrich Drepper <drepper@redhat.com>
* stdio-common/vfscanf.c (inchar): Restore errno from previous
underflow operation if c == (W)EOF.
2002-07-03 Jakub Jelinek <jakub@redhat.com>
* stdio-common/printf_fp.c (__printf_fp.c): If _FPIO_CONST_SHIFT is

12
stdio-common/vfscanf.c
View File

@ -78,9 +78,10 @@
INTUSE(_IO_sputbackwc) (s, c))))
# define ungetc_not_eof(c, s) ((void) (--read_in, \
INTUSE(_IO_sputbackwc) (s, c)))
# define inchar() (c == WEOF ? WEOF \
# define inchar() (c == WEOF ? ((errno = inchar_errno), WEOF) \
: ((c = _IO_getwc_unlocked (s)), \
(void) (c != WEOF && ++read_in), c))
(void) (c != WEOF \
? ++read_in : (inchar_errno = errno)), c))
# define MEMCPY(d, s, n) __wmemcpy (d, s, n)
# define ISSPACE(Ch) iswspace (Ch)
@ -108,9 +109,10 @@
INTUSE(_IO_sputbackc) (s, (unsigned char) c))))
# define ungetc_not_eof(c, s) ((void) (--read_in, \
INTUSE(_IO_sputbackc) (s, (unsigned char) c)))
# define inchar() (c == EOF ? EOF \
# define inchar() (c == EOF ? ((errno = inchar_errno), EOF) \
: ((c = _IO_getc_unlocked (s)), \
(void) (c != EOF && ++read_in), c))
(void) (c != EOF \
? ++read_in : (inchar_errno = errno)), c))
# define MEMCPY(d, s, n) memcpy (d, s, n)
# define ISSPACE(Ch) isspace (Ch)
# define ISDIGIT(Ch) isdigit (Ch)
@ -272,6 +274,8 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
register int width; /* Maximum field width. */
register int flags; /* Modifiers for current format element. */
/* Errno of last failed inchar call. */
int inchar_errno = 0;
/* Status for reading F-P nums. */
char got_dot, got_e, negative;
/* If a [...] is a [^...]. */