aboutsummaryrefslogtreecommitdiff
path: root/stdio-common
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-02-13 17:54:15 +0000
committerUlrich Drepper <drepper@redhat.com>1998-02-13 17:54:15 +0000
commitdc30f461575342ffeb6c0f2d5931493c1c3a91c0 (patch)
tree99243511beca706f0743fe2316854c5a30709f17 /stdio-common
parente15867921d8f3b75deb0d91628cf9a323709ea9f (diff)
downloadglibc-dc30f461575342ffeb6c0f2d5931493c1c3a91c0.tar
glibc-dc30f461575342ffeb6c0f2d5931493c1c3a91c0.tar.gz
glibc-dc30f461575342ffeb6c0f2d5931493c1c3a91c0.tar.bz2
glibc-dc30f461575342ffeb6c0f2d5931493c1c3a91c0.zip
Update.
1998-02-13 17:39 Ulrich Drepper <drepper@cygnus.com> * elf/Makefile: Don't use --version-script parameter to link ld.so unconditionally. 1998-01-02 04:19 Geoff Keating <geoffk@ozemail.com.au> * math/Makefile: Add t_exp. * math/libm-test.c: Tighten accuracy bounds for exp(), correct constants. * math/test-reduce.c: Remove temporarily, it seems to be broken. * sysdeps/libm-ieee754/e_exp.c: Use accurate table method. * sysdeps/libm-ieee754/e_expf.c: Use table & double precision for better accuracy. * sysdeps/libm-ieee754/s_exp2.c: Use better polynomial; correct algorithm for very large/very small arguments. * sysdeps/libm-ieee754/s_exp2f.c: Use slightly better polynomial; correct algorithm for very large/very small arguments; adjust for new table. * sysdeps/libm-ieee754/t_exp.c: New file. * sysdeps/libm-ieee754/t_exp2f.h: Use table with smaller deltas. * sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Put 'strange test' back, with comment that explains what breaks when you remove it :-(. * localedata/xfrm-test.c: Avoid integer overflow. * stdlib/strfmon.c: char is unsigned, sometimes. *sysdeps/powerpc * sysdeps/powerpc/Makefile: Remove quad float support. * sysdeps/powerpc/q_*.c: Remove, they will become an add-on. * sysdeps/powerpc/quad_float.h: Likewise. * sysdeps/powerpc/test-arith.c: Likewise. * sysdeps/powerpc/test-arithf.c: Likewise. * sysdeps/generic/s_exp2.c: Remove, we have this implemented now. * sysdeps/generic/s_exp2f.c: Likewise. * sysdeps/powerpc/bits/mathinline.h: Use underscores around __asm__, don't try anything if _SOFT_FLOAT. 1997-12-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * locale/C-ctype.c (_nl_C_LC_CTYPE_class32): Undo last change. * locale/programs/ld-ctype.c (CHAR_CLASS32_TRANS): Likewise. * wctype/wctype.c: Likewise. * wctype/wctype.h (_ISwxxx): Renamed from _ISxxx, all uses changed. They are incompatible with the _ISxxx values from <ctype.h> on little endian machines. (_ISwbit) [__BYTE_ORDER == __LITTLE_ENDIAN]: Correctly transform bit number. This fixes the real bug and restores the integrity of the ctype locale file. * wctype/wcfuncs.c: Change all _ISxxx to _ISwxxx. * wctype/wcfuncs_l.c: Likewise. * wctype/wcextra.c: Likewise. * wctype/wctype_l.c [__BYTE_ORDER == __LITTLE_ENDIAN]: Use correct byte swapping. 1998-02-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.S (errno): Put it into .bss segment instead of .common, so that aliases on it work. * sysdeps/unix/sysv/linux/i386/sysdep.S (errno): Add .type and .size directives, put into .bss segment instead of initializing it to 4. 1998-02-12 08:00 H.J. Lu <hjl@gnu.org> * libc.map (gnu_get_libc_release, gnu_get_libc_version): Added. * version.c (__gnu_get_libc_release, __gnu_get_libc_version): New functions. Make names without __ weak aliases. (__libc_release, __libc_version): Make them static. * include/gnu/libc-version.h: New file. * Makefile (headers): Add gnu/libc-version.h. 1998-02-13 Ulrich Drepper <drepper@cygnus.com> * stdlib/stdlib.h (struct drand48_data): Leave X to user macros and use x for member name. Reported by Daniel Lyddy <daniell@cs.berkeley.edu>. * stdlib/drand48.c: Change according to member name change. * stdlib/drand48_r.c: Likewise. * stdlib/lcong48_r.c: Likewise. * stdlib/lrand48.c: Likewise. * stdlib/lrand48_r.c: Likewise. * stdlib/mrand48.c: Likewise. * stdlib/mrand48_r.c: Likewise. * stdlib/seed48.c: Likewise. * stdlib/seed48_r.c: Likewise. * stdlib/srand48_r.c: Likewise. 1998-02-11 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nss/test-netdb.c: Add some more test cases. 1998-02-13 11:39 Ulrich Drepper <drepper@cygnus.com> * libio/iovsscanf.c: Undo last change modifying errno. 1998-02-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * stdio-common/vfscanf.c: Never try to read another character after EOF. Don't decrement read_in after EOF, it wasn't incremented in the first place. (NEXT_WIDE_CHAR): Set First, not first. 1998-02-06 07:48 H.J. Lu <hjl@gnu.org> * db/Makefile ($(inst_libdir)/libndbm.a, $(inst_libdir)/libndbm.so): New targets. * db2/Makefile: Likewise. 1998-02-12 08:20 H.J. Lu <hjl@gnu.org> * sysdeps/gnu/errlist.awk (sys_errlist, sys_nerr): Create weak aliases if HAVE_ELF or PIC or DO_VERSIONING is not defined. 1998-02-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/generic/_G_config.h: Define _G_wchar_t, for C++ <streambuf.h>. * sysdeps/unix/sysv/linux/_G_config.h: Likewise. 1998-02-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/make-syscalls.sh: Fix sed pattern when dealing with versioned symbols. 1998-02-13 08:14 H.J. Lu <hjl@gnu.org> * libc.map (_dl_global_scope, _dl_lookup_symbol_skip, _dl_lookup_versioned_symbol, _dl_lookup_versioned_symbol_skip): Added for libdl.so. * elf/rtld.map: New file. Needed to define the GLIBC_2.* * manual/socket.texi (Host Address Functions): Clarify description * sysdeps/unix/sysv/linux/alpha/bits/time.h (struct timeval):
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/vfscanf.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index 9f8eba9c4c..afb6f7c05a 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -454,17 +454,13 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
if (*f == '\0')
conv_error ();
- /* We must take care for EINTR errors. */
- if (c == EOF && errno == EINTR)
- input_error ();
-
/* Find the conversion specifier. */
fc = *f++;
if (skip_space || (fc != '[' && fc != 'c' && fc != 'C' && fc != 'n'))
{
/* Eat whitespace. */
do
- if (inchar () == EOF && errno == EINTR)
+ if (inchar () == EOF)
input_error ();
while (isspace (c));
ungetc (c, s);
@@ -474,6 +470,8 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
switch (fc)
{
case '%': /* Must match a literal '%'. */
+ if (c == EOF)
+ input_error ();
c = inchar ();
if (c != fc)
{
@@ -538,7 +536,8 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
conv_error ();
}
- c = inchar ();
+ if (c != EOF)
+ c = inchar ();
if (c == EOF)
input_error ();
@@ -554,10 +553,6 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
else
while (--width > 0 && inchar () != EOF);
- if (width > 0)
- /* I.e., EOF was read. */
- --read_in;
-
if (!(flags & SUPPRESS))
++done;
@@ -580,6 +575,9 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
conv_error ();
}
+ if (c == EOF)
+ input_error ();
+
do
{
#define NEXT_WIDE_CHAR(First) \
@@ -589,10 +587,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
if (First) \
input_error (); \
else \
- { \
- --read_in; \
- break; \
- } \
+ break; \
val = c; \
if (val >= 0x80) \
{ \
@@ -643,16 +638,12 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
\
if (!(flags & SUPPRESS)) \
*wstr++ = val; \
- first = 0
+ First = 0
NEXT_WIDE_CHAR (first);
}
while (--width > 0);
- if (width > 0)
- /* I.e., EOF was read. */
- --read_in;
-
if (!(flags & SUPPRESS))
++done;
}
@@ -684,7 +675,8 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
}
STRING_ARG (str, char);
- c = inchar ();
+ if (c != EOF)
+ c = inchar ();
if (c == EOF)
input_error ();
@@ -750,6 +742,9 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
int first = 1;
STRING_ARG (wstr, wchar_t);
+ if (c == EOF)
+ input_error ();
+
do
{
size_t cnt = 0;
@@ -805,7 +800,8 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
number_signed = 1;
number:
- c = inchar ();
+ if (c != EOF)
+ c = inchar ();
if (c == EOF)
input_error ();
@@ -926,7 +922,8 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
case 'G':
case 'a':
case 'A':
- c = inchar ();
+ if (c != EOF)
+ c = inchar ();
if (c == EOF)
input_error ();
@@ -1035,13 +1032,13 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
if (flags & LONG)
{
STRING_ARG (wstr, wchar_t);
- c = '\0'; /* This is to keep gcc quiet. */
}
else
{
STRING_ARG (str, char);
- c = inchar ();
+ if (c != EOF)
+ c = inchar ();
if (c == EOF)
input_error ();
}
@@ -1099,6 +1096,9 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
wint_t val;
int first = 1;
+ if (c == EOF)
+ input_error ();
+
do
{
size_t cnt = 0;
@@ -1168,7 +1168,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
}
}
- /* The last thing we saw int the format string was a white space.
+ /* The last thing we saw in the format string was a white space.
Consume the last white spaces. */
if (skip_space)
{