X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=d3ddb948c1acb4047b8db5ad847c4d49e275fc7f;hb=6bd5e1baa07e971d42188391a12f330b82174c48;hp=38167c8fdca91ddb489c52bc8d05a1cf7f01f2d5;hpb=0c648c7c1509760370d4c4267a45a5a305885e7f;p=mmh

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 38167c8..d3ddb94 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -19,16 +19,6 @@
 #include <h/utils.h>
 #include <sys/wait.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
-
 extern int debugsw;
 
 int serialsw = 0;
@@ -146,7 +136,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);
@@ -154,7 +144,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();
@@ -459,7 +449,8 @@ raw:
 		}
 	}
 
-	if (buflen <= 0 || (ct->c_termproc && buflen <= strlen(ct->c_termproc))) {
+	if (buflen <= 0 || (ct->c_termproc &&
+			(size_t)buflen <= strlen(ct->c_termproc))) {
 		/*
 		** content_error would provide a more useful error message
 		** here, except that if we got overrun, it probably would
@@ -675,7 +666,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);
 	}
 
 /*
@@ -761,7 +752,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;
@@ -958,8 +949,8 @@ raw:
 		}
 	}
 
-	if (buflen <= 0 ||
-			(ct->c_termproc && buflen <= strlen(ct->c_termproc))) {
+	if (buflen <= 0 || (ct->c_termproc &&
+			(size_t)buflen <= strlen(ct->c_termproc))) {
 		/*
 		** content_error would provide a more useful error message
 		** here, except that if we got overrun, it probably would