Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-8]: src/bin/sh Fix merge mishap due to #983 / #989 pullup order.
details: https://anonhg.NetBSD.org/src/rev/085ba35051c0
branches: netbsd-8
changeset: 435215:085ba35051c0
user: martin <martin%NetBSD.org@localhost>
date: Sat Aug 25 17:14:38 2018 +0000
description:
Fix merge mishap due to #983 / #989 pullup order.
diffstat:
bin/sh/eval.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diffs (26 lines):
diff -r b329cfa5ebe2 -r 085ba35051c0 bin/sh/eval.c
--- a/bin/sh/eval.c Sat Aug 25 14:50:21 2018 +0000
+++ b/bin/sh/eval.c Sat Aug 25 17:14:38 2018 +0000
@@ -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 @@
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;
Home |
Main Index |
Thread Index |
Old Index