diff options
| author | Denys Vlasenko <dvlasenk@redhat.com> | 2016-10-26 19:28:29 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2020-03-28 21:42:54 +0000 |
| commit | e0829af46211f7919afe8f49dd3145c0cbb45d87 (patch) | |
| tree | 94bc9759dbca843da923ac158ef96700be0dda4a | |
| parent | 9885e7650e5daf90ddc2a9bb1dfc6af14e86ad9d (diff) | |
| download | klibc-e0829af46211f7919afe8f49dd3145c0cbb45d87.tar.gz | |
[klibc] dash: trap: Globally rename pendingsigs to pending_sig
[ dash commit 53dab360a1e0dddcfd83c6cbfc9f720f5e233550 ]
This variable does not contain "sigs" (plural).
It contains either 0 or (one) signal number of a pending signal.
For someone unfamiliar with this code, "pendingsigs" name is confusing -
it hints at being an array or bit mask of pending singnals.
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
CC: dash@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | usr/dash/jobs.c | 4 | ||||
| -rw-r--r-- | usr/dash/miscbltin.c | 2 | ||||
| -rw-r--r-- | usr/dash/trap.c | 10 | ||||
| -rw-r--r-- | usr/dash/trap.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/usr/dash/jobs.c b/usr/dash/jobs.c index c1f9688fc33b4..333a2a2269f1b 100644 --- a/usr/dash/jobs.c +++ b/usr/dash/jobs.c @@ -647,7 +647,7 @@ out: return retval; sigout: - retval = 128 + pendingsigs; + retval = 128 + pending_sig; goto out; } @@ -1146,7 +1146,7 @@ waitproc(int block, int *status) sigfillset(&mask); sigprocmask(SIG_SETMASK, &mask, &oldmask); - while (!gotsigchld && !pendingsigs) + while (!gotsigchld && !pending_sig) sigsuspend(&oldmask); sigclearmask(); diff --git a/usr/dash/miscbltin.c b/usr/dash/miscbltin.c index c47fdbf8e044b..fc14dc4beab2e 100644 --- a/usr/dash/miscbltin.c +++ b/usr/dash/miscbltin.c @@ -207,7 +207,7 @@ readcmd(int argc, char **argv) case 1: break; default: - if (errno == EINTR && !pendingsigs) + if (errno == EINTR && !pending_sig) continue; /* fall through */ case 0: diff --git a/usr/dash/trap.c b/usr/dash/trap.c index 89ceff4fe7c1a..a3aeb33eb0b67 100644 --- a/usr/dash/trap.c +++ b/usr/dash/trap.c @@ -74,7 +74,7 @@ char sigmode[NSIG - 1]; /* indicates specified signal received */ static char gotsig[NSIG - 1]; /* last pending signal */ -volatile sig_atomic_t pendingsigs; +volatile sig_atomic_t pending_sig; /* received SIGCHLD */ int gotsigchld; @@ -290,7 +290,7 @@ onsig(int signo) } gotsig[signo - 1] = 1; - pendingsigs = signo; + pending_sig = signo; if (signo == SIGINT && !trap[SIGINT]) { if (!suppressint) @@ -313,7 +313,7 @@ void dotrap(void) int i; int status, last_status; - if (!pendingsigs) + if (!pending_sig) return; status = savestatus; @@ -322,7 +322,7 @@ void dotrap(void) status = exitstatus; savestatus = status; } - pendingsigs = 0; + pending_sig = 0; barrier(); for (i = 0, q = gotsig; i < NSIG - 1; i++, q++) { @@ -330,7 +330,7 @@ void dotrap(void) continue; if (evalskip) { - pendingsigs = i + 1; + pending_sig = i + 1; break; } diff --git a/usr/dash/trap.h b/usr/dash/trap.h index 6590be1273e7b..a095b0e10c3a5 100644 --- a/usr/dash/trap.h +++ b/usr/dash/trap.h @@ -38,7 +38,7 @@ extern int trapcnt; extern char sigmode[]; -extern volatile sig_atomic_t pendingsigs; +extern volatile sig_atomic_t pending_sig; extern int gotsigchld; int trapcmd(int, char **); |