BSD 4_3_Net_2 release

[unix-history] / usr / src / lib / libc / stdio / setbuffer.c

diff --git a/usr/src/lib/libc/stdio/setbuffer.c b/usr/src/lib/libc/stdio/setbuffer.c
index b1b1601..77d1a72 100644 (file)
--- a/usr/src/lib/libc/stdio/setbuffer.c
+++ b/usr/src/lib/libc/stdio/setbuffer.c
@@ -1,47 +1,62 @@
-/*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
  */
 

-#ifndef lint
-static char sccsid[] = "@(#)setbuffer.c        5.1 (Berkeley) %G%";
-#endif not lint
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)setbuffer.c        5.5 (Berkeley) 3/18/91";
+#endif /* LIBC_SCCS and not lint */

 
 

-#include       <stdio.h>
+#include <stdio.h>

 
 

-setbuffer(iop, buf, size)
-       register FILE *iop;
+void
+setbuffer(fp, buf, size)
+       register FILE *fp;

        char *buf;
        int size;
 {
        char *buf;
        int size;
 {

-       if (iop->_base != NULL && iop->_flag&_IOMYBUF)
-               free(iop->_base);
-       iop->_flag &= ~(_IOMYBUF|_IONBF|_IOLBF);
-       if ((iop->_base = buf) == NULL) {
-               iop->_flag |= _IONBF;
-               iop->_bufsiz = NULL;
-       } else {
-               iop->_ptr = iop->_base;
-               iop->_bufsiz = size;
-       }
-       iop->_cnt = 0;
+
+       (void) setvbuf(fp, buf, buf ? _IOFBF : _IONBF, size);

 }
 
 /*
 }
 
 /*

- * set line buffering for either stdout or stderr
+ * set line buffering

  */
  */

-setlinebuf(iop)
-       register FILE *iop;
+setlinebuf(fp)
+       FILE *fp;

 {
 {

-       char *buf;
-       extern char *malloc();

 
 

-       fflush(iop);
-       setbuffer(iop, NULL, 0);
-       buf = malloc(BUFSIZ);
-       if (buf != NULL) {
-               setbuffer(iop, buf, BUFSIZ);
-               iop->_flag |= _IOLBF|_IOMYBUF;
-       }
+       (void) setvbuf(fp, (char *)NULL, _IOLBF, (size_t)0);
+       return (0);     /* ??? */

 }
 }