X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Fsignal-util.h;h=8dc9e3aea517992f81a3ec3cf5b02769be06774f;hb=a97a730270418e53e9400de5dce7b07c7dacd19a;hp=59261250444ce7f20a820517e0db193b3b74ae69;hpb=eaca07ccfdf5d7dabc50afc7e539c2413dd69d3e;p=elogind.git

diff --git a/src/basic/signal-util.h b/src/basic/signal-util.h
index 592612504..8dc9e3aea 100644
--- a/src/basic/signal-util.h
+++ b/src/basic/signal-util.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
@@ -29,8 +27,10 @@ int reset_all_signal_handlers(void);
 int reset_signal_mask(void);
 
 int ignore_signals(int sig, ...);
-// UNNEEDED int default_signals(int sig, ...);
-// UNNEEDED int sigaction_many(const struct sigaction *sa, ...);
+int default_signals(int sig, ...);
+#if 0 /// UNNEEDED by elogind
+int sigaction_many(const struct sigaction *sa, ...);
+#endif // 0
 
 int sigset_add_many(sigset_t *ss, ...);
 int sigprocmask_many(int how, sigset_t *old, ...);
@@ -39,5 +39,22 @@ const char *signal_to_string(int i) _const_;
 int signal_from_string(const char *s) _pure_;
 
 int signal_from_string_try_harder(const char *s);
+#if 0 /// UNNEEDED by elogind
+
+void nop_signal_handler(int sig);
+#endif // 0
+
+static inline void block_signals_reset(sigset_t *ss) {
+        assert_se(sigprocmask(SIG_SETMASK, ss, NULL) >= 0);
+}
+
+#define BLOCK_SIGNALS(...)                                                        \
+        _cleanup_(block_signals_reset) _unused_ sigset_t _saved_sigset = ({       \
+                sigset_t t;                                                       \
+                assert_se(sigprocmask_many(SIG_BLOCK, &t, __VA_ARGS__, -1) >= 0); \
+                t;                                                                \
+        })
 
-// UNNEEDED void nop_signal_handler(int sig);
+static inline bool SIGNAL_VALID(int signo) {
+        return signo > 0 && signo < _NSIG;
+}