BSD 4_3_Net_2 release

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

diff --git a/usr/src/lib/libc/stdio/ungetc.c b/usr/src/lib/libc/stdio/ungetc.c
index 91864b8..f1b814a 100644 (file)
--- a/usr/src/lib/libc/stdio/ungetc.c
+++ b/usr/src/lib/libc/stdio/ungetc.c
@@ -5,11 +5,37 @@
  * This code is derived from software contributed to Berkeley by
  * Chris Torek.
  *
  * This code is derived from software contributed to Berkeley by
  * Chris Torek.
  *

- * %sccs.include.redist.c%
+ * 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.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)ungetc.c   5.4 (Berkeley) %G%";
+static char sccsid[] = "@(#)ungetc.c   5.6 (Berkeley) 5/4/91";

 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdio.h>


@@ -48,7 +74,7 @@ __submore(fp)
        p = realloc(fp->_ub._base, i << 1);
        if (p == NULL)
                return (EOF);
        p = realloc(fp->_ub._base, i << 1);
        if (p == NULL)
                return (EOF);

-       (void) memcpy((void *)(p + i), (void *)p, (size_t)i);
+       (void) bcopy((void *)p, (void *)(p + i), (size_t)i);

        fp->_p = p + i;
        fp->_ub._base = p;
        fp->_ub._size = i << 1;
        fp->_p = p + i;
        fp->_ub._base = p;
        fp->_ub._size = i << 1;


@@ -71,7 +97,7 @@ ungetc(c, fp)
                if ((fp->_flags & __SRW) == 0)
                        return (EOF);
                if (fp->_flags & __SWR) {
                if ((fp->_flags & __SRW) == 0)
                        return (EOF);
                if (fp->_flags & __SWR) {

-                       if (fflush(fp))
+                       if (__sflush(fp))

                                return (EOF);
                        fp->_flags &= ~__SWR;
                        fp->_w = 0;
                                return (EOF);
                        fp->_flags &= ~__SWR;
                        fp->_w = 0;