[src/trunk]: src/bin/sh Minor cleanups to growstackblock(). This should rea...

[kre <kre%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/06a13a5194fa
branches:  trunk
changeset: 324823:06a13a5194fa
user:      kre <kre%NetBSD.org@localhost>
date:      Sun Jul 22 20:37:57 2018 +0000

description:
Minor cleanups to growstackblock().   This should really change
nothing that matters, but might be slightly more robust/complete.

diffstat:

 bin/sh/memalloc.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (60 lines):

diff -r 5f175ab0b273 -r 06a13a5194fa bin/sh/memalloc.c
--- a/bin/sh/memalloc.c Sun Jul 22 20:37:52 2018 +0000
+++ b/bin/sh/memalloc.c Sun Jul 22 20:37:57 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: memalloc.c,v 1.30 2017/06/17 07:22:12 kre Exp $        */
+/*     $NetBSD: memalloc.c,v 1.31 2018/07/22 20:37:57 kre Exp $        */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)memalloc.c 8.3 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: memalloc.c,v 1.30 2017/06/17 07:22:12 kre Exp $");
+__RCSID("$NetBSD: memalloc.c,v 1.31 2018/07/22 20:37:57 kre Exp $");
 #endif
 #endif /* not lint */
 
@@ -207,12 +207,12 @@
 {
        int newlen = SHELL_ALIGN(stacknleft * 2 + 100);
 
+       INTOFF;
        if (stacknxt == stackp->space && stackp != &stackbase) {
                struct stack_block *oldstackp;
                struct stackmark *xmark;
                struct stack_block *sp;
 
-               INTOFF;
                oldstackp = stackp;
                sp = stackp;
                stackp = sp->prev;
@@ -221,6 +221,7 @@
                sp->prev = stackp;
                stackp = sp;
                stacknxt = sp->space;
+               sstrnleft += newlen - stacknleft;
                stacknleft = newlen;
 
                /*
@@ -231,10 +232,10 @@
                while (xmark != NULL && xmark->stackp == oldstackp) {
                        xmark->stackp = stackp;
                        xmark->stacknxt = stacknxt;
+                       xmark->sstrnleft += stacknleft - xmark->stacknleft;
                        xmark->stacknleft = stacknleft;
                        xmark = xmark->marknext;
                }
-               INTON;
        } else {
                char *oldspace = stacknxt;
                int oldlen = stacknleft;
@@ -244,6 +245,7 @@
                stacknxt = p;                   /* free the space */
                stacknleft += newlen;           /* we just allocated */
        }
+       INTON;
 }
 
 void