diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-12-04 10:20:48 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-12-04 10:20:48 +0000 |
| commit | c689fcfdb00a5a3a05f433806eeb10cf4c1e6f7d (patch) | |
| tree | 20a0c1da6a68ba6e95b12c04591ee1fae38a790d /libbb/u_signal_names.c | |
| parent | 5f934b07853658069435a4b42c17277e6478c534 (diff) | |
| download | busybox-c689fcfdb00a5a3a05f433806eeb10cf4c1e6f7d.tar.gz | |
Make signal table a bit smaller
get_signum 136 151 +15
signals 224 192 -32
Diffstat (limited to 'libbb/u_signal_names.c')
| -rw-r--r-- | libbb/u_signal_names.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libbb/u_signal_names.c b/libbb/u_signal_names.c index 43015b7a1..c741f81d7 100644 --- a/libbb/u_signal_names.c +++ b/libbb/u_signal_names.c @@ -11,10 +11,9 @@ #define KILL_MAX_SIG 32 -static const char signals[KILL_MAX_SIG][7] = { +static const char signals[KILL_MAX_SIG][6] = { // SUSv3 says kill must support these, and specifies the numerical values, // http://www.opengroup.org/onlinepubs/009695399/utilities/kill.html - // TODO: "[SIG]EXIT" shouldn't work for kill, right? // {0, "EXIT"}, {1, "HUP"}, {2, "INT"}, {3, "QUIT"}, // {6, "ABRT"}, {9, "KILL"}, {14, "ALRM"}, {15, "TERM"} // And Posix adds the following: @@ -25,6 +24,8 @@ static const char signals[KILL_MAX_SIG][7] = { /* Believe it or not, but some arches have more than 32 SIGs! * HPPA: SIGSTKFLT == 36. We don't include those. */ + +/* NB: longest (6-char) names are NOT nul-terminated */ [0] = "EXIT", #if defined SIGHUP && SIGHUP < KILL_MAX_SIG [SIGHUP ] = "HUP", @@ -132,8 +133,10 @@ int get_signum(const char *name) return i; if (strncasecmp(name, "SIG", 3) == 0) name += 3; + if (strlen(name) > 6) + return -1; for (i = 0; i < ARRAY_SIZE(signals); i++) - if (strcasecmp(name, signals[i]) == 0) + if (strncasecmp(name, signals[i], 6) == 0) return i; #if ENABLE_DESKTOP && (defined(SIGIOT) || defined(SIGIO)) |