aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Kraai <kraai@debian.org>2001-05-02 21:48:17 +0000
committerMatt Kraai <kraai@debian.org>2001-05-02 21:48:17 +0000
commit80abc45182ff8a526968d199add198f979875c77 (patch)
treeda6cf3cde215f3616ffd65d3e5ee77471ef4cc68
parentadcbc12d85b91929b73f3897bff7d1559aa39c51 (diff)
downloadbusybox-80abc45182ff8a526968d199add198f979875c77.tar.gz
Move up waitpid error check so that errno isn't clobbered by tcsetpgrp.
-rw-r--r--hush.c6
-rw-r--r--shell/hush.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/hush.c b/hush.c
index 4a16a3fa6..a7316f82e 100644
--- a/hush.c
+++ b/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
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()
}
}
+ 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