CVS commit: src/bin/sh

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Sun Mar 13 15:57:30 UTC 2016

Modified Files:
        src/bin/sh: eval.c

Log Message:
We want this to work too:
        $ cat sep1
        #!/bin/sh
        { ./sep2; } 3>out

        $ cat sep2
        #!/bin/sh
        echo sep2 >&3

        $ ./sep1


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/bin/sh/eval.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/bin/sh/eval.c
diff -u src/bin/sh/eval.c:1.117 src/bin/sh/eval.c:1.118
--- src/bin/sh/eval.c:1.117	Sat Mar 12 16:35:13 2016
+++ src/bin/sh/eval.c	Sun Mar 13 11:57:30 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: eval.c,v 1.117 2016/03/12 21:35:13 christos Exp $	*/
+/*	$NetBSD: eval.c,v 1.118 2016/03/13 15:57:30 christos Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)eval.c	8.9 (Berkeley) 6/8/95";
 #else
-__RCSID("$NetBSD: eval.c,v 1.117 2016/03/12 21:35:13 christos Exp $");
+__RCSID("$NetBSD: eval.c,v 1.118 2016/03/13 15:57:30 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -281,7 +281,7 @@ evaltree(union node *n, int flags)
 		break;
 	case NREDIR:
 		expredir(n->nredir.redirect);
-		redirect(n->nredir.redirect, REDIR_PUSH);
+		redirect(n->nredir.redirect, REDIR_PUSH | REDIR_KEEP);
 		evaltree(n->nredir.n, flags);
 		popredir();
 		break;