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

Make killall and killall5 selecatable independent from kill

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2016-11-23 06:43:46 +01:00
parent f8f81ed7aa
commit 5467d268f0
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
procps/kill.c
View File

@ -18,7 +18,6 @@
//config:config KILLALL //config:config KILLALL
//config: bool "killall" //config: bool "killall"
//config: default y //config: default y
//config: depends on KILL
//config: help //config: help
//config: killall sends a signal to all processes running any of the //config: killall sends a signal to all processes running any of the
//config: specified commands. If no signal name is specified, SIGTERM is //config: specified commands. If no signal name is specified, SIGTERM is
@ -27,8 +26,11 @@
//config:config KILLALL5 //config:config KILLALL5
//config: bool "killall5" //config: bool "killall5"
//config: default y //config: default y
//config: depends on KILL //config: help
//config: //config: The SystemV killall command. killall5 sends a signal
//config: to all processes except kernel threads and the processes
//config: in its own session, so it won't kill the shell that is running
//config: the script it was called from.
//applet:IF_KILL(APPLET(kill, BB_DIR_BIN, BB_SUID_DROP)) //applet:IF_KILL(APPLET(kill, BB_DIR_BIN, BB_SUID_DROP))
//applet:IF_KILLALL(APPLET_ODDNAME(killall, kill, BB_DIR_USR_BIN, BB_SUID_DROP, killall)) //applet:IF_KILLALL(APPLET_ODDNAME(killall, kill, BB_DIR_USR_BIN, BB_SUID_DROP, killall))
@ -95,17 +97,23 @@ int kill_main(int argc UNUSED_PARAM, char **argv)
char *arg; char *arg;
pid_t pid; pid_t pid;
int signo = SIGTERM, errors = 0, quiet = 0; int signo = SIGTERM, errors = 0, quiet = 0;
#if !ENABLE_KILLALL && !ENABLE_KILLALL5 #if ENABLE_KILL && !ENABLE_KILLALL && !ENABLE_KILLALL5
#define killall 0 # define killall 0
#define killall5 0 # define killall5 0
#elif !ENABLE_KILL && ENABLE_KILLALL && !ENABLE_KILLALL5
# define killall 1
# define killall5 0
#elif !ENABLE_KILL && !ENABLE_KILLALL && ENABLE_KILLALL5
# define killall 0
# define killall5 1
#else #else
/* How to determine who we are? find 3rd char from the end: /* How to determine who we are? find 3rd char from the end:
* kill, killall, killall5 * kill, killall, killall5
* ^i ^a ^l - it's unique * ^i ^a ^l - it's unique
* (checking from the start is complicated by /bin/kill... case) */ * (checking from the start is complicated by /bin/kill... case) */
const char char3 = argv[0][strlen(argv[0]) - 3]; const char char3 = argv[0][strlen(argv[0]) - 3];
#define killall (ENABLE_KILLALL && char3 == 'a') # define killall (ENABLE_KILLALL && char3 == 'a')
#define killall5 (ENABLE_KILLALL5 && char3 == 'l') # define killall5 (ENABLE_KILLALL5 && char3 == 'l')
#endif #endif
/* Parse any options */ /* Parse any options */