X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=procps%2Fkill.c;h=224e5ad1a41c21d68220318183c467974f921615;hb=66426760beef7e87c4735f433d123daf911b5b4a;hp=323ee7bf4e6bd531bc2df47d62e73183194c8cee;hpb=a4f4de9b7e73d89ef727796e06172419ab8a177c;p=oweals%2Fbusybox.git diff --git a/procps/kill.c b/procps/kill.c index 323ee7bf4..224e5ad1a 100644 --- a/procps/kill.c +++ b/procps/kill.c @@ -5,9 +5,45 @@ * Copyright (C) 1995, 1996 by Bruce Perens . * Copyright (C) 1999-2004 by Erik Andersen * - * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//usage:#define kill_trivial_usage +//usage: "[-l] [-SIG] PID..." +//usage:#define kill_full_usage "\n\n" +//usage: "Send a signal (default: TERM) to given PIDs\n" +//usage: "\n -l List all signal names and numbers" +/* //usage: "\n -s SIG Yet another way of specifying SIG" */ +//usage: +//usage:#define kill_example_usage +//usage: "$ ps | grep apache\n" +//usage: "252 root root S [apache]\n" +//usage: "263 www-data www-data S [apache]\n" +//usage: "264 www-data www-data S [apache]\n" +//usage: "265 www-data www-data S [apache]\n" +//usage: "266 www-data www-data S [apache]\n" +//usage: "267 www-data www-data S [apache]\n" +//usage: "$ kill 252\n" +//usage: +//usage:#define killall_trivial_usage +//usage: "[-l] [-q] [-SIG] PROCESS_NAME..." +//usage:#define killall_full_usage "\n\n" +//usage: "Send a signal (default: TERM) to given processes\n" +//usage: "\n -l List all signal names and numbers" +/* //usage: "\n -s SIG Yet another way of specifying SIG" */ +//usage: "\n -q Don't complain if no processes were killed" +//usage: +//usage:#define killall_example_usage +//usage: "$ killall apache\n" +//usage: +//usage:#define killall5_trivial_usage +//usage: "[-l] [-SIG] [-o PID]..." +//usage:#define killall5_full_usage "\n\n" +//usage: "Send a signal (default: TERM) to all processes outside current session\n" +//usage: "\n -l List all signal names and numbers" +//usage: "\n -o PID Don't signal this PID" +/* //usage: "\n -s SIG Yet another way of specifying SIG" */ + #include "libbb.h" /* Note: kill_main is directly called from shell in order to implement @@ -24,7 +60,6 @@ * This is needed to avoid collision with kill -9 ... syntax */ -int kill_main(int argc, char **argv); int kill_main(int argc, char **argv) { char *arg; @@ -93,49 +128,91 @@ int kill_main(int argc, char **argv) quiet = 1; arg = *++argv; argc--; - if (argc < 1) bb_show_usage(); - if (arg[0] != '-') goto do_it_now; + if (argc < 1) + bb_show_usage(); + if (arg[0] != '-') + goto do_it_now; } - /* -SIG */ - signo = get_signum(&arg[1]); + 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? */ + argc--; + arg = *++argv; + } /* else it must be -SIG */ + signo = get_signum(arg); if (signo < 0) { /* || signo > MAX_SIGNUM ? */ - bb_error_msg("bad signal name '%s'", &arg[1]); + bb_error_msg("bad signal name '%s'", arg); return EXIT_FAILURE; } arg = *++argv; argc--; -do_it_now: + do_it_now: + pid = getpid(); if (killall5) { pid_t sid; procps_status_t* p = NULL; + int ret = 0; - /* Now stop all processes */ - kill(-1, SIGSTOP); - /* Find out our own session id */ - pid = getpid(); + /* Find out our session id */ sid = getsid(pid); - /* Now kill all processes except our session */ + /* Stop all processes */ + kill(-1, SIGSTOP); + /* Signal all processes except those in our session */ while ((p = procps_scan(p, PSSCAN_PID|PSSCAN_SID))) { - if (p->sid != sid && p->pid != pid && p->pid != 1) - kill(p->pid, signo); + int i; + + 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("invalid number '%s'", arg); + ret = 1; + goto resume; + } + if (p->pid == omit) + goto dont_kill; + } + kill(p->pid, signo); + dont_kill: ; } + resume: /* And let them continue */ kill(-1, SIGCONT); - return 0; + return ret; } /* Pid or name is required for kill/killall */ if (argc < 1) { - puts("You need to specify whom to kill"); + bb_error_msg("you need to specify whom to kill"); return EXIT_FAILURE; } if (killall) { /* Looks like they want to do a killall. Do that */ - pid = getpid(); while (arg) { pid_t* pidList; @@ -154,7 +231,7 @@ do_it_now: continue; errors++; if (!quiet) - bb_perror_msg("cannot kill pid %u", (unsigned)*pl); + bb_perror_msg("can't kill pid %d", (int)*pl); } } free(pidList); @@ -165,17 +242,37 @@ do_it_now: /* Looks like they want to do a kill. Do that */ while (arg) { - /* Support shell 'space' trick */ - if (arg[0] == ' ') - arg++; +#if ENABLE_ASH || ENABLE_HUSH + /* + * We need to support shell's "hack formats" of + * " -PRGP_ID" (yes, with a leading space) + * and " PID1 PID2 PID3" (with degenerate case "") + */ + while (*arg != '\0') { + char *end; + if (*arg == ' ') + arg++; + pid = bb_strtoi(arg, &end, 10); + if (errno && (errno != EINVAL || *end != ' ')) { + bb_error_msg("invalid number '%s'", arg); + *end = '\0'; + errors++; + } else if (kill(pid, signo) != 0) { + bb_perror_msg("can't kill pid %d", (int)pid); + errors++; + } + arg = end; /* can only point to ' ' or '\0' now */ + } +#else pid = bb_strtoi(arg, NULL, 10); if (errno) { - bb_error_msg("bad pid '%s'", arg); + bb_error_msg("invalid number '%s'", arg); errors++; } else if (kill(pid, signo) != 0) { - bb_perror_msg("cannot kill pid %d", (int)pid); + bb_perror_msg("can't kill pid %d", (int)pid); errors++; } +#endif arg = *++argv; } return errors;