X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffpurge.c;h=8ca7f12c23adc3417728617aca171f4bbfcc6cf8;hb=744df8b1de32a5c4047aff5e9a9fa8b680ffea6f;hp=5e0d47ddab4726087d7c0f1b4b75000a08b398dd;hpb=e0ffcc54b25141ac005b9db616429cb37d0cb8d5;p=gnulib.git diff --git a/lib/fpurge.c b/lib/fpurge.c index 5e0d47dda..8ca7f12c2 100644 --- a/lib/fpurge.c +++ b/lib/fpurge.c @@ -17,7 +17,7 @@ #include /* Specification. */ -#include "fpurge.h" +#include #if HAVE___FPURGE /* glibc >= 2.2, Haiku, Solaris >= 7 */ # include @@ -35,7 +35,7 @@ fpurge (FILE *fp) /* The __fpurge function does not have a return value. */ return 0; -#elif HAVE_FPURGE /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X */ +#elif HAVE_FPURGE /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin 1.7 */ /* Call the system's fpurge function. */ # undef fpurge @@ -49,7 +49,7 @@ fpurge (FILE *fp) on BSD systems says: "The following always hold: if _flags & __SRD, _w is 0." If this invariant is not fulfilled and the stream is read-write but - currently writing, subsequent putc or fputc calls will write directly + currently reading, subsequent putc or fputc calls will write directly into the buffer, although they shouldn't be allowed to. */ if ((fp_->_flags & __SRD) != 0) fp_->_w = 0; @@ -75,13 +75,13 @@ fpurge (FILE *fp) fp_->_p = fp_->_bf._base; fp_->_r = 0; fp_->_w = ((fp_->_flags & (__SLBF | __SNBF | __SRD)) == 0 /* fully buffered and not currently reading? */ - ? fp_->_bf._size - : 0); + ? fp_->_bf._size + : 0); /* Avoid memory leak when there is an active ungetc buffer. */ if (fp_ub._base != NULL) { if (fp_ub._base != fp_->_ubuf) - free (fp_ub._base); + free (fp_ub._base); fp_ub._base = NULL; } return 0;