More support for FreeMiNT.

diff --git a/ChangeLog b/ChangeLog
index 35ae1f5c19859849a09171991561f41cfbdba0e1..3818884703fb0956a86e48a30afd9fe36e926873 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
 2009-02-28  Bruno Haible  <bruno@clisp.org>
 
-       * tests/test-freadseek.c (main): Disable test beyond end of file on FreeMiNT.
+       More support for FreeMiNT.
+       * lib/freading.c (freading) [__MINT__]: Use new macros that were added
+       to FreeMiNT today.
+       * lib/fwriting.c (fwriting): Likewise.
+       Based on patch by Alan Hourihane <alanh@fairlite.co.uk>.
+
+2009-02-28  Bruno Haible  <bruno@clisp.org>
+
+       * tests/test-freadseek.c (main): Disable test beyond end of file on
+       FreeMiNT.
        * tests/test-ftello.c (main): Likewise.
        Patch by Alan Hourihane <alanh@fairlite.co.uk>.
 

diff --git a/lib/freading.c b/lib/freading.c
index f20affce32aaba7e87d3e6faac6a251539652581..4da0e31bb28be6651cce1399b8b22e008f0fe4f0 100644 (file)
--- a/lib/freading.c
+++ b/lib/freading.c
@@ -47,10 +47,15 @@ freading (FILE *fp)
   return ((fp->_Mode & 0x2 /* _MOPENW */) == 0
          || (fp->_Mode & 0x1000 /* _MREAD */) != 0);
 #elif defined __MINT__              /* Atari FreeMiNT */
-  return (!fp->__mode.__write
-         || (fp->__mode.__read
-             && (fp->__buffer < fp->__get_limit
-                 /*|| fp->__bufp == fp->__put_limit ??*/)));
+  if (!fp->__mode.__write)
+    return 1;
+  if (!fp->__mode.__read)
+    return 0;
+# ifdef _IO_CURRENTLY_GETTING /* Flag added on 2009-02-28 */
+  return (fp->__flags & _IO_CURRENTLY_GETTING) != 0;
+# else
+  return (fp->__buffer < fp->__get_limit /*|| fp->__bufp == fp->__put_limit ??*/);
+# endif
 #else
  #error "Please port gnulib freading.c to your platform!"
 #endif

diff --git a/lib/fwriting.c b/lib/fwriting.c
index b7fa45571b73e6183e95681cd9aeb7c61ab7f37a..c6dc9ac8d82facd0d43bba13d9933130fd4ce8aa 100644 (file)
--- a/lib/fwriting.c
+++ b/lib/fwriting.c
@@ -41,10 +41,15 @@ fwriting (FILE *fp)
   return ((fp->_Mode & 0x1 /* _MOPENR */) == 0
          || (fp->_Mode & 0x2000 /* _MWRITE */) != 0);
 #elif defined __MINT__              /* Atari FreeMiNT */
-  return (!fp->__mode.__read
-         || (fp->__mode.__write
-             && (fp->__buffer < fp->__put_limit
-                 /*|| fp->__bufp == fp->__get_limit ??*/)));
+  if (!fp->__mode.__read)
+    return 1;
+  if (!fp->__mode.__write)
+    return 0;
+# ifdef _IO_CURRENTLY_PUTTING /* Flag added on 2009-02-28 */
+  return (fp->__flags & _IO_CURRENTLY_PUTTING) != 0;
+# else
+  return (fp->__buffer < fp->__put_limit /*|| fp->__bufp == fp->__get_limit ??*/);
+# endif
 #else
  #error "Please port gnulib fwriting.c to your platform!"
 #endif