BSD 4_4_Lite2 release

[unix-history] / usr / src / bin / sh / memalloc.c

diff --git a/usr/src/bin/sh/memalloc.c b/usr/src/bin/sh/memalloc.c
index 6f4ff99..fd0df3e 100644 (file)
--- a/usr/src/bin/sh/memalloc.c
+++ b/usr/src/bin/sh/memalloc.c
@@ -1,15 +1,41 @@
 /*-
 /*-

- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1991, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * Kenneth Almquist.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Kenneth Almquist.
  *

- * %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.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)memalloc.c 5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)memalloc.c 8.3 (Berkeley) 5/4/95";

 #endif /* not lint */
 
 #include "shell.h"
 #endif /* not lint */
 
 #include "shell.h"


@@ -18,15 +44,18 @@ static char sccsid[] = "@(#)memalloc.c      5.2 (Berkeley) %G%";
 #include "error.h"
 #include "machdep.h"
 #include "mystring.h"
 #include "error.h"
 #include "machdep.h"
 #include "mystring.h"

+#include <stdlib.h>
+#include <unistd.h>

 
 /*
  * Like malloc, but returns an error when out of space.
  */
 
 pointer
 
 /*
  * Like malloc, but returns an error when out of space.
  */
 
 pointer

-ckmalloc(nbytes) {
+ckmalloc(nbytes) 
+       int nbytes;
+{

        register pointer p;
        register pointer p;

-       pointer malloc();

 
        if ((p = malloc(nbytes)) == NULL)
                error("Out of space");
 
        if ((p = malloc(nbytes)) == NULL)
                error("Out of space");


@@ -41,8 +70,8 @@ ckmalloc(nbytes) {
 pointer
 ckrealloc(p, nbytes)
        register pointer p;
 pointer
 ckrealloc(p, nbytes)
        register pointer p;

-       {
-       pointer realloc();
+       int nbytes;
+{

 
        if ((p = realloc(p, nbytes)) == NULL)
                error("Out of space");
 
        if ((p = realloc(p, nbytes)) == NULL)
                error("Out of space");


@@ -93,7 +122,9 @@ int herefd = -1;
 
 
 pointer
 
 
 pointer

-stalloc(nbytes) {
+stalloc(nbytes) 
+       int nbytes;
+{

        register char *p;
 
        nbytes = ALIGN(nbytes);
        register char *p;
 
        nbytes = ALIGN(nbytes);


@@ -191,16 +222,18 @@ growstackblock() {
                INTON;
        } else {
                p = stalloc(newlen);
                INTON;
        } else {
                p = stalloc(newlen);

-               bcopy(oldspace, p, oldlen);
+               memcpy(p, oldspace, oldlen);

                stacknxt = p;                   /* free the space */
                stacknxt = p;                   /* free the space */

-               stacknleft += newlen;           /* we just allocated */
+               stacknleft += ALIGN(newlen);    /* we just allocated */

        }
 }
 
 
 
 void
        }
 }
 
 
 
 void

-grabstackblock(len) {
+grabstackblock(len) 
+       int len;
+{

        len = ALIGN(len);
        stacknxt += len;
        stacknleft -= len;
        len = ALIGN(len);
        stacknxt += len;
        stacknleft -= len;