[src/netbsd-1-4]: src/bin/sh pullup 1.45->1.46 (christos)

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

details:   https://anonhg.NetBSD.org/src/rev/31f9bf0db1bf
branches:  netbsd-1-4
changeset: 469128:31f9bf0db1bf
user:      perry <perry%NetBSD.org@localhost>
date:      Thu Jul 01 15:20:58 1999 +0000

description:
pullup 1.45->1.46 (christos)

diffstat:

 bin/sh/eval.c |  15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diffs (39 lines):

diff -r fceb78edd3d8 -r 31f9bf0db1bf bin/sh/eval.c
--- a/bin/sh/eval.c     Thu Jul 01 15:19:54 1999 +0000
+++ b/bin/sh/eval.c     Thu Jul 01 15:20:58 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: eval.c,v 1.45 1999/02/04 16:17:39 christos Exp $       */
+/*     $NetBSD: eval.c,v 1.45.2.1 1999/07/01 15:20:58 perry Exp $      */
 
 /*-
  * Copyright (c) 1993
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)eval.c     8.9 (Berkeley) 6/8/95";
 #else
-__RCSID("$NetBSD: eval.c,v 1.45 1999/02/04 16:17:39 christos Exp $");
+__RCSID("$NetBSD: eval.c,v 1.45.2.1 1999/07/01 15:20:58 perry Exp $");
 #endif
 #endif /* not lint */
 
@@ -546,10 +546,19 @@
                exitstatus = 0;
                goto out;
        }
+#ifdef notyet
+       /*
+        * For now we disable executing builtins in the same
+        * context as the shell, because we are not keeping
+        * enough state to recover from changes that are
+        * supposed only to affect subshells. eg. echo "`cd /`"
+        */
        if (n->type == NCMD) {
                exitstatus = oexitstatus;
                evalcommand(n, EV_BACKCMD, result);
-       } else {
+       } else
+#endif
+       {
                exitstatus = 0;
                if (pipe(pip) < 0)
                        error("Pipe call failed");