X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=procps%2Fkill.c;h=224e5ad1a41c21d68220318183c467974f921615;hb=66426760beef7e87c4735f433d123daf911b5b4a;hp=ca6f4203ad71aba3e0357daab3c87d64d7d15a78;hpb=e15d7573a1263fb364d1678c3a46be47a8b5e5ea;p=oweals%2Fbusybox.git diff --git a/procps/kill.c b/procps/kill.c index ca6f4203a..224e5ad1a 100644 --- a/procps/kill.c +++ b/procps/kill.c @@ -1,146 +1,279 @@ /* vi: set sw=4 ts=4: */ /* - * Mini kill/killall implementation for busybox + * Mini kill/killall[5] implementation for busybox * * 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. */ -#include "busybox.h" -#include -#include -#include -#include -#include -#include -#include -#include +//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" */ -#define KILL 0 -#define KILLALL 1 +#include "libbb.h" + +/* Note: kill_main is directly called from shell in order to implement + * kill built-in. Shell substitutes job ids with process groups first. + * + * This brings some complications: + * + * + we can't use xfunc here + * + we can't use applet_name + * + we can't use bb_show_usage + * (Above doesn't apply for killall[5] cases) + * + * kill %n gets translated into kill ' -' by shell (note space!) + * This is needed to avoid collision with kill -9 ... syntax + */ int kill_main(int argc, char **argv) { - int whichApp, signo = SIGTERM; - const char *name; - int errors = 0; - -#ifdef CONFIG_KILLALL - int quiet=0; - /* Figure out what we are trying to do here */ - whichApp = (strcmp(bb_applet_name, "killall") == 0)? KILLALL : KILL; + char *arg; + pid_t pid; + int signo = SIGTERM, errors = 0, quiet = 0; +#if !ENABLE_KILLALL && !ENABLE_KILLALL5 +#define killall 0 +#define killall5 0 #else - whichApp = KILL; +/* How to determine who we are? find 3rd char from the end: + * kill, killall, killall5 + * ^i ^a ^l - it's unique + * (checking from the start is complicated by /bin/kill... case) */ + const char char3 = argv[0][strlen(argv[0]) - 3]; +#define killall (ENABLE_KILLALL && char3 == 'a') +#define killall5 (ENABLE_KILLALL5 && char3 == 'l') #endif /* Parse any options */ - if (argc < 2) - bb_show_usage(); + argc--; + arg = *++argv; - if(argv[1][0] != '-'){ - argv++; - argc--; + if (argc < 1 || arg[0] != '-') { goto do_it_now; } - /* The -l option, which prints out signal names. */ - if(argv[1][1]=='l' && argv[1][2]=='\0'){ - if(argc==2) { + /* The -l option, which prints out signal names. + * Intended usage in shell: + * echo "Died of SIG`kill -l $?`" + * We try to mimic what kill from coreutils-6.8 does */ + if (arg[1] == 'l' && arg[2] == '\0') { + if (argc == 1) { /* Print the whole signal list */ - int col = 0; - for(signo=1; signo < NSIG; signo++) { - name = u_signal_names(0, &signo, 1); - if(name==NULL) /* unnamed */ - continue; - col += printf("%2d) %-16s", signo, name); - if (col > 60) { - printf("\n"); - col = 0; + print_signames(); + return 0; + } + /* -l */ + while ((arg = *++argv)) { + if (isdigit(arg[0])) { + signo = bb_strtou(arg, NULL, 10); + if (errno) { + bb_error_msg("unknown signal '%s'", arg); + return EXIT_FAILURE; } - } - printf("\n"); - - } else { - for(argv++; *argv; argv++) { - name = u_signal_names(*argv, &signo, -1); - if(name!=NULL) - printf("%s\n", name); + /* Exitcodes >= 0x80 are to be treated + * as "killed by signal (exitcode & 0x7f)" */ + puts(get_signame(signo & 0x7f)); + /* TODO: 'bad' signal# - coreutils says: + * kill: 127: invalid signal + * we just print "127" instead */ + } else { + signo = get_signum(arg); + if (signo < 0) { + bb_error_msg("unknown signal '%s'", arg); + return EXIT_FAILURE; + } + printf("%d\n", signo); } } - /* If they specified -l, were all done */ + /* If they specified -l, we are all done */ return EXIT_SUCCESS; } -#ifdef CONFIG_KILLALL /* The -q quiet option */ - if(whichApp != KILL && argv[1][1]=='q' && argv[1][2]=='\0'){ - quiet++; - argv++; + if (killall && arg[1] == 'q' && arg[2] == '\0') { + quiet = 1; + arg = *++argv; argc--; - if(argc<2 || argv[1][0] != '-'){ + if (argc < 1) + bb_show_usage(); + if (arg[0] != '-') goto do_it_now; - } } -#endif - if(!u_signal_names(argv[1]+1, &signo, 0)) - bb_error_msg_and_die( "bad signal name '%s'", argv[1]+1); - argv+=2; - argc-=2; + arg++; /* skip '-' */ -do_it_now: + /* -o PID? (if present, it always is at the end of command line) */ + if (killall5 && arg[0] == 'o') + goto do_it_now; - /* Pid or name required */ - if (argc <= 0) - bb_show_usage(); + 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); + return EXIT_FAILURE; + } + arg = *++argv; + argc--; - if (whichApp == KILL) { - /* Looks like they want to do a kill. Do that */ - while (--argc >= 0) { - int pid; + do_it_now: + pid = getpid(); - if (!isdigit(**argv) && **argv != '-') - bb_error_msg_and_die( "Bad PID '%s'", *argv); - pid = strtol(*argv, NULL, 0); - if (kill(pid, signo) != 0) { - bb_perror_msg( "Could not kill pid '%d'", pid); - errors++; + if (killall5) { + pid_t sid; + procps_status_t* p = NULL; + int ret = 0; + + /* Find out our session id */ + sid = getsid(pid); + /* Stop all processes */ + kill(-1, SIGSTOP); + /* Signal all processes except those in our session */ + while ((p = procps_scan(p, PSSCAN_PID|PSSCAN_SID))) { + 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; } - argv++; + kill(p->pid, signo); + dont_kill: ; } + resume: + /* And let them continue */ + kill(-1, SIGCONT); + return ret; + } + /* Pid or name is required for kill/killall */ + if (argc < 1) { + bb_error_msg("you need to specify whom to kill"); + return EXIT_FAILURE; } -#ifdef CONFIG_KILLALL - else { - pid_t myPid=getpid(); + + if (killall) { /* Looks like they want to do a killall. Do that */ - while (--argc >= 0) { - long* pidList; + while (arg) { + pid_t* pidList; - pidList = find_pid_by_name(*argv); - if (!pidList || *pidList<=0) { + pidList = find_pid_by_name(arg); + if (*pidList == 0) { errors++; - if (quiet==0) - bb_error_msg( "%s: no process killed", *argv); + if (!quiet) + bb_error_msg("%s: no process killed", arg); } else { - long *pl; + pid_t *pl; - for(pl = pidList; *pl !=0 ; pl++) { - if (*pl==myPid) + for (pl = pidList; *pl; pl++) { + if (*pl == pid) + continue; + if (kill(*pl, signo) == 0) continue; - if (kill(*pl, signo) != 0) { - errors++; - if (quiet==0) - bb_perror_msg( "Could not kill pid '%ld'", *pl); - } + errors++; + if (!quiet) + bb_perror_msg("can't kill pid %d", (int)*pl); } } free(pidList); - argv++; + arg = *++argv; } + return errors; } + + /* Looks like they want to do a kill. Do that */ + while (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("invalid number '%s'", arg); + errors++; + } else if (kill(pid, signo) != 0) { + bb_perror_msg("can't kill pid %d", (int)pid); + errors++; + } #endif + arg = *++argv; + } return errors; }