[src/netbsd-1-5]: src/bin/sh Pullup 1.39 [hubertf]:

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

details:   https://anonhg.NetBSD.org/src/rev/7209a629b940
branches:  netbsd-1-5
changeset: 490106:7209a629b940
user:      tv <tv%NetBSD.org@localhost>
date:      Fri Nov 03 02:35:45 2000 +0000

description:
Pullup 1.39 [hubertf]:
Fixes PR 11283.

diffstat:

 bin/sh/main.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r ed52e14f68b1 -r 7209a629b940 bin/sh/main.c
--- a/bin/sh/main.c     Fri Nov 03 01:21:21 2000 +0000
+++ b/bin/sh/main.c     Fri Nov 03 02:35:45 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.38 2000/05/22 10:18:47 elric Exp $  */
+/*     $NetBSD: main.c,v 1.38.4.1 2000/11/03 02:35:45 tv Exp $ */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -46,7 +46,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.7 (Berkeley) 7/19/95";
 #else
-__RCSID("$NetBSD: main.c,v 1.38 2000/05/22 10:18:47 elric Exp $");
+__RCSID("$NetBSD: main.c,v 1.38.4.1 2000/11/03 02:35:45 tv Exp $");
 #endif
 #endif /* not lint */
 
@@ -266,12 +266,13 @@
                        evaltree(n, 0);
                }
                popstackmark(&smark);
+               setstackmark(&smark);
                if (evalskip == SKIPFILE) {
                        evalskip = 0;
                        break;
                }
        }
-       popstackmark(&smark);           /* unnecessary */
+       popstackmark(&smark);
 }