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

kill: fix bugs (kill -l output was horrible), fix style, constify data

Browse Source
This commit is contained in:
Denis Vlasenko 2006-09-27 14:19:16 +00:00
parent be905d550c
commit a77947f5bb
3 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/libbb.h
View File

@ -357,8 +357,8 @@ char *dirname (char *path);
int bb_make_directory (char *path, long mode, int flags); int bb_make_directory (char *path, long mode, int flags);
int get_signum(char *name); int get_signum(const char *name);
char *get_signame(int number); const char *get_signame(int number);
char *bb_simplify_path(const char *path); char *bb_simplify_path(const char *path);

13
libbb/u_signal_names.c
View File

@ -9,8 +9,8 @@
#include "libbb.h" #include "libbb.h"
static struct signal_name { static const struct signal_name {
char *name; char name[5];
int number; int number;
} signals[] = { } signals[] = {
// SUSv3 says kill must support these, and specifies the numerical values, // SUSv3 says kill must support these, and specifies the numerical values,
@ -26,7 +26,7 @@ static struct signal_name {
// Convert signal name to number. // Convert signal name to number.
int get_signum(char *name) int get_signum(const char *name)
{ {
int i; int i;
@ -42,18 +42,17 @@ int get_signum(char *name)
// Convert signal number to name // Convert signal number to name
char *get_signame(int number) const char *get_signame(int number)
{ {
int i; int i;
static char buf[8]; static char buf[8];
itoa_to_buf(number, buf, 8);
for (i=0; i < sizeof(signals) / sizeof(struct signal_name); i++) { for (i=0; i < sizeof(signals) / sizeof(struct signal_name); i++) {
if (number == signals[i].number) { if (number == signals[i].number) {
sprintf("SIG%s", signals[i].name); return signals[i].name;
break;
} }
} }
itoa_to_buf(number, buf, 8);
return buf; return buf;
} }

99
procps/kill.c
View File

@ -12,103 +12,104 @@
int kill_main(int argc, char **argv) int kill_main(int argc, char **argv)
{ {
char *arg;
int killall, signo = SIGTERM, errors = 0, quiet = 0; int killall, signo = SIGTERM, errors = 0, quiet = 0;
killall = (ENABLE_KILLALL && bb_applet_name[4]=='a') ? 1 : 0; killall = (ENABLE_KILLALL && bb_applet_name[4]=='a') ? 1 : 0;
/* Parse any options */ /* Parse any options */
if (argc < 2) argc--;
arg = *++argv;
if (argc<1)
bb_show_usage(); bb_show_usage();
if(argv[1][0] != '-'){ if (arg[0]!='-') {
argv++;
argc--;
goto do_it_now; goto do_it_now;
} }
/* The -l option, which prints out signal names. */ /* The -l option, which prints out signal names. */
if(argv[1][1]=='l' && argv[1][2]=='\0'){ if (arg[1]=='l' && arg[2]=='\0') {
if(argc==2) { const char *name;
if (argc==1) {
/* Print the whole signal list */ /* Print the whole signal list */
int col = 0; int col = 0;
for (signo = 1; signo<32; signo++) {
for(signo = 0;;) { name = get_signame(signo);
char *name = get_signame(++signo); if (isdigit(name[0])) continue;
if (isdigit(*name)) break; if (col > 66) {
puts("");
if (col > 60) {
printf("\n");
col = 0; col = 0;
} }
col += printf("%2d) %-16s", signo, name); col += printf("%2d) %-6s", signo, name);
} }
printf("\n"); puts("");
} else { /* -l <sig list> */
while ((arg = *++argv)!=NULL) {
if (isdigit(arg[0])) {
signo = atoi(arg);
name = get_signame(signo);
} else { } else {
for(argv++; *argv; argv++) { signo = get_signum(arg);
char *name; if (signo<0)
bb_error_msg_and_die("unknown signal '%s'", arg);
if (isdigit(**argv)) name = get_signame(atoi(*argv)); name = get_signame(signo);
else {
int temp = get_signum(*argv);
if (temp<0)
bb_error_msg_and_die("unknown signal %s", *argv);
name = get_signame(temp);
} }
puts(name); printf("%2d) %s\n", signo, name);
} }
} }
/* If they specified -l, were all done */ /* If they specified -l, we are all done */
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
/* The -q quiet option */ /* The -q quiet option */
if(killall && argv[1][1]=='q' && argv[1][2]=='\0'){ if (killall && arg[1]=='q' && arg[2]=='\0') {
quiet++; quiet = 1;
argv++; arg = *++argv;
argc--; argc--;
if(argc<2 || argv[1][0] != '-'){ if (argc<1) bb_show_usage();
goto do_it_now; if (arg[0]!='-') goto do_it_now;
}
} }
if(0>(signo = get_signum(argv[1]+1))) /* -SIG */
bb_error_msg_and_die( "bad signal name '%s'", argv[1]+1); signo = get_signum(&arg[1]);
argv+=2; if (signo<0)
argc-=2; bb_error_msg_and_die("bad signal name '%s'", &arg[1]);
arg = *++argv;
argc--;
do_it_now: do_it_now:
/* Pid or name required */ /* Pid or name required */
if (argc <= 0) if (argc<1)
bb_show_usage(); bb_show_usage();
if (!killall) { if (!killall) {
/* Looks like they want to do a kill. Do that */ /* Looks like they want to do a kill. Do that */
while (--argc >= 0) { while (arg) {
int pid; int pid;
if (!isdigit(**argv) && **argv != '-') if (!isdigit(arg[0]) && arg[0]!='-')
bb_error_msg_and_die( "Bad PID '%s'", *argv); bb_error_msg_and_die("bad pid '%s'", arg);
pid = strtol(*argv, NULL, 0); pid = strtol(arg, NULL, 0);
if (kill(pid, signo)!=0) { if (kill(pid, signo)!=0) {
bb_perror_msg( "Could not kill pid '%d'", pid); bb_perror_msg("cannot kill pid %d", pid);
errors++; errors++;
} }
argv++; arg = *++argv;
} }
} else { } else {
pid_t myPid = getpid(); pid_t myPid = getpid();
/* Looks like they want to do a killall. Do that */ /* Looks like they want to do a killall. Do that */
while (--argc >= 0) { while (arg) {
long* pidList; long* pidList;
pidList = find_pid_by_name(*argv); pidList = find_pid_by_name(arg);
if (!pidList || *pidList<=0) { if (!pidList || *pidList<=0) {
errors++; errors++;
if (quiet==0) if (quiet==0)
bb_error_msg( "%s: no process killed", *argv); bb_error_msg("%s: no process killed", arg);
} else { } else {
long *pl; long *pl;
@ -117,13 +118,13 @@ do_it_now:
continue; continue;
if (kill(*pl, signo)!=0) { if (kill(*pl, signo)!=0) {
errors++; errors++;
if (quiet==0) if (!quiet)
bb_perror_msg( "Could not kill pid '%ld'", *pl); bb_perror_msg("cannot kill pid %ld", *pl);
} }
} }
} }
free(pidList); free(pidList);
argv++; arg = *++argv;
} }
} }