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

	performed a read operation already.

diff --git a/ChangeLog b/ChangeLog
index 3a16e6ac8f9b33223698d6bba17adbe38b2f13ef..89ec38ca1666255b4572113efb655f180e661cbb 100644 (file)
--- 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
index 7eca27b010eae12726e9b0b494be2b588a21d7a2..43e50bce75aa23fa3b5f806c1eb7266301bb9666 100644 (file)
--- 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));
 }