aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorGravatar Rob Landley <rob@landley.net>2006-07-19 21:43:53 +0000
committerGravatar Rob Landley <rob@landley.net>2006-07-19 21:43:53 +0000
commit53702e53ba7fed674a885f7ca17c14ca70adb0c0 (patch)
treeeb590bf9154e50905e8b2cb6c6641538024037bd /shell
parent3b0cfb40a59c1e5537bdb44e4c8a9ad4b8a284da (diff)
downloadbusybox-53702e53ba7fed674a885f7ca17c14ca70adb0c0.tar.gz
busybox-53702e53ba7fed674a885f7ca17c14ca70adb0c0.tar.bz2
Replace the previous checkin with the correct fix.
Diffstat (limited to 'shell')
-rw-r--r--shell/hush.c4
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)
int i;
int nextin, nextout;
int pipefds[2]; /* pipefds[0] is for reading */
- struct child_prog *child = NULL;
+ struct child_prog *child;
const struct built_in_command *x;
char *p;
@@ -1295,7 +1295,7 @@ static int run_pipe_real(struct pipe *pi)
* Builtins within pipes have to fork anyway, and are handled in
* pseudo_exec. "echo foo | read bar" doesn't work on bash, either.
*/
- if (pi->num_progs == 1) child = & (pi->progs[0]);
+ child = & (pi->progs[0]);
if (pi->num_progs == 1 && child->group && child->subshell == 0) {
int squirrel[] = {-1, -1, -1};
int rcode;