libbb: correctness/size tweaks in signal-related helpers

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/libbb/signals.c b/libbb/signals.c
index cdc37b1ef2ba45cffbc8e08efa793daf5ce1ddde..56512473a2469dbd6f8ed6c4d06663d051d03b8b 100644 (file)
--- a/libbb/signals.c
+++ b/libbb/signals.c
@@ -39,7 +39,7 @@ void FAST_FUNC bb_signals(int sigs, void (*f)(int))
 
        while (sigs) {
                if (sigs & bit) {
-                       sigs &= ~bit;
+                       sigs -= bit;
                        signal(sig_no, f);
                }
                sig_no++;
@@ -60,7 +60,7 @@ void FAST_FUNC bb_signals_recursive_norestart(int sigs, void (*f)(int))
 
        while (sigs) {
                if (sigs & bit) {
-                       sigs &= ~bit;
+                       sigs -= bit;
                        sigaction_set(sig_no, &sa);
                }
                sig_no++;
@@ -97,7 +97,7 @@ void FAST_FUNC kill_myself_with_sig(int sig)
        signal(sig, SIG_DFL);
        sig_unblock(sig);
        raise(sig);
-       _exit(EXIT_FAILURE); /* Should not reach it */
+       _exit(sig | 128); /* Should not reach it */
 }
 
 void FAST_FUNC signal_SA_RESTART_empty_mask(int sig, void (*handler)(int))

diff --git a/procps/top.c b/procps/top.c
index 1977fcafc618fef9cfae8fdff6b7c2b30ae16b94..b08444a76bd815e9a92dfbe46a735a6252284f4a 100644 (file)
--- a/procps/top.c
+++ b/procps/top.c
@@ -727,7 +727,7 @@ static void reset_term(void)
        }
 }
 
-static void sig_catcher(int sig UNUSED_PARAM)
+static void sig_catcher(int sig)
 {
        reset_term();
        kill_myself_with_sig(sig);