Libc-997.1.1.tar.gz

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

diff --git a/stdio/FreeBSD/wbuf.c b/stdio/FreeBSD/wbuf.c
index 3697be82280e4077d54b7b09761a7449e1e515bd..9e9b59eaedc49dfeb3ef3764cac3c4fbfb494057 100644 (file)
--- a/stdio/FreeBSD/wbuf.c
+++ b/stdio/FreeBSD/wbuf.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.
  * 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.
  * 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,9 +34,10 @@
 static char sccsid[] = "@(#)wbuf.c     8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 static char sccsid[] = "@(#)wbuf.c     8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>

-__FBSDID("$FreeBSD: src/lib/libc/stdio/wbuf.c,v 1.11 2004/06/08 05:45:32 das Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/wbuf.c,v 1.12 2007/01/09 00:28:08 imp Exp $");

 
 #include <stdio.h>
 
 #include <stdio.h>

+#include <errno.h>

 #include "local.h"
 
 /*
 #include "local.h"
 
 /*


@@ -65,8 +62,10 @@ __swbuf(c, fp)
         * calls might wrap _w from negative to positive.
         */
        fp->_w = fp->_lbfsize;
         * calls might wrap _w from negative to positive.
         */
        fp->_w = fp->_lbfsize;

-       if (prepwrite(fp) != 0)
+       if (prepwrite(fp) != 0) {
+               errno = EBADF;

                return (EOF);
                return (EOF);

+       }

        c = (unsigned char)c;
 
        ORIENT(fp, -1);
        c = (unsigned char)c;
 
        ORIENT(fp, -1);