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

function old new delta

Browse Source 
kill_main                                            706     884    +178
This commit is contained in:
Denis Vlasenko 2009-02-07 22:30:39 +00:00
parent 2ca84f6064
commit a0ab943492
2 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/usage.h
View File

@ -2123,11 +2123,12 @@
"$ killall apache\n" "$ killall apache\n"
#define killall5_trivial_usage \ #define killall5_trivial_usage \
"[-l] [-SIG]" "[-l] [-SIG] [-o PID]..."
#define killall5_full_usage "\n\n" \ #define killall5_full_usage "\n\n" \
"Send a signal (default is TERM) to all processes outside current session\n" \ "Send a signal (default is TERM) to all processes outside current session\n" \
"\nOptions:" \ "\nOptions:" \
"\n -l List all signal names and numbers" \ "\n -l List all signal names and numbers" \
"\n -o PID Do not signal this PID" \
/* "\n -s SIG Yet another way of specifying SIG" */ \ /* "\n -s SIG Yet another way of specifying SIG" */ \
#define klogd_trivial_usage \ #define klogd_trivial_usage \

57
procps/kill.c
View File

@ -92,11 +92,18 @@ int kill_main(int argc, char **argv)
quiet = 1; quiet = 1;
arg = *++argv; arg = *++argv;
argc--; argc--;
if (argc < 1) bb_show_usage(); if (argc < 1)
if (arg[0] != '-') goto do_it_now; bb_show_usage();
if (arg[0] != '-')
goto do_it_now;
} }
arg++; /* skip '-' */ arg++; /* skip '-' */
/* -o PID? (if present, it always is at the end of command line) */
if (killall5 && arg[0] == 'o')
goto do_it_now;
if (argc > 1 && arg[0] == 's' && arg[1] == '\0') { /* -s SIG? */ if (argc > 1 && arg[0] == 's' && arg[1] == '\0') { /* -s SIG? */
argc--; argc--;
arg = *++argv; arg = *++argv;
@ -109,25 +116,57 @@ int kill_main(int argc, char **argv)
arg = *++argv; arg = *++argv;
argc--; argc--;
do_it_now: do_it_now:
pid = getpid(); pid = getpid();
if (killall5) { if (killall5) {
pid_t sid; pid_t sid;
procps_status_t* p = NULL; procps_status_t* p = NULL;
int ret = 0;
/* Find out our own session id */ /* Find out our session id */
sid = getsid(pid); sid = getsid(pid);
/* Now stop all processes */ /* Stop all processes */
kill(-1, SIGSTOP); kill(-1, SIGSTOP);
/* Now kill all processes except our session */ /* Signal all processes except those in our session */
while ((p = procps_scan(p, PSSCAN_PID|PSSCAN_SID))) { while ((p = procps_scan(p, PSSCAN_PID|PSSCAN_SID))) {
if (p->sid != (unsigned)sid && p->pid != (unsigned)pid && p->pid != 1) int i;
kill(p->pid, signo);
if (p->sid == (unsigned)sid
|| p->pid == (unsigned)pid
|| p->pid == 1)
continue;
/* All remaining args must be -o PID options.
* Check p->pid against them. */
for (i = 0; i < argc; i++) {
pid_t omit;
arg = argv[i];
if (arg[0] != '-' || arg[1] != 'o') {
bb_error_msg("bad option '%s'", arg);
ret = 1;
goto resume;
}
arg += 2;
if (!arg[0] && argv[++i])
arg = argv[i];
omit = bb_strtoi(arg, NULL, 10);
if (errno) {
bb_error_msg("bad pid '%s'", arg);
ret = 1;
goto resume;
}
if (p->pid == omit)
goto dont_kill;
}
kill(p->pid, signo);
dont_kill: ;
} }
resume:
/* And let them continue */ /* And let them continue */
kill(-1, SIGCONT); kill(-1, SIGCONT);
return 0; return ret;
} }
/* Pid or name is required for kill/killall */ /* Pid or name is required for kill/killall */