read_key: remove handling for ctrl-up/down, we don't use that. -12 bytes

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

diff --git a/libbb/signals.c b/libbb/signals.c
index 1929cb88e7b7cfe0ee595334a276184df320929d..a528756fff9b87b08d1d4294cc7e999a30aef635 100644 (file)
--- a/libbb/signals.c
+++ b/libbb/signals.c
@@ -11,7 +11,28 @@
 
 #include "libbb.h"
 
-void bb_signals(int sigs, void (*f)(int))
+/* 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)
+{
+       return sigaction(signum, act, NULL);
+}
+
+int FAST_FUNC sigprocmask_allsigs(int how)
+{
+       sigset_t set;
+       sigfillset(&set);
+       return sigprocmask(how, &set, NULL);
+}
+
+void FAST_FUNC bb_signals(int sigs, void (*f)(int))
 {
        int sig_no = 0;
        int bit = 1;
@@ -26,7 +47,7 @@ void bb_signals(int sigs, void (*f)(int))
        }
 }
 
-void 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;
@@ -40,14 +61,14 @@ void bb_signals_recursive(int sigs, void (*f)(int))
        while (sigs) {
                if (sigs & bit) {
                        sigs &= ~bit;
-                       sigaction(sig_no, &sa, NULL);
+                       sigaction_set(sig_no, &sa);
                }
                sig_no++;
                bit <<= 1;
        }
 }
 
-void sig_block(int sig)
+void FAST_FUNC sig_block(int sig)
 {
        sigset_t ss;
        sigemptyset(&ss);
@@ -55,7 +76,7 @@ void sig_block(int sig)
        sigprocmask(SIG_BLOCK, &ss, NULL);
 }
 
-void sig_unblock(int sig)
+void FAST_FUNC sig_unblock(int sig)
 {
        sigset_t ss;
        sigemptyset(&ss);
@@ -63,16 +84,7 @@ void sig_unblock(int sig)
        sigprocmask(SIG_UNBLOCK, &ss, NULL);
 }
 
-#if 0
-void sig_blocknone(void)
-{
-       sigset_t ss;
-       sigemptyset(&ss);
-       sigprocmask(SIG_SETMASK, &ss, NULL);
-}
-#endif
-
-void sig_pause(void)
+void FAST_FUNC wait_for_any_sig(void)
 {
        sigset_t ss;
        sigemptyset(&ss);
@@ -80,15 +92,30 @@ void sig_pause(void)
 }
 
 /* Assuming the sig is fatal */
-void kill_myself_with_sig(int sig)
+void FAST_FUNC kill_myself_with_sig(int sig)
 {
-       sigset_t set;
-
        signal(sig, SIG_DFL);
-
-       sigemptyset(&set);
-       sigaddset(&set, sig);
-       sigprocmask(SIG_UNBLOCK, &set, NULL);
+       sig_unblock(sig);
        raise(sig);
-       _exit(1); /* Should not reach it */
+       _exit(EXIT_FAILURE); /* Should not reach it */
+}
+
+void FAST_FUNC signal_SA_RESTART_empty_mask(int sig, void (*handler)(int))
+{
+       struct sigaction sa;
+       memset(&sa, 0, sizeof(sa));
+       /*sigemptyset(&sa.sa_mask);*/
+       sa.sa_flags = SA_RESTART;
+       sa.sa_handler = handler;
+       sigaction_set(sig, &sa);
+}
+
+void FAST_FUNC signal_no_SA_RESTART_empty_mask(int sig, void (*handler)(int))
+{
+       struct sigaction sa;
+       memset(&sa, 0, sizeof(sa));
+       /*sigemptyset(&sa.sa_mask);*/
+       /*sa.sa_flags = 0;*/
+       sa.sa_handler = handler;
+       sigaction_set(sig, &sa);
 }