From ed36f224c30088f10ecb0f190091508e917379a3 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 13 Oct 2007 07:20:46 +0000 Subject: write-only streams. For read/write streams, check whether we performed a read operation already. --- ChangeLog | 3 ++- libio/__freading.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a16e6ac8f..89ec38ca16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,8 @@ [BZ #4359] * libio/__freading.c (__freading): Don't return true for - write-only streams. + write-only streams. For read/write streams, check whether we + performed a read operation already. 2007-10-12 Ulrich Drepper diff --git a/libio/__freading.c b/libio/__freading.c index 7eca27b010..43e50bce75 100644 --- a/libio/__freading.c +++ b/libio/__freading.c @@ -21,7 +21,7 @@ int __freading (FILE *fp) { - return (((fp->_flags & _IO_NO_WRITES) - || (fp->_flags & _IO_CURRENTLY_PUTTING) == 0) - && (fp->_flags & _IO_NO_READS) == 0); + return ((fp->_flags & _IO_NO_WRITES) + || ((fp->_flags & (_IO_CURRENTLY_PUTTING | _IO_NO_READS)) == 0 + && fp->_IO_read_base != NULL)); } -- cgit v1.2.3