libbb: move nuke_str() from passwd into libbb

[oweals/busybox.git] / libbb / signals.c

diff --git a/libbb/signals.c b/libbb/signals.c
index 959114679e25d2b73a608c3413779d43354fc995..56512473a2469dbd6f8ed6c4d06663d051d03b8b 100644 (file)
--- a/libbb/signals.c
+++ b/libbb/signals.c
@@ -6,11 +6,19 @@
  * Copyright (C) 2006 Rob Landley
  * Copyright (C) 2006 Denys Vlasenko
  *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
 
+/* All known arches use small ints for signals */
+smallint bb_got_signal;
+
+void record_signo(int signo)
+{
+       bb_got_signal = signo;
+}
+
 /* Saves 2 bytes on x86! Oh my... */
 int FAST_FUNC sigaction_set(int signum, const struct sigaction *act)
 {
@@ -31,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++;
@@ -39,7 +47,7 @@ void FAST_FUNC bb_signals(int sigs, void (*f)(int))
        }
 }
 
-void FAST_FUNC bb_signals_recursive(int sigs, void (*f)(int))
+void FAST_FUNC bb_signals_recursive_norestart(int sigs, void (*f)(int))
 {
        int sig_no = 0;
        int bit = 1;
@@ -52,7 +60,7 @@ void FAST_FUNC bb_signals_recursive(int sigs, void (*f)(int))
 
        while (sigs) {
                if (sigs & bit) {
-                       sigs &= ~bit;
+                       sigs -= bit;
                        sigaction_set(sig_no, &sa);
                }
                sig_no++;
@@ -89,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))