1dd6cf867
Denys Vlasenko
2009-05-02
Subject
hush: fix multiple redirections of the same fd (bug 227)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
shell/hush.c +6 -2shell/hush_test/hush-misc/redir6.right +4 -0shell/hush_test/hush-misc/redir6.tests +5 -0
shell/hush.c+6 -2
| @@ -2646,7 +2646,9 @@ static int setup_redirects(struct command *prog, int squirrel[]) | |
| for (redir = prog->redirects; redir; redir = redir->next) { | |
| if (redir->rd_type == REDIRECT_HEREDOC2) { | |
| /* rd_fd<<HERE case */ | |
| - | if (squirrel && redir->rd_fd < 3) { |
| + | if (squirrel && redir->rd_fd < 3 |
| + | && squirrel[redir->rd_fd] < 0 |
| + | ) { |
| squirrel[redir->rd_fd] = dup(redir->rd_fd); | |
| } | |
| /* for REDIRECT_HEREDOC2, rd_filename holds _contents_ | |
| @@ -2682,7 +2684,9 @@ static int setup_redirects(struct command *prog, int squirrel[]) | |
| } | |
| if (openfd != redir->rd_fd) { | |
| - | if (squirrel && redir->rd_fd < 3) { |
| + | if (squirrel && redir->rd_fd < 3 |
| + | && squirrel[redir->rd_fd] < 0 |
| + | ) { |
| squirrel[redir->rd_fd] = dup(redir->rd_fd); | |
| } | |
| if (openfd == REDIRFD_CLOSE) { | |
shell/hush_test/hush-misc/redir6.right+4 -0
| @@ -0,0 +1,4 @@ | |
| + | Testing multiple redirections to same fd |
| + | Hello |
| + | Done1 |
| + | Done2 |
shell/hush_test/hush-misc/redir6.tests+5 -0
| @@ -0,0 +1,5 @@ | |
| + | echo "Testing multiple redirections to same fd" |
| + | # bug was making us lose fd #1 after this: |
| + | echo Hello >/dev/null 1>&2 |
| + | echo Done1 |
| + | echo Done2 >&2 |