diff options
Diffstat (limited to 'shell/hush.c')
-rw-r--r-- | shell/hush.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/shell/hush.c b/shell/hush.c index cbec2dd71..5daca960c 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
@@ -2646,7 +2646,9 @@ static int setup_redirects(struct command *prog, int squirrel[]) | |||
2646 | for (redir = prog->redirects; redir; redir = redir->next) { | 2646 | for (redir = prog->redirects; redir; redir = redir->next) { |
2647 | if (redir->rd_type == REDIRECT_HEREDOC2) { | 2647 | if (redir->rd_type == REDIRECT_HEREDOC2) { |
2648 | /* rd_fd<<HERE case */ | 2648 | /* rd_fd<<HERE case */ |
2649 | if (squirrel && redir->rd_fd < 3) { | 2649 | if (squirrel && redir->rd_fd < 3 |
2650 | && squirrel[redir->rd_fd] < 0 | ||
2651 | ) { | ||
2650 | squirrel[redir->rd_fd] = dup(redir->rd_fd); | 2652 | squirrel[redir->rd_fd] = dup(redir->rd_fd); |
2651 | } | 2653 | } |
2652 | /* for REDIRECT_HEREDOC2, rd_filename holds _contents_ | 2654 | /* for REDIRECT_HEREDOC2, rd_filename holds _contents_ |
@@ -2682,7 +2684,9 @@ static int setup_redirects(struct command *prog, int squirrel[]) | |||
2682 | } | 2684 | } |
2683 | 2685 | ||
2684 | if (openfd != redir->rd_fd) { | 2686 | if (openfd != redir->rd_fd) { |
2685 | if (squirrel && redir->rd_fd < 3) { | 2687 | if (squirrel && redir->rd_fd < 3 |
2688 | && squirrel[redir->rd_fd] < 0 | ||
2689 | ) { | ||
2686 | squirrel[redir->rd_fd] = dup(redir->rd_fd); | 2690 | squirrel[redir->rd_fd] = dup(redir->rd_fd); |
2687 | } | 2691 | } |
2688 | if (openfd == REDIRFD_CLOSE) { | 2692 | if (openfd == REDIRFD_CLOSE) { |