aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorkraai <kraai@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-05-02 21:48:17 +0000
committerkraai <kraai@69ca8d6d-28ef-0310-b511-8ec308f3f277>2001-05-02 21:48:17 +0000
commit2c073af0d8c2e44334c23deb5db4c90c21443407 (patch)
treeda6cf3cde215f3616ffd65d3e5ee77471ef4cc68 /shell
parent58ce399556c73c06ab81f53b0c31e5d72f78f6b0 (diff)
downloadbusybox-w32-2c073af0d8c2e44334c23deb5db4c90c21443407.tar.gz
busybox-w32-2c073af0d8c2e44334c23deb5db4c90c21443407.tar.bz2
busybox-w32-2c073af0d8c2e44334c23deb5db4c90c21443407.zip
Move up waitpid error check so that errno isn't clobbered by tcsetpgrp.
git-svn-id: svn://busybox.net/trunk/busybox@2519 69ca8d6d-28ef-0310-b511-8ec308f3f277
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 4a16a3fa6..a7316f82e 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1148,12 +1148,12 @@ static void checkjobs()
1148 } 1148 }
1149 } 1149 }
1150 1150
1151 if (childpid == -1 && errno != ECHILD)
1152 perror_msg("waitpid");
1153
1151 /* move the shell to the foreground */ 1154 /* move the shell to the foreground */
1152 if (tcsetpgrp(0, getpgrp()) && errno != ENOTTY) 1155 if (tcsetpgrp(0, getpgrp()) && errno != ENOTTY)
1153 perror_msg("tcsetpgrp"); 1156 perror_msg("tcsetpgrp");
1154
1155 if (childpid == -1 && errno != ECHILD)
1156 perror_msg("waitpid");
1157} 1157}
1158 1158
1159/* run_pipe_real() starts all the jobs, but doesn't wait for anything 1159/* run_pipe_real() starts all the jobs, but doesn't wait for anything