From b4e148e9ff342a2fa45e18a8bf2b6d39fcf4cbef Mon Sep 17 00:00:00 2001 From: Colin Percival Date: Thu, 22 Jan 2004 20:56:06 +0000 Subject: [PATCH] Serial murderers shouldn't commit suicide. (killall should avoid killing itself.) PR: bin/46107 Submitted by: stacey --- usr.bin/killall/killall.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.bin/killall/killall.c b/usr.bin/killall/killall.c index 3628da8af1a..6d1596903a5 100644 --- a/usr.bin/killall/killall.c +++ b/usr.bin/killall/killall.c @@ -118,6 +118,7 @@ main(int ac, char **av) int zflag = 0; uid_t uid = 0; dev_t tdev = 0; + pid_t mypid; char thiscmd[MAXCOMLEN + 1]; pid_t thispid; uid_t thisuid; @@ -303,6 +304,7 @@ main(int ac, char **av) nprocs = size / sizeof(struct kinfo_proc); if (dflag) printf("nprocs %d\n", nprocs); + mypid = getpid(); for (i = 0; i < nprocs; i++) { if ((procs[i].ki_stat & SZOMB) == SZOMB && !zflag) @@ -313,6 +315,8 @@ main(int ac, char **av) thistdev = procs[i].ki_tdev; thisuid = procs[i].ki_ruid; /* real uid */ + if (thispid == mypid) + continue; matched = 1; if (user) { if (thisuid != uid)