Remove mysignal wrapper.

We switched the main code to use sigaction(), so the wrapper is no
longer used.

diff --git a/openbsd-compat/bsd-signal.c b/openbsd-compat/bsd-signal.c
index 104ab653f50b59231834ca9fea42fc7a965093a4..38d5e972e9e422e065fc0a858b7eaf33b6892fa7 100644 (file)
--- a/openbsd-compat/bsd-signal.c
+++ b/openbsd-compat/bsd-signal.c
@@ -23,39 +23,6 @@
 
 #include "openbsd-compat/bsd-signal.h"
 
-#undef signal
-
-mysig_t
-mysignal(int sig, mysig_t act)
-{
-#ifdef HAVE_SIGACTION
-       struct sigaction sa, osa;
-
-       if (sigaction(sig, NULL, &osa) == -1)
-               return (mysig_t) -1;
-       if (osa.sa_handler != act) {
-               memset(&sa, 0, sizeof(sa));
-               sigemptyset(&sa.sa_mask);
-               sa.sa_flags = 0;
-               if (sig == SIGALRM) {
-#ifdef SA_INTERRUPT
-                       sa.sa_flags |= SA_INTERRUPT;
-#endif
-               } else {
-#ifdef SA_RESTART
-                       sa.sa_flags |= SA_RESTART;
-#endif
-               }
-               sa.sa_handler = act;
-               if (sigaction(sig, &sa, NULL) == -1)
-                       return (mysig_t) -1;
-       }
-       return (osa.sa_handler);
-#else
-       return (signal(sig, act));
-#endif
-}
-
 #if !defined(HAVE_STRSIGNAL)
 char *strsignal(int sig)
 {

diff --git a/openbsd-compat/bsd-signal.h b/openbsd-compat/bsd-signal.h
index 4cb8cb7a0b92bd41031fd519915d42a9cff43cf6..dafb4b1990b6c553b52a77dd03b424dc1acde4a3 100644 (file)
--- a/openbsd-compat/bsd-signal.h
+++ b/openbsd-compat/bsd-signal.h
@@ -27,11 +27,6 @@
 # endif
 #endif
 
-/* wrapper for signal interface */
-typedef void (*mysig_t)(int);
-mysig_t mysignal(int sig, mysig_t act);
-#define signal(a,b) mysignal(a,b)
-
 #if !defined(HAVE_STRSIGNAL)
 char *strsignal(int);
 #endif