Add conditional code for SLOW_BUT_NO_HACKS.

diff --git a/ChangeLog b/ChangeLog
index 460c4d3323e1979a9f3baa1a170a87eaf2888589..b2a0e2dca872169df6d917265d4f75ac36b223af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-06  Bruno Haible  <bruno@clisp.org>
+
+       * lib/freadahead.c (freadahead): Add conditional for SLOW_BUT_NO_HACKS.
+       * lib/freadptr.c (freadptr): Likewise.
+       * lib/freadseek.c (freadptrinc): Likewise.
+       Reported by Simon Josefsson.
+
 2008-09-06  Bruno Haible  <bruno@clisp.org>
 
        * modules/freadptr (License): Change to LGPLv2+.

diff --git a/lib/freadahead.c b/lib/freadahead.c
index 15cc70894463e384880e235718dc10a887605e65..2dcf81c3054127683a4bd8ba3389837115fa84b7 100644 (file)
--- a/lib/freadahead.c
+++ b/lib/freadahead.c
@@ -19,6 +19,7 @@
 /* Specification.  */
 #include "freadahead.h"
 
+#include <stdlib.h>
 #include "stdio-impl.h"
 
 size_t
@@ -69,6 +70,9 @@ freadahead (FILE *fp)
         + (fp->_Mode & 0x4000 /* _MBYTE */
            ? (fp->_Back + sizeof (fp->_Back)) - fp->_Rback
            : 0);
+#elif defined SLOW_BUT_NO_HACKS     /* users can define this */
+  abort ();
+  return 0;
 #else
  #error "Please port gnulib freadahead.c to your platform! Look at the definition of fflush, fread, ungetc on your system, then report this to bug-gnulib."
 #endif

diff --git a/lib/freadptr.c b/lib/freadptr.c
index 6e08b4858ea76807030a524b0479cfff9507b450..b47e09ffc309056125a32505c0a6facf0f71ad19 100644 (file)
--- a/lib/freadptr.c
+++ b/lib/freadptr.c
@@ -85,6 +85,10 @@ freadptr (FILE *fp, size_t *sizep)
     return NULL;
   *sizep = size;
   return (const char *) fp->_Next;
+#elif defined SLOW_BUT_NO_HACKS     /* users can define this */
+  /* This implementation is correct on any ANSI C platform.  It is just
+     awfully slow.  */
+  return NULL;
 #else
  #error "Please port gnulib freadptr.c to your platform! Look at the definition of fflush, fread, getc, getc_unlocked on your system, then report this to bug-gnulib."
 #endif

diff --git a/lib/freadseek.c b/lib/freadseek.c
index f56f8b1eb2492b1eac4083ca189250e82cc6a287..4299e82fea46dce1e03da6adce17133bff3daa84 100644 (file)
--- a/lib/freadseek.c
+++ b/lib/freadseek.c
@@ -53,6 +53,7 @@ freadptrinc (FILE *fp, size_t increment)
 # endif
 #elif defined __QNX__               /* QNX */
   fp->_Next += increment;
+#elif defined SLOW_BUT_NO_HACKS     /* users can define this */
 #else
  #error "Please port gnulib freadseek.c to your platform! Look at the definition of getc, getc_unlocked on your system, then report this to bug-gnulib."
 #endif