Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-06-26 17:29:42 +00:00
Code Issues Projects Releases Wiki Activity

ash,kill: use common code for kill applet/builtin

Browse Source 
# make bloatcheck
function                                             old     new   delta
evaltreenr                                           644     654     +10
evaltree                                             644     654     +10
parse_conf                                          1440    1444      +4
dpkg_deb_main                                        426     429      +3
ed_main                                             3319    3321      +2
passwd_main                                         2093    2091      -2
kill_main                                            830     826      -4
singlemount                                         4609    4601      -8
find_command                                         962     954      -8
get_lcm                                              123     105     -18
.rodata                                           132243  132147     -96
killcmd                                              449     120    -329
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 5/7 up/down: 29/-465)          Total: -436 bytes

# size busybox_old busybox_unstripped
   text    data     bss     dec     hex filename
 723901    2940   27504  754345   b82a9 busybox_old
 723457    2940   27504  753901   b80ed busybox_unstripped
This commit is contained in:
Denis Vlasenko 2007-04-29 23:42:54 +00:00
parent d4728145e3
commit f20de5bb42
4 changed files with 86 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/libbb.h
View File

@ -636,6 +636,7 @@ extern void bb_vinfo_msg(const char *s, va_list p);
int bb_cat(char** argv); int bb_cat(char** argv);
int bb_echo(char** argv); int bb_echo(char** argv);
int bb_test(int argc, char** argv); int bb_test(int argc, char** argv);
int kill_main(int argc, char **argv);
#if ENABLE_ROUTE #if ENABLE_ROUTE
void bb_displayroutes(int noresolve, int netstatfmt); void bb_displayroutes(int noresolve, int netstatfmt);
#endif #endif

1
procps/Kbuild
View File

@ -7,6 +7,7 @@
lib-y:= lib-y:=
lib-$(CONFIG_FREE) += free.o lib-$(CONFIG_FREE) += free.o
lib-$(CONFIG_KILL) += kill.o lib-$(CONFIG_KILL) += kill.o
lib-$(CONFIG_ASH) += kill.o # used for built-in kill by ash
lib-$(CONFIG_PIDOF) += pidof.o lib-$(CONFIG_PIDOF) += pidof.o
lib-$(CONFIG_PS) += ps.o lib-$(CONFIG_PS) += ps.o
lib-$(CONFIG_RENICE) += renice.o lib-$(CONFIG_RENICE) += renice.o

95
procps/kill.c
View File

