Displaying 2 results from an estimated 2 matches for "5e080f6a".
Did you mean:
5e080863
2019 Jan 25
0
[klibc:update-dash] jobs: Handle string-based job descriptors
...t <steve at sk2.org>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
---
usr/dash/jobs.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/usr/dash/jobs.c b/usr/dash/jobs.c
index 7c324b76..5e080f6a 100644
--- a/usr/dash/jobs.c
+++ b/usr/dash/jobs.c
@@ -713,9 +713,7 @@ check:
}
found = 0;
- while (1) {
- if (!jp)
- goto err;
+ while (jp) {
if (match(jp->ps[0].cmd, p)) {
if (found)
goto err;
@@ -725,6 +723,10 @@ check:
jp = jp->prev_job;
}
+ if (!found)
+ goto...
2019 Jan 25
0
[klibc:update-dash] trap: Globally rename pendingsigs to pending_sig
...Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
---
usr/dash/jobs.c | 4 ++--
usr/dash/miscbltin.c | 2 +-
usr/dash/trap.c | 10 +++++-----
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 5e080f6a..a2602bae 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,...