diff options
author | landley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-07-19 21:43:53 +0000 |
---|---|---|
committer | landley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-07-19 21:43:53 +0000 |
commit | 087c0e689d2bf3853793490e392767a0fffa60bc (patch) | |
tree | eb590bf9154e50905e8b2cb6c6641538024037bd /shell | |
parent | 33003133ee87da6dc91ddf4f74ac02d79b9a7a0f (diff) | |
download | busybox-w32-087c0e689d2bf3853793490e392767a0fffa60bc.tar.gz busybox-w32-087c0e689d2bf3853793490e392767a0fffa60bc.tar.bz2 busybox-w32-087c0e689d2bf3853793490e392767a0fffa60bc.zip |
Replace the previous checkin with the correct fix.
git-svn-id: svn://busybox.net/trunk/busybox@15728 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'shell')
-rw-r--r-- | shell/hush.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/hush.c b/shell/hush.c index fedb784e4..8c432942e 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
@@ -1284,7 +1284,7 @@ static int run_pipe_real(struct pipe *pi) | |||
1284 | int i; | 1284 | int i; |
1285 | int nextin, nextout; | 1285 | int nextin, nextout; |
1286 | int pipefds[2]; /* pipefds[0] is for reading */ | 1286 | int pipefds[2]; /* pipefds[0] is for reading */ |
1287 | struct child_prog *child = NULL; | 1287 | struct child_prog *child; |
1288 | const struct built_in_command *x; | 1288 | const struct built_in_command *x; |
1289 | char *p; | 1289 | char *p; |
1290 | 1290 | ||
@@ -1295,7 +1295,7 @@ static int run_pipe_real(struct pipe *pi) | |||
1295 | * Builtins within pipes have to fork anyway, and are handled in | 1295 | * Builtins within pipes have to fork anyway, and are handled in |
1296 | * pseudo_exec. "echo foo | read bar" doesn't work on bash, either. | 1296 | * pseudo_exec. "echo foo | read bar" doesn't work on bash, either. |
1297 | */ | 1297 | */ |
1298 | if (pi->num_progs == 1) child = & (pi->progs[0]); | 1298 | child = & (pi->progs[0]); |
1299 | if (pi->num_progs == 1 && child->group && child->subshell == 0) { | 1299 | if (pi->num_progs == 1 && child->group && child->subshell == 0) { |
1300 | int squirrel[] = {-1, -1, -1}; | 1300 | int squirrel[] = {-1, -1, -1}; |
1301 | int rcode; | 1301 | int rcode; |