INN commit: trunk/innfeed (endpoint.c)

INN Commit Russ_Allbery at isc.org
Sun Dec 14 05:26:54 UTC 2008


    Date: Saturday, December 13, 2008 @ 21:26:53
  Author: eagle
Revision: 8226

Remove dead code for historic BSD and System V signal handling that
Autoconf wasn't probing for and reactivate the intended sigaction code
for blocking signals that had been compiled out.

Modified:
  trunk/innfeed/endpoint.c

------------+
 endpoint.c |   22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

Modified: endpoint.c
===================================================================
--- endpoint.c	2008-12-14 05:05:09 UTC (rev 8225)
+++ endpoint.c	2008-12-14 05:26:53 UTC (rev 8226)
@@ -1668,31 +1668,18 @@
 static void handleSignals (void)
 {
   int i ;
-#if defined(USE_SIGVEC)
-  int mask ;
-#endif
 
   for (i = 1; i < NSIG; i++)
     {
       if (sigFlags[i])
         {
-#if defined(USE_SIGACTION)
+#if defined(HAVE_SIGACTION)
           sigset_t set, oset ;
       
           if (sigemptyset (&set) != 0 || sigaddset (&set, i) != 0)
             die ("sigemptyset or sigaddset failed") ;
           if (sigprocmask (SIG_BLOCK, &set, &oset) != 0)
             die ("sigprocmask failed: %s", strerror(errno)) ;
-#elif defined(USE_SIGVEC)
-# ifndef sigmask
-#  define sigmask(s)    (1 << ((s) - 1))
-# endif
-          int mask ;
-          
-          mask = sigblock (sigmask(i)) ;
-#elif defined(USE_SIGSET)
-          if (sighold (i) != 0)
-            die ("sighold failed: %s", strerror(errno)) ;
 #else
       /* hope for the best */
 #endif
@@ -1704,14 +1691,9 @@
               sigHandlers[i] != SIG_DFL)
             (sigHandlers[i])(i) ;
             
-#if defined(USE_SIGACTION)
+#if defined(HAVE_SIGACTION)
           if (sigprocmask (SIG_SETMASK, &oset, (sigset_t *)NULL) != 0)
             die ("sigprocmask failed: %s", strerror(errno)) ;
-#elif defined(USE_SIGVEC)
-          sigsetmask (mask) ;
-#elif defined(USE_SIGSET)
-          if (sigrelse (i) != 0)
-            die ("sigrelse failed: %s", strerror(errno)) ;
 #else
           /* hope for the best */
 #endif




More information about the inn-committers mailing list