X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=5225825681949996c6e55fe6cac13d7d963ae39e;hb=f5e7506daeb8f52e02348504fb1699284b299f25;hp=d3397aea8886a8a87cb0e645cb93487adecc6c03;hpb=164be8e5e8b40ce4572281be26d423a9c9d595f3;p=mmh

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index d3397ae..5225825 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -19,16 +19,7 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
-
-/*
- * Just use sigjmp/longjmp on older machines that
- * don't have sigsetjmp/siglongjmp.
- */
-#ifndef HAVE_SIGSETJMP
-# define sigjmp_buf jmp_buf
-# define sigsetjmp(env,mask) setjmp(env)
-# define siglongjmp(env,val) longjmp(env,val)
-#endif
+#include <sys/wait.h>
 
 extern int debugsw;
 
@@ -84,7 +75,7 @@ static int show_multi_aux (CT, int, int, char *);
 static int show_message_rfc822 (CT, int, int);
 static int show_partial (CT, int, int);
 static int show_external (CT, int, int);
-static RETSIGTYPE intrser (int);
+static void intrser (int);
 
 
 /*
@@ -159,7 +150,7 @@ show_single_message (CT ct, char *form)
     sigaddset (&set, SIGINT);
     sigaddset (&set, SIGQUIT);
     sigaddset (&set, SIGTERM);
-    SIGPROCMASK (SIG_BLOCK, &set, &oset);
+    sigprocmask (SIG_BLOCK, &set, &oset);
 
     while (wait (&status) != NOTOK) {
 	pidcheck (status);
@@ -167,7 +158,7 @@ show_single_message (CT ct, char *form)
     }
 
     /* reset the signal mask */
-    SIGPROCMASK (SIG_SETMASK, &oset, &set);
+    sigprocmask (SIG_SETMASK, &oset, &set);
 
     xpid = 0;
     flush_errors ();
@@ -719,7 +710,7 @@ show_multi_internal (CT ct, int serial, int alternate)
 	sigaddset (&set, SIGINT);
 	sigaddset (&set, SIGQUIT);
 	sigaddset (&set, SIGTERM);
-	SIGPROCMASK (SIG_BLOCK, &set, &oset);
+	sigprocmask (SIG_BLOCK, &set, &oset);
     }
 
 /*
@@ -805,7 +796,7 @@ show_multi_internal (CT ct, int serial, int alternate)
 out:
     if (!nowserial) {
 	/* reset the signal mask */
-	SIGPROCMASK (SIG_SETMASK, &oset, &set);
+	sigprocmask (SIG_SETMASK, &oset, &set);
     }
 
     return result;
@@ -1090,13 +1081,9 @@ show_external (CT ct, int serial, int alternate)
 }
 
 
-static RETSIGTYPE
+static void
 intrser (int i)
 {
-#ifndef RELIABLE_SIGNALS
-    SIGNAL (SIGINT, intrser);
-#endif
-
     putchar ('\n');
     siglongjmp (intrenv, DONE);
 }