write-only streams. For read/write streams, check whether we

performed a read operation already.
git-mirror · Oct 13, 2007 · ed36f22 · ed36f22
1 parent 0ea4967
commit ed36f22
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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  <drepper@redhat.com>
 

diff --git 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));
 }