summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorjilles <jilles@FreeBSD.org>2012-07-15 10:49:16 +0000
committerjilles <jilles@FreeBSD.org>2012-07-15 10:49:16 +0000
commit4d945ad412911425ef9b9dcb54ae11c825cd2bf7 (patch)
tree24f2d5709e4adb690e8c0510c64f8eaa52aa817c /bin
parent6e014f4c1135587f4fa94b7acc99ff303f8e7182 (diff)
downloadFreeBSD-src-4d945ad412911425ef9b9dcb54ae11c825cd2bf7.zip
FreeBSD-src-4d945ad412911425ef9b9dcb54ae11c825cd2bf7.tar.gz
sh: Remove unused variable in_dowait.
Diffstat (limited to 'bin')
-rw-r--r--bin/sh/jobs.c3
-rw-r--r--bin/sh/jobs.h1
2 files changed, 0 insertions, 4 deletions
diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c
index f6f6618..1dc722f 100644
--- a/bin/sh/jobs.c
+++ b/bin/sh/jobs.c
@@ -84,7 +84,6 @@ static struct job *jobmru; /* most recently used job list */
static pid_t initialpgrp; /* pgrp of shell on invocation */
#endif
int in_waitcmd = 0; /* are we in waitcmd()? */
-int in_dowait = 0; /* are we in dowait()? */
volatile sig_atomic_t breakwaitcmd = 0; /* should wait be terminated? */
static int ttyfd = -1;
@@ -1023,14 +1022,12 @@ dowait(int block, struct job *job)
int sig;
int coredump;
- in_dowait++;
TRACE(("dowait(%d) called\n", block));
do {
pid = waitproc(block, &status);
TRACE(("wait returns %d, status=%d\n", (int)pid, status));
} while ((pid == -1 && errno == EINTR && breakwaitcmd == 0) ||
(pid > 0 && WIFSTOPPED(status) && !iflag));
- in_dowait--;
if (pid == -1 && errno == ECHILD && job != NULL)
job->state = JOBDONE;
if (breakwaitcmd != 0) {
diff --git a/bin/sh/jobs.h b/bin/sh/jobs.h
index e741b2c..1570b46 100644
--- a/bin/sh/jobs.h
+++ b/bin/sh/jobs.h
@@ -84,7 +84,6 @@ enum {
extern int job_warning; /* user was warned about stopped jobs */
extern int in_waitcmd; /* are we in waitcmd()? */
-extern int in_dowait; /* are we in dowait()? */
extern volatile sig_atomic_t breakwaitcmd; /* break wait to process traps? */
void setjobctl(int);
OpenPOWER on IntegriCloud