Module Name: src
Committed By: martin
Date: Sat Aug 25 17:14:39 UTC 2018
Modified Files:
src/bin/sh [netbsd-8]: eval.c
Log Message:
Fix merge mishap due to #983 / #989 pullup order.
To generate a diff of this commit:
cvs rdiff -u -r1.140.2.6 -r1.140.2.7 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.140.2.6 src/bin/sh/eval.c:1.140.2.7
--- src/bin/sh/eval.c:1.140.2.6 Sat Aug 25 14:48:22 2018
+++ src/bin/sh/eval.c Sat Aug 25 17:14:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: eval.c,v 1.140.2.6 2018/08/25 14:48:22 martin Exp $ */
+/* $NetBSD: eval.c,v 1.140.2.7 2018/08/25 17:14:38 martin 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.140.2.6 2018/08/25 14:48:22 martin Exp $");
+__RCSID("$NetBSD: eval.c,v 1.140.2.7 2018/08/25 17:14:38 martin Exp $");
#endif
#endif /* not lint */
@@ -1058,7 +1058,6 @@ evalcommand(union node *cmd, int flgs, s
switch (cmdentry.cmdtype) {
case CMDFUNCTION:
VXTRACE(DBG_EVAL, ("Shell function: "), trargs(argv));
- redirect(cmd->ncmd.redirect, flags & EV_MORE ? REDIR_PUSH : 0);
redirect(cmd->ncmd.redirect, REDIR_PUSH);
saveparam = shellparam;
shellparam.malloc = 0;
