X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=d3ddb948c1acb4047b8db5ad847c4d49e275fc7f;hb=412b2e54251ff6e20537f83b95c8ee76ea8c5c40;hp=217e890cbd934ec05106b119f92b858d80fe2681;hpb=ad4522348870e01f3d95eec2dd4dc008410d4cd8;p=mmh

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 217e890..d3ddb94 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -136,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);
@@ -144,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();
@@ -449,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
@@ -665,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);
 	}
 
 /*
@@ -751,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;
@@ -948,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