emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

killall5: return 2 if no processes got killed

Browse Source 
function                                             old     new   delta
kill_main                                            943     992     +49

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Uros Vampl 2013-12-16 17:44:58 +01:00 committed by Denys Vlasenko
parent 9f4f60183b
commit 3ac1e0d753
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
procps/kill.c
View File

@ -158,7 +158,8 @@ int kill_main(int argc, char **argv)
if (killall5) { if (killall5) {
pid_t sid; pid_t sid;
procps_status_t* p = NULL; procps_status_t* p = NULL;
int ret = 0; /* compat: exitcode 2 is "no one was signaled" */
int ret = 2;
/* Find out our session id */ /* Find out our session id */
sid = getsid(pid); sid = getsid(pid);
@ -170,6 +171,7 @@ int kill_main(int argc, char **argv)
int i; int i;
if (p->sid == (unsigned)sid if (p->sid == (unsigned)sid
|| p->sid == 0 /* compat: kernel thread, don't signal it */
|| p->pid == (unsigned)pid || p->pid == (unsigned)pid
|| p->pid == 1 || p->pid == 1
) { ) {
@ -200,6 +202,7 @@ int kill_main(int argc, char **argv)
goto dont_kill; goto dont_kill;
} }
kill(p->pid, signo); kill(p->pid, signo);
ret = 0;
dont_kill: ; dont_kill: ;
} }
resume: resume: