X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fsignals.c;h=5b55fc429c21871a1a24d7d16e72b5f53a694f06;hp=00f516cd59e7f570d68742270fceecf3fb626d32;hb=5cb46b33551f28e4168989e752e09bd927e993f9;hpb=a485ed478abbd599d8c9aab48934e7a26733ecb1

diff --git a/sbr/signals.c b/sbr/signals.c
index 00f516c..5b55fc4 100644
--- a/sbr/signals.c
+++ b/sbr/signals.c
@@ -1,55 +1,28 @@
 /*
- * signals.c -- general signals interface for nmh
- *
- * This code is Copyright (c) 2002, by the authors of nmh.  See the
- * COPYRIGHT file in the root directory of the nmh distribution for
- * complete copyright information.
- */
+** signals.c -- general signals interface for nmh
+**
+** This code is Copyright (c) 2002, by the authors of nmh.  See the
+** COPYRIGHT file in the root directory of the nmh distribution for
+** complete copyright information.
+*/
 
 #include <h/mh.h>
 #include <h/signals.h>
 
 
-int
-SIGPROCMASK (int how, const sigset_t *set, sigset_t *oset)
-{
-#ifdef POSIX_SIGNALS
-	return sigprocmask(how, set, oset);
-#else
-# ifdef BSD_SIGNALS
-	switch(how) {
-	case SIG_BLOCK:
-		*oset = sigblock(*set);
-		break;
-	case SIG_UNBLOCK:
-		sigfillset(*oset);
-		*oset = sigsetmask(*oset);
-		sigsetmask(*oset & ~(*set));
-		break;
-	case SIG_SETMASK:
-		*oset = sigsetmask(*set);
-		break;
-	default:
-		adios(NULL, "unknown flag in SIGPROCMASK");
-		break;
-	}
-	return 0;
-# endif
-#endif
-}
-
-
 /*
- * A version of the function `signal' that uses reliable
- * signals, if the machine supports them.  Also, (assuming
- * OS support), it restarts interrupted system calls for all
- * signals except SIGALRM.
- */
+** A version of the function `signal' that uses reliable
+** signals, if the machine supports them.  Also, (assuming
+** OS support), it restarts interrupted system calls for all
+** signals except SIGALRM.
+**
+** Since we are now assuming POSIX signal support everywhere, we always
+** use reliable signals.
+*/
 
 SIGNAL_HANDLER
-SIGNAL (int sig, SIGNAL_HANDLER func)
+SIGNAL(int sig, SIGNAL_HANDLER func)
 {
-#ifdef POSIX_SIGNALS
 	struct sigaction act, oact;
 
 	act.sa_handler = func;
@@ -68,22 +41,18 @@ SIGNAL (int sig, SIGNAL_HANDLER func)
 	if (sigaction(sig, &act, &oact) < 0)
 		return (SIG_ERR);
 	return (oact.sa_handler);
-#else
-	return signal (sig, func);
-#endif
 }
 
 
 /*
- * A version of the function `signal' that will set
- * the handler of `sig' to `func' if the signal is
- * not currently set to SIG_IGN.  Also uses reliable
- * signals if available.
- */
+** A version of the function `signal' that will set
+** the handler of `sig' to `func' if the signal is
+** not currently set to SIG_IGN.  Also uses reliable
+** signals if available.
+*/
 SIGNAL_HANDLER
-SIGNAL2 (int sig, SIGNAL_HANDLER func)
+SIGNAL2(int sig, SIGNAL_HANDLER func)
 {
-#ifdef POSIX_SIGNALS
 	struct sigaction act, oact;
 
 	if (sigaction(sig, NULL, &oact) < 0)
@@ -106,11 +75,4 @@ SIGNAL2 (int sig, SIGNAL_HANDLER func)
 			return (SIG_ERR);
 	}
 	return (oact.sa_handler);
-#else
-	SIGNAL_HANDLER ofunc;
-
-	if ((ofunc = signal (sig, SIG_IGN)) != SIG_IGN)
-		signal (sig, func);
-	return ofunc;
-#endif
 }