@ -10,16 +10,30 @@
#include "busybox.h" #include "busybox.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 ' -<process group>' by shell (note space!)
* This is needed to avoid collision with kill -9 ... syntax
*/
int kill_main(int argc, char **argv); int kill_main(int argc, char **argv);
int kill_main(int argc, char **argv) int kill_main(int argc, 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;
const int killall = (ENABLE_KILLALL && applet_name[4] == 'a' const int killall = (ENABLE_KILLALL && argv[0][4] == 'a'
&& (!ENABLE_KILLALL5 || applet_name[7] != '5')); && (!ENABLE_KILLALL5 || argv[0][7] != '5'));
const int killall5 = (ENABLE_KILLALL5 && applet_name[4] == 'a' const int killall5 = (ENABLE_KILLALL5 && argv[0][4] == 'a'
&& (!ENABLE_KILLALL || applet_name[7] == '5')); && (!ENABLE_KILLALL || argv[0][7] == '5'));
/* Parse any options */ /* Parse any options */
argc--; argc--;
@ -29,34 +43,38 @@ int kill_main(int argc, char **argv)
goto do_it_now; goto do_it_now;
} }
/* The -l option, which prints out signal names. */ /* 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 (arg[1] == 'l' && arg[2] == '\0') {
const char *name;
if (argc == 1) { if (argc == 1) {
/* Print the whole signal list */ /* Print the whole signal list */
int col = 0;
for (signo = 1; signo < 32; signo++) { for (signo = 1; signo < 32; signo++) {
name = get_signame(signo); puts(get_signame(signo));
if (isdigit(name[0])) continue;
if (col > 66) {
puts("");
col = 0;
}
col += printf("%2d) %-6s", signo, name);
} }
puts("");
} else { /* -l <sig list> */ } else { /* -l <sig list> */
while ((arg = *++argv)) { while ((arg = *++argv)) {
if (isdigit(arg[0])) { if (isdigit(arg[0])) {
signo = xatoi_u(arg); signo = bb_strtou(arg, NULL, 10);
name = get_signame(signo); if (errno) {
bb_error_msg("unknown signal '%s'", arg);
return EXIT_FAILURE;
}
/* 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 { } else {
signo = get_signum(arg); signo = get_signum(arg);
if (signo < 0) if (signo < 0) {
bb_error_msg_and_die("unknown signal '%s'", arg); bb_error_msg("unknown signal '%s'", arg);
name = get_signame(signo); return EXIT_FAILURE;
}
printf("%d\n", signo);
} }
printf("%2d) %s\n", signo, name);
} }
} }
/* If they specified -l, we are all done */ /* If they specified -l, we are all done */
@ -74,8 +92,10 @@ int kill_main(int argc, char **argv)
/* -SIG */ /* -SIG */
signo = get_signum(&arg[1]); signo = get_signum(&arg[1]);
if (signo < 0) if (signo < 0) { /* || signo > MAX_SIGNUM ? */
bb_error_msg_and_die("bad signal name '%s'", &arg[1]); bb_error_msg("bad signal name '%s'", &arg[1]);
return EXIT_FAILURE;
}
arg = *++argv; arg = *++argv;
argc--; argc--;
@ -85,10 +105,6 @@ do_it_now:
pid_t sid; pid_t sid;
procps_status_t* p = NULL; procps_status_t* p = NULL;
// Cannot happen anyway? We don't TERM ourself, we STOP
// /* kill(-1, sig) on Linux (at least 2.1.x)
// * might send signal to the calling process too */
// signal(SIGTERM, SIG_IGN);
/* Now stop all processes */ /* Now stop all processes */
kill(-1, SIGSTOP); kill(-1, SIGSTOP);
/* Find out our own session id */ /* Find out our own session id */
@ -104,9 +120,11 @@ do_it_now:
return 0; return 0;
} }
/* Pid or name required for kill/killall */ /* Pid or name is required for kill/killall */
if (argc < 1) if (argc < 1) {
bb_show_usage(); puts("You need to specify whom to kill");
return EXIT_FAILURE;
}
if (killall) { if (killall) {
/* Looks like they want to do a killall. Do that */ /* Looks like they want to do a killall. Do that */
@ -140,14 +158,15 @@ do_it_now:
/* Looks like they want to do a kill. Do that */ /* Looks like they want to do a kill. Do that */
while (arg) { while (arg) {
/* Huh? /* Support shell 'space' trick */
if (!isdigit(arg[0]) && arg[0] != '-') if (arg[0] == ' ')
bb_error_msg_and_die("bad pid '%s'", arg); arg++;
*/ pid = bb_strtoi(arg, NULL, 10);
pid = xatou(arg); if (errno) {
/* FIXME: better overflow check? */ bb_error_msg("bad pid '%s'", arg);
if (kill(pid, signo) != 0) { errors++;
bb_perror_msg("cannot kill pid %u", (unsigned)pid); } else if (kill(pid, signo) != 0) {
bb_perror_msg("cannot kill pid %d", (int)pid);
errors++; errors++;
} }
arg = *++argv; arg = *++argv;

119
shell/ash.c
View File

@ -3519,91 +3519,22 @@ setjobctl(int on)
static int static int
killcmd(int argc, char **argv) killcmd(int argc, char **argv)
{ {
int signo = -1; if (argv[1] && strcmp(argv[1], "-l") != 0) {
int list = 0; int i = 1;
int i; do {
pid_t pid; if (argv[i][0] == '%') {
struct job *jp; struct job *jp = getjob(argv[i], 0);
unsigned pid = jp->ps[0].pid;
if (argc <= 1) { /* Enough space for ' -NNN<nul>' */
usage: argv[i] = alloca(sizeof(int)*3 + 3);
ash_msg_and_raise_error( /* kill_main has matching code to expect
"usage: kill [-s sigspec | -signum | -sigspec] [pid | job]... or\n" * leading space. Needed to not confuse
"kill -l [exitstatus]" * negative pids with "kill -SIGNAL_NO" syntax */
); sprintf(argv[i], " -%u", pid);
}
if (**++argv == '-') {
signo = get_signum(*argv + 1);
if (signo < 0) {
int c;
while ((c = nextopt("ls:")) != '\0') {
switch (c) {
default:
#if DEBUG
abort();
#endif
case 'l':
list = 1;
break;
case 's':
signo = get_signum(optionarg);
if (signo < 0) {
ash_msg_and_raise_error(
"invalid signal number or name: %s",
optionarg
);
}
break;
}
} }
argv = argptr; } while (argv[++i]);
} else
argv++;
} }
return kill_main(argc, argv);
if (!list && signo < 0)
signo = SIGTERM;
if ((signo < 0 || !*argv) ^ list) {
goto usage;
}
if (list) {
const char *name;
if (!*argv) {
for (i = 1; i < NSIG; i++) {
name = get_signame(i);
if (!isdigit(*name))
out1fmt(snlfmt, name);
}
return 0;
}
name = get_signame(signo);
if (!isdigit(*name))
ash_msg_and_raise_error("invalid signal number or exit status: %s", *argptr);
out1fmt(snlfmt, name);
return 0;
}
i = 0;
do {
if (**argv == '%') {
jp = getjob(*argv, 0);
pid = -jp->ps[0].pid;
} else {
pid = **argv == '-' ?
-number(*argv + 1) : number(*argv);
}
if (kill(pid, signo) != 0) {
ash_msg("(%d) - %m", pid);
i = 1;
}
} while (*++argv);
return i;
} }
static void static void
@ -3642,7 +3573,8 @@ restartjob(struct job *jp, int mode)
if (WIFSTOPPED(ps->status)) { if (WIFSTOPPED(ps->status)) {
ps->status = -1; ps->status = -1;
} }
} while (ps++, --i); ps++;
} while (--i);
out: out:
status = (mode == FORK_FG) ? waitforjob(jp) : 0; status = (mode == FORK_FG) ? waitforjob(jp) : 0;
INT_ON; INT_ON;
@ -5070,8 +5002,9 @@ esclen(const char *start, const char *p)
static char * static char *
_rmescapes(char *str, int flag) _rmescapes(char *str, int flag)
{ {
static const char qchars[] = { CTLESC, CTLQUOTEMARK, '\0' };
char *p, *q, *r; char *p, *q, *r;
static const char qchars[] = { CTLESC, CTLQUOTEMARK, 0 };
unsigned inquotes; unsigned inquotes;
int notescaped; int notescaped;
int globbing; int globbing;
@ -11117,13 +11050,7 @@ find_command(char *name, struct cmdentry *entry, int act, const char *path)
return; return;
} }
#if ENABLE_FEATURE_SH_STANDALONE /* #if ENABLE_FEATURE_SH_STANDALONE... moved after builtin check */
if (find_applet_by_name(name)) {
entry->cmdtype = CMDNORMAL;
entry->u.index = -1;
return;
}
#endif
updatetbl = (path == pathval()); updatetbl = (path == pathval());
if (!updatetbl) { if (!updatetbl) {
@ -11173,6 +11100,14 @@ find_command(char *name, struct cmdentry *entry, int act, const char *path)
} }
} }
#if ENABLE_FEATURE_SH_STANDALONE
if (find_applet_by_name(name)) {
entry->cmdtype = CMDNORMAL;
entry->u.index = -1;
return;
}
#endif
/* We have to search path. */ /* We have to search path. */
prev = -1; /* where to start */ prev = -1; /* where to start */
if (cmdp && cmdp->rehash) { /* doing a rehash */ if (cmdp && cmdp->rehash) { /* doing a rehash */