diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-09-27 14:19:16 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-09-27 14:19:16 +0000 |
| commit | a77947f5bb9ef38b0f1fc6a2a5b500fa6ade601e (patch) | |
| tree | 3ad369f8468a397c6731ccd5c1631e1bc33612d6 /libbb/u_signal_names.c | |
| parent | be905d550c96da8c75d697842ba4169a62d05190 (diff) | |
| download | busybox-w32-a77947f5bb9ef38b0f1fc6a2a5b500fa6ade601e.tar.gz busybox-w32-a77947f5bb9ef38b0f1fc6a2a5b500fa6ade601e.tar.bz2 busybox-w32-a77947f5bb9ef38b0f1fc6a2a5b500fa6ade601e.zip | |
kill: fix bugs (kill -l output was horrible), fix style, constify data
Diffstat (limited to 'libbb/u_signal_names.c')
| -rw-r--r-- | libbb/u_signal_names.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libbb/u_signal_names.c b/libbb/u_signal_names.c index b9afc6ff1..3f8c04c35 100644 --- a/libbb/u_signal_names.c +++ b/libbb/u_signal_names.c | |||
| @@ -9,8 +9,8 @@ | |||
| 9 | 9 | ||
| 10 | #include "libbb.h" | 10 | #include "libbb.h" |
| 11 | 11 | ||
| 12 | static struct signal_name { | 12 | static const struct signal_name { |
| 13 | char *name; | 13 | char name[5]; |
| 14 | int number; | 14 | int number; |
| 15 | } signals[] = { | 15 | } signals[] = { |
| 16 | // SUSv3 says kill must support these, and specifies the numerical values, | 16 | // SUSv3 says kill must support these, and specifies the numerical values, |
| @@ -26,7 +26,7 @@ static struct signal_name { | |||
| 26 | 26 | ||
| 27 | // Convert signal name to number. | 27 | // Convert signal name to number. |
| 28 | 28 | ||
| 29 | int get_signum(char *name) | 29 | int get_signum(const char *name) |
| 30 | { | 30 | { |
| 31 | int i; | 31 | int i; |
| 32 | 32 | ||
| @@ -42,18 +42,17 @@ int get_signum(char *name) | |||
| 42 | 42 | ||
| 43 | // Convert signal number to name | 43 | // Convert signal number to name |
| 44 | 44 | ||
| 45 | char *get_signame(int number) | 45 | const char *get_signame(int number) |
| 46 | { | 46 | { |
| 47 | int i; | 47 | int i; |
| 48 | static char buf[8]; | 48 | static char buf[8]; |
| 49 | 49 | ||
| 50 | itoa_to_buf(number, buf, 8); | ||
| 51 | for (i=0; i < sizeof(signals) / sizeof(struct signal_name); i++) { | 50 | for (i=0; i < sizeof(signals) / sizeof(struct signal_name); i++) { |
| 52 | if (number == signals[i].number) { | 51 | if (number == signals[i].number) { |
| 53 | sprintf("SIG%s", signals[i].name); | 52 | return signals[i].name; |
| 54 | break; | ||
| 55 | } | 53 | } |
| 56 | } | 54 | } |
| 57 | 55 | ||
| 56 | itoa_to_buf(number, buf, 8); | ||
| 58 | return buf; | 57 | return buf; |
| 59 | } | 58 | } |