diff options
| author | jilles <jilles@FreeBSD.org> | 2014-03-08 19:44:34 +0000 |
|---|---|---|
| committer | jilles <jilles@FreeBSD.org> | 2014-03-08 19:44:34 +0000 |
| commit | 6139448a8684c288eb32e0763ef20749ab495847 (patch) | |
| tree | dbd858bb77071b4170dbaa3bc3218ea399c009c1 /bin/sh | |
| parent | 8dfc245ef95431f18412d2103ec22f44917d1805 (diff) | |
| download | FreeBSD-src-6139448a8684c288eb32e0763ef20749ab495847.zip FreeBSD-src-6139448a8684c288eb32e0763ef20749ab495847.tar.gz | |
sh: Successfully do nothing when killing a terminated job.
If a job has terminated but is still known, silently do nothing when using
the kill builtin with the job specifier. Formerly, the shell called kill()
with the process group ID that might have been reused.
Diffstat (limited to 'bin/sh')
| -rw-r--r-- | bin/sh/jobs.c | 2 | ||||
| -rw-r--r-- | bin/sh/tests/builtins/Makefile | 1 | ||||
| -rw-r--r-- | bin/sh/tests/builtins/kill1.0 | 8 |
3 files changed, 11 insertions, 0 deletions
diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c index 1c0c6bd..6e7791c 100644 --- a/bin/sh/jobs.c +++ b/bin/sh/jobs.c @@ -645,6 +645,8 @@ getjobpgrp(char *name) struct job *jp; jp = getjob(name); + if (jp->state == JOBDONE) + return 0; return -jp->ps[0].pid; } diff --git a/bin/sh/tests/builtins/Makefile b/bin/sh/tests/builtins/Makefile index 6f60f84..b76d631 100644 --- a/bin/sh/tests/builtins/Makefile +++ b/bin/sh/tests/builtins/Makefile @@ -86,6 +86,7 @@ FILES+= hash3.0 hash3.0.stdout FILES+= hash4.0 FILES+= jobid1.0 FILES+= jobid2.0 +FILES+= kill1.0 FILES+= lineno.0 lineno.0.stdout FILES+= lineno2.0 FILES+= local1.0 diff --git a/bin/sh/tests/builtins/kill1.0 b/bin/sh/tests/builtins/kill1.0 new file mode 100644 index 0000000..c1b8550 --- /dev/null +++ b/bin/sh/tests/builtins/kill1.0 @@ -0,0 +1,8 @@ +# $FreeBSD$ + +: & +p1=$! +: & +p2=$! +wait $p2 +kill %1 |
