--- Libc/Libc-1725.40.4/stdio/FreeBSD/fflush.c
+++ Libc/Libc-320/stdio/FreeBSD/fflush.c
@@ -13,6 +13,10 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -34,16 +38,14 @@
 static char sccsid[] = "@(#)fflush.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fflush.c,v 1.14 2007/01/09 00:28:06 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fflush.c,v 1.12 2002/03/22 21:53:04 obrien Exp $");
 
 #include "namespace.h"
 #include <errno.h>
 #include <stdio.h>
-#include <string.h>
 #include "un-namespace.h"
 #include "libc_private.h"
 #include "local.h"
-#include "libc_hooks_impl.h"
 
 static int	sflush_locked(FILE *);
 
@@ -54,16 +56,16 @@
 int
 fflush(FILE *fp)
 {
-	int retval = 0;
+	int retval;
 
-	if (fp == NULL) {
+	if (fp == NULL)
 		return (_fwalk(sflush_locked));
-	}
-
-	libc_hooks_will_write(fp, sizeof(*fp));
-
 	FLOCKFILE(fp);
-	retval = __sflush(fp);
+	if ((fp->_flags & (__SWR | __SRW)) == 0) {
+		errno = EBADF;
+		retval = EOF;
+	} else
+		retval = __sflush(fp);
 	FUNLOCKFILE(fp);
 	return (retval);
 }
@@ -80,7 +82,8 @@
 	if (fp == NULL)
 		return (_fwalk(sflush_locked));
 	if ((fp->_flags & (__SWR | __SRW)) == 0) {
-		retval = 0;
+		errno = EBADF;
+		retval = EOF;
 	} else
 		retval = __sflush(fp);
 	return (retval);
@@ -90,76 +93,29 @@
 __sflush(FILE *fp)
 {
 	unsigned char *p;
-	int f, n, t;
+	int n, t;
 
-	f = fp->_flags;
+	t = fp->_flags;
+	if ((t & __SWR) == 0)
+		return (0);
 
 	if ((p = fp->_bf._base) == NULL)
 		return (0);
 
+	n = fp->_p - p;		/* write this much */
+
 	/*
-	 * SUSv3 requires that fflush() on a seekable input stream updates the file
-	 * position indicator with the underlying seek function.  Use a dumb fseek
-	 * for this (don't attempt to preserve the buffers).
+	 * Set these immediately to avoid problems with longjmp and to allow
+	 * exchange buffering (via setvbuf) in user write function.
 	 */
-	if ((f & __SRD) != 0) {
-		if (fp->_seek == NULL) {
-			/*
-			 * No way to seek this file -- just return "success."
-			 */
-			return (0);
-		}
+	fp->_p = p;
+	fp->_w = t & (__SLBF|__SNBF) ? 0 : fp->_bf._size;
 
-		n = fp->_r;
-
-		if (n > 0) {
-			/*
-			 * See _fseeko's dumb path.
-			 */
-			if (_sseek(fp, (fpos_t)-n, SEEK_CUR) == -1) {
-				if (errno == ESPIPE) {
-					/*
-					 * Ignore ESPIPE errors, since there's no way to put the bytes
-					 * back into the pipe.
-					 */
-					return (0);
-				}
-				return (EOF);
-			}
-
-			if (HASUB(fp)) {
-				FREEUB(fp);
-			}
-			fp->_p = fp->_bf._base;
-			fp->_r = 0;
-			fp->_flags &= ~__SEOF;
-			memset(&fp->_mbstate, 0, sizeof(mbstate_t));
-		}
-		return (0);
-	}
-
-	if ((f & __SWR) != 0) {
-		n = fp->_p - p;		/* write this much */
-
-		/*
-		 * Set these immediately to avoid problems with longjmp and to allow
-		 * exchange buffering (via setvbuf) in user write function.
-		 */
-		fp->_p = p;
-		fp->_w = f & (__SLBF|__SNBF) ? 0 : fp->_bf._size;
-
-		for (; n > 0; n -= t, p += t) {
-			t = _swrite(fp, (char *)p, n);
-			if (t <= 0) {
-				if (p > fp->_p)
-					/* some was written */
-					memmove(fp->_p, p, n);
-				fp->_p += n;
-				if ((fp->_flags & __SNBF) == 0)
-					fp->_w -= n;
-				fp->_flags |= __SERR;
-				return (EOF);
-			}
+	for (; n > 0; n -= t, p += t) {
+		t = _swrite(fp, (char *)p, n);
+		if (t <= 0) {
+			fp->_flags |= __SERR;
+			return (EOF);
 		}
 	}
 	return (0);