Libc-997.1.1.tar.gz

[apple/libc.git] / stdio / FreeBSD / wsetup.c

diff --git a/stdio/FreeBSD/wsetup.c b/stdio/FreeBSD/wsetup.c
index 67c9e2f504e73375658f385f9cb456776fecfa6b..ea1b9e885c6b99eff0db83f4c65afea30b4ff879 100644 (file)
--- a/stdio/FreeBSD/wsetup.c
+++ b/stdio/FreeBSD/wsetup.c
@@ -13,10 +13,6 @@
  * 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.
@@ -38,8 +34,9 @@
 static char sccsid[] = "@(#)wsetup.c   8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/wsetup.c,v 1.8 2002/03/22 21:53:04 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/wsetup.c,v 1.11 2009/01/08 06:38:06 das Exp $");
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "local.h"
@@ -47,7 +44,7 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/wsetup.c,v 1.8 2002/03/22 21:53:04 obrien
 /*
  * Various output routines call wsetup to be sure it is safe to write,
  * because either _flags does not include __SWR, or _buf is NULL.
- * _wsetup returns 0 if OK to write, nonzero otherwise.
+ * _wsetup returns 0 if OK to write; otherwise, it returns EOF and sets errno.
  */
 int
 __swsetup(fp)
@@ -61,8 +58,11 @@ __swsetup(fp)
         * If we are not writing, we had better be reading and writing.
         */
        if ((fp->_flags & __SWR) == 0) {
-               if ((fp->_flags & __SRW) == 0)
+               if ((fp->_flags & __SRW) == 0) {
+                       errno = EBADF;
+                       fp->_flags |= __SERR;
                        return (EOF);
+               }
                if (fp->_flags & __SRD) {
                        /* clobber any ungetc data */
                        if (HASUB(fp))