From 41ddecd9ed27239e478e65886fec3f0fd23f8cdb Mon Sep 17 00:00:00 2001
From: Denis Vlasenko
Date: Wed, 15 Apr 2009 21:58:14 +0000
Subject: hush: fix heredoc_huge.tests broken in last commits

---
 shell/hush.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'shell')

diff --git a/shell/hush.c b/shell/hush.c
index b91e8c3..1753be0 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -2461,11 +2461,15 @@ static void setup_heredoc(struct redir_struct *redir)
 	 * for the unsuspecting parent process. Child creates a grandchild
 	 * and exits before parent execs the process which consumes heredoc
 	 * (that exec happens after we return from this function) */
+#if !BB_MMU
+	to_free = NULL;
+#endif
 	pid = vfork();
 	if (pid < 0)
 		bb_perror_msg_and_die("vfork");
 	if (pid == 0) {
 		/* child */
+		disable_restore_tty_pgrp_on_exit();
 		pid = BB_MMU ? fork() : vfork();
 		if (pid < 0)
 			bb_perror_msg_and_die(BB_MMU ? "fork" : "vfork");
@@ -2478,7 +2482,6 @@ static void setup_heredoc(struct redir_struct *redir)
 		_exit(0);
 #else
 		/* Delegate blocking writes to another process */
-		disable_restore_tty_pgrp_on_exit();
 		xmove_fd(pair.wr, STDOUT_FILENO);
 		re_execute_shell(&to_free, heredoc, NULL, NULL);
 #endif
-- 
cgit v1.1