summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorJohannes Schindelin2017-07-14 22:25:58 +0200
committerDenys Vlasenko2017-07-15 11:38:00 +0200
commit9d4dc84a769e3e45e420fbef7c7bb2acbbdccd8e (patch)
tree36ca0ab2f7bd11e3da35a4ec2714c71aa5f03e99 /shell
parent7d7c7bb2205b92359ac88f3469d3af672e2be929 (diff)
downloadbusybox-9d4dc84a769e3e45e420fbef7c7bb2acbbdccd8e.zip
busybox-9d4dc84a769e3e45e420fbef7c7bb2acbbdccd8e.tar.gz
ash: protect WIFSTOPPED use with #if JOBS
This change fixes the build in setups where there are no headers defining WIFSTOPPED and WSTOPSIG (where JOBS has to be set to 0). This partially reverts 4700fb5be (ash: make dowait() a bit more readable. Logic is unchanged, 2015-10-09). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 8c2098d..b0c7dac 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -4022,15 +4022,19 @@ sprint_status48(char *s, int status, int sigonly)
col = 0;
if (!WIFEXITED(status)) {
- if (JOBS && WIFSTOPPED(status))
+#if JOBS
+ if (WIFSTOPPED(status))
st = WSTOPSIG(status);
else
+#endif
st = WTERMSIG(status);
if (sigonly) {
if (st == SIGINT || st == SIGPIPE)
goto out;
- if (JOBS && WIFSTOPPED(status))
+#if JOBS
+ if (WIFSTOPPED(status))
goto out;
+#endif
}
st &= 0x7f;
//TODO: use bbox's get_signame? strsignal adds ~600 bytes to text+rodata
@@ -4182,8 +4186,10 @@ dowait(int block, struct job *job)
goto out;
}
/* The process wasn't found in job list */
- if (JOBS && !WIFSTOPPED(status))
+#if JOBS
+ if (!WIFSTOPPED(status))
jobless--;
+#endif
out:
INT_ON;