mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
Update.
1998-02-15 Ulrich Drepper <drepper@cygnus.com> * nss/nsswitch.c (__nss_lookup): Return 1 if this was the last module. * nss/getXXent_r.c: If no more module is found don't try to call setXXent functions but leave unsuccessfully. * malloc/obstack.h: Cleanups. * sysdeps/wordsize-32/stdint.h: New file. * sysdeps/wordsize-64/stdint.h: New file. * sysdeps/generic/stdint.h: New file. * sysdeps/wordsize-32/inttypes.h: Adopt to use stdint.h. * sysdeps/wordsize-64/inttypes.h: Likewise. * stdlib/Makefile (headers): Add stdint.h. 1998-02-03 Paul Eggert <eggert@twinsun.com> * malloc/obstack.h (PTR_INT_TYPE): Use __PTRDIFF_TYPE__ if available. 1998-02-13 17:59 Zack Weinberg <zack@rabi.phys.columbia.edu> * timezone: New directory. * time/README, time/africa, time/antarctica, time/asia, time/australasia, time/backward, time/checktab.awk, time/etcetera, time/europe, time/factory, time/ialloc.c, time/iso3166.tab, time/leapseconds, time/northamerica, time/pacificnew, time/private.h, time/scheck.c, time/solar87, time/solar88, time/solar89, time/southamerica, time/systemv, time/test-tz.c, time/tzfile.h, time/tzselect.ksh, time/yearistype, time/zdump.c, time/zic.c, time/zone.tab: Moved to timezone. * time/tzfile.c: Include tzfile.h from timezone subdir. * time/tzset.c: Likewise. * time/Makefile: Cut out all code relating to timezones... * timezone/Makefile: ...and paste it in here. * Makefile (subdirs): Add timezone. 1998-02-13 18:45 H.J. Lu <hjl@gnu.org> * libc.map (_sys_nerr): Added. * sysdeps/unix/sysv/linux/errlist.c (_sys_nerr): Make it versioned symbol. 1998-02-15 17:16 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/bits/socket.h: Define PF_KEY and pseudo_AF_KEY instead of pseudo_PF_KEY and AF_KEY. Reported by Craig Metz <cmetz@inner.net>. 1998-01-22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * nss/nss_files/files-parse.c (LOOKUP_NAME_CASE): Use __strcasecmp instead of strcasecmp. * nss/nss_files/files-alias.c (get_next_alias): Likewise. * wctype/wctype.h (_ISwbit): Avoid warning with gcc before 2.8. 1998-02-15 16:55 Ulrich Drepper <drepper@cygnus.com> * socket/sys/socket.h (setsockopt): Make OPTVAL parameter const. Patch by Dean Gaudet <dgaudet@arctic.org>. 1998-02-15 16:53 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/Dist: Add getresgid.c and getresuid.c. 1998-02-15 10:49 Zack Weinberg <zack@rabi.phys.columbia.edu> * sysdeps/unix/sysv/linux/poll.c: If compiled against a kernel with no poll syscall, just include the BSD version. * sysdeps/unix/sysv/linux/getresuid.c: If compiled against a kernel without the syscall, include the stub version. * sysdeps/unix/sysv/linux/getresgid.c: Likewise. * sysdeps/generic/getresuid.c: New file. * sysdeps/generic/getresgid.c: New file. 1998-02-15 Ulrich Drepper <drepper@cygnus.com> * stdio-common/vfscanf.c: Correct last change a bit.
This commit is contained in:
Ulrich Drepper
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1991,92,93,94,95,96,97,98 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
@ -16,7 +16,6 @@
|
||||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
#include "../locale/localeinfo.h"
|
||||
#include <errno.h>
|
||||
#include <limits.h>
|
||||
#include <ctype.h>
|
||||
@ -26,12 +25,13 @@
|
||||
#include <string.h>
|
||||
#include <wctype.h>
|
||||
#include <bits/libc-lock.h>
|
||||
#include <locale/localeinfo.h>
|
||||
|
||||
#ifdef __GNUC__
|
||||
#define HAVE_LONGLONG
|
||||
#define LONGLONG long long
|
||||
# define HAVE_LONGLONG
|
||||
# define LONGLONG long long
|
||||
#else
|
||||
#define LONGLONG long
|
||||
# define LONGLONG long
|
||||
#endif
|
||||
|
||||
/* Those are flags in the conversion format. */
|
||||
@ -459,10 +459,13 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
|
||||
if (skip_space || (fc != '[' && fc != 'c' && fc != 'C' && fc != 'n'))
|
||||
{
|
||||
/* Eat whitespace. */
|
||||
int save_errno = errno;
|
||||
errno = 0;
|
||||
do
|
||||
if (inchar () == EOF)
|
||||
if (inchar () == EOF && errno == EINTR)
|
||||
input_error ();
|
||||
while (isspace (c));
|
||||
errno = save_errno;
|
||||
ungetc (c, s);
|
||||
skip_space = 0;
|
||||
}
|
||||
@ -470,9 +473,9 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
|
||||
switch (fc)
|
||||
{
|
||||
case '%': /* Must match a literal '%'. */
|
||||
c = inchar ();
|
||||
if (c == EOF)
|
||||
input_error ();
|
||||
c = inchar ();
|
||||
if (c != fc)
|
||||
{
|
||||
ungetc (c, s);
|
||||
@ -518,7 +521,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
|
||||
of 3 is also assigned to n2. The value of d2 is not
|
||||
affected. The value 3 is assigned to i.
|
||||
|
||||
We go for now with the historically correct code fro ISO C,
|
||||
We go for now with the historically correct code from ISO C,
|
||||
i.e., we don't count the %n assignments. When it ever
|
||||
should proof to be wrong just remove the #ifdef above. */
|
||||
++done;
|
||||
@ -536,8 +539,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
|
||||
conv_error ();
|
||||
}
|
||||
|
||||
if (c != EOF)
|
||||
c = inchar ();
|
||||
c = inchar ();
|
||||
if (c == EOF)
|
||||
input_error ();
|
||||
|
||||
@ -575,9 +577,6 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
|
||||
conv_error ();
|
||||
}
|
||||
|
||||
if (c == EOF)
|
||||
input_error ();
|
||||
|
||||
do
|
||||
{
|
||||
#define NEXT_WIDE_CHAR(First) \
|
||||
@ -675,8 +674,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
|
||||
}
|
||||
STRING_ARG (str, char);
|
||||
|
||||
if (c != EOF)
|
||||
c = inchar ();
|
||||
c = inchar ();
|
||||
if (c == EOF)
|
||||
input_error ();
|
||||
|
||||
@ -742,9 +740,6 @@ __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;
|
||||
@ -800,8 +795,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
|
||||
number_signed = 1;
|
||||
|
||||
number:
|
||||
if (c != EOF)
|
||||
c = inchar ();
|
||||
c = inchar ();
|
||||
if (c == EOF)
|
||||
input_error ();
|
||||
|
||||
@ -922,8 +916,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
|
||||
case 'G':
|
||||
case 'a':
|
||||
case 'A':
|
||||
if (c != EOF)
|
||||
c = inchar ();
|
||||
c = inchar ();
|
||||
if (c == EOF)
|
||||
input_error ();
|
||||
|
||||
@ -1032,13 +1025,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);
|
||||
|
||||
if (c != EOF)
|
||||
c = inchar ();
|
||||
c = inchar ();
|
||||
if (c == EOF)
|
||||
input_error ();
|
||||
}
|
||||
@ -1096,9 +1089,6 @@ __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 +1158,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
|
||||
}
|
||||
}
|
||||
|
||||
/* The last thing we saw in the format string was a white space.
|
||||
/* The last thing we saw int the format string was a white space.
|
||||
Consume the last white spaces. */
|
||||
if (skip_space)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user