emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hush: fix heredoc_huge.tests broken in last commits

Browse Source
This commit is contained in:
Denis Vlasenko 2009-04-15 21:58:14 +00:00
parent c376db332c
commit 41ddecd9ed
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
shell/hush.c
View File

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