summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorMatt Kraai2001-05-02 21:48:17 +0000
committerMatt Kraai2001-05-02 21:48:17 +0000
commit80abc45182ff8a526968d199add198f979875c77 (patch)
treeda6cf3cde215f3616ffd65d3e5ee77471ef4cc68 /shell
parentadcbc12d85b91929b73f3897bff7d1559aa39c51 (diff)
downloadbusybox-80abc45182ff8a526968d199add198f979875c77.zip
busybox-80abc45182ff8a526968d199add198f979875c77.tar.gz
Move up waitpid error check so that errno isn't clobbered by tcsetpgrp.
Diffstat (limited to 'shell')
-rw-r--r--shell/hush.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/shell/hush.c b/shell/hush.c
index 4a16a3f..a7316f8 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1148,12 +1148,12 @@ static void checkjobs()
}
}
+ if (childpid == -1 && errno != ECHILD)
+ perror_msg("waitpid");
+
/* move the shell to the foreground */
if (tcsetpgrp(0, getpgrp()) && errno != ENOTTY)
perror_msg("tcsetpgrp");
-
- if (childpid == -1 && errno != ECHILD)
- perror_msg("waitpid");
}
/* run_pipe_real() starts all the jobs, but doesn't wait for anything