More support for FreeMiNT.

diff --git a/ChangeLog b/ChangeLog
index 9e629c8c7e361e361bcebf3130bf0ab0270ece6b..2f0ba742213278c39fb7caef9cbd1a1fcc9d3be4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-01  Bruno Haible  <bruno@clisp.org>
+
+       More support for FreeMiNT.
+       * lib/fpurge.c (fpurge): Correct last commit.
+       Reported by Alan Hourihane <alanh@fairlite.co.uk>.
+
 2009-03-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Fix unportable awk script in vc-list-files.

diff --git a/lib/fpurge.c b/lib/fpurge.c
index 0e2931eb142e42c7d3538928edf68eb6b02327e4..5e0d47ddab4726087d7c0f1b4b75000a08b398dd 100644 (file)
--- a/lib/fpurge.c
+++ b/lib/fpurge.c
@@ -120,9 +120,14 @@ fpurge (FILE *fp)
       fp->__bufp = fp->__pushback_bufp;
       fp->__pushed_back = 0;
     }
+  /* Preserve the current file position.  */
+  if (fp->__target != -1)
+    fp->__target += fp->__bufp - fp->__buffer;
   fp->__bufp = fp->__buffer;
+  /* Nothing in the buffer, next getc is nontrivial.  */
   fp->__get_limit = fp->__bufp;
-  fp->__put_limit = fp->__bufp;
+  /* Nothing in the buffer, next putc is nontrivial.  */
+  fp->__put_limit = fp->__buffer;
   return 0;
 # else
  #error "Please port gnulib fpurge.c to your platform! Look at the definitions of fflush, setvbuf and ungetc on your system, then report this to bug-gnulib."