fix recognitions of -SIGname signals

(fix by Jacques LUDER <jacques.luder@thalesgroup.com>)

2 files changed, 10 insertions, 8 deletions

diff --git a/libbb/u_signal_names.c b/libbb/u_signal_names.c
index 88311dd9c..eb835e936 100644
--- a/libbb/u_signal_names.c
+++ b/libbb/u_signal_names.c
@@ -15,7 +15,8 @@ static const struct signal_name {
 } signals[] = {
         // SUSv3 says kill must support these, and specifies the numerical values,
         // http://www.opengroup.org/onlinepubs/009695399/utilities/kill.html
-        {0, "0"}, {1, "HUP"}, {2, "INT"}, {3, "QUIT"}, {6, "ABRT"}, {9, "KILL"},
+        // 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:
         {SIGILL, "ILL"}, {SIGTRAP, "TRAP"}, {SIGFPE, "FPE"}, {SIGUSR1, "USR1"},
@@ -30,13 +31,13 @@ int get_signum(const char *name)
 {
         int i;
 
-        i = atoi(name);
-        if (i) return i;
+        i = bb_strtou(name, NULL, 10);
+        if (!errno) return i;
         for (i = 0; i < sizeof(signals) / sizeof(struct signal_name); i++)
-                if (!strcasecmp(signals[i].name, name) ||
-                        (!strncasecmp(signals[i].name, "SIG", 3)
-                                 && !strcasecmp(signals[i].name+3, signals[i].name)))
-                                        return signals[i].number;
+                if (strcasecmp(name, signals[i].name) == 0
+                 || (strncasecmp(name, "SIG", 3) == 0
+                     && strcasecmp(&name[3], signals[i].name) == 0))
+                                return signals[i].number;
         return -1;
 }
 
diff --git a/procps/fuser.c b/procps/fuser.c
index 4628cdf5c..a216eaec8 100644
--- a/procps/fuser.c
+++ b/procps/fuser.c
@@ -323,7 +323,8 @@ int fuser_main(int argc, char **argv)
                 optn = fuser_option(argv[i]);
                 if(optn) opt |= optn;
                 else if(argv[i][0] == '-') {
-                        if(0>(killsig = get_signum(argv[i]+1)))
+                        killsig = get_signum(argv[i]+1);
+                        if(0 > killsig)
                                 killsig = SIGTERM;
                 }
                 else {