about summary refs log tree commit diff
path: root/libio/iofgets.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-11-08 10:40:28 +0000
committerUlrich Drepper <drepper@redhat.com>1998-11-08 10:40:28 +0000
commit05f732b361988d0df967c78f151ae43d4c208be0 (patch)
tree326905202a4d72f85d3c461216bc4658e8799288 /libio/iofgets.c
parentd76bd17ff96a44417e0d0f1e50591bded3263199 (diff)
downloadglibc-05f732b361988d0df967c78f151ae43d4c208be0.tar.gz
glibc-05f732b361988d0df967c78f151ae43d4c208be0.tar.xz
glibc-05f732b361988d0df967c78f151ae43d4c208be0.zip
Update.
1998-11-05 1998  H.J. Lu  <hjl@gnu.org> 
 
	* libio/iofgets.c (_IO_fgets): Don't report error 
	if something was read in and errno is set to 
	EAGAIN. 
	* libio/iofgets_u.c (fgets_unlocked): Likewise. 
 
1998-11-05  Philip Blundell  <philb@gnu.org> 
 
	* sysdeps/unix/sysv/linux/net/if_packet.h: Don't include kernel 
	header; it defines too much.  Provide a local definition of struct 
	sockaddr_pkt and a comment advising against its use. 
 
1998-11-06 1998  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de> 
 
	* extra-lib.mk: Avoid empty include list. 
 
1998-11-04  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de> 
 
	* extra-lib.mk: Add support for $(lib)-shared-only-routines. 
 
	* elf/Makefile (libdl-routines): Add dlopenold only if doing 
	versioning. 
	(libdl-shared-only-routines): New variable. 
 
1998-11-06  Paul Eggert  <eggert@twinsun.com> 
 
	Don't invoke localtime_r or gmtime_r unless it's the GNU C 
	library's localtime_r and gmtime_r; there are too many buggy 
	implementations of localtime_r and gmtime_r out there, and 
	it's not worth keeping track of all the different bugs. 

	* time/mktime.c (__EXTENSIONS__): Remove. 
	(<unistd.h>): No need to include. 
	* time/strftime.c: Likewise.

	* time/mktime.c (_POSIX_THREAD_SAFE_FUNCTIONS, HAVE_LOCALTIME_R):
	Remove. 
	(my_mktime_localtime_r): Renamed from localtime_r; all uses changed. 
	Base it on localtime unless _LIBC. 

	* time/strftime.c (my_strftime_gmtime_r): Renamed from gmtime_r; 
	all uses changed. 
	(my_strftime_localtime_r): Renamed from localtime_r; all uses changed. 
	Base them on localtime/gmtime if not _LIBC. 

1998-11-07  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/generic/isastream.c: Always return 0 unless it is an invalid
	file descriptor.  This makes this function actually usable.
	Proposed by Mark Kettenis <kettenis@phys.uva.nl>.
Diffstat (limited to 'libio/iofgets.c')
-rw-r--r--libio/iofgets.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libio/iofgets.c b/libio/iofgets.c
index d61fb81481..98e82782ce 100644
--- a/libio/iofgets.c
+++ b/libio/iofgets.c
@@ -46,7 +46,10 @@ _IO_fgets (buf, n, fp)
   old_error = fp->_IO_file_flags & _IO_ERR_SEEN;
   fp->_IO_file_flags &= ~_IO_ERR_SEEN;
   count = _IO_getline (fp, buf, n - 1, '\n', 1);
-  if (count == 0 || (fp->_IO_file_flags & _IO_ERR_SEEN))
+  /* If we read in some bytes and errno is EAGAIN, that error will
+     be reported for next read. */
+  if (count == 0 || ((fp->_IO_file_flags & _IO_ERR_SEEN)
+		     && errno != EAGAIN))
     result = NULL;
   else
     {