From 3cc4dd5ef70872e9ab974f02008c43c01e7f2af9 Mon Sep 17 00:00:00 2001
From: jraynard <jraynard@FreeBSD.org>
Date: Sat, 28 Feb 1998 16:02:24 +0000
Subject: Don't assume sigset_t and int are equivalent.

---
 usr.bin/doscmd/doscmd.c | 4 ++--
 usr.bin/doscmd/signal.c | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/doscmd/doscmd.c b/usr.bin/doscmd/doscmd.c
index 2bfa3cf..3cf8d4c 100644
--- a/usr.bin/doscmd/doscmd.c
+++ b/usr.bin/doscmd/doscmd.c
@@ -29,7 +29,7 @@
  *
  *	BSDI doscmd.c,v 2.3 1996/04/08 19:32:30 bostic Exp
  *
- * $Id: doscmd.c,v 1.2 1997/08/15 23:41:23 jlemon Exp $
+ * $Id: doscmd.c,v 1.3 1997/09/30 22:03:40 jlemon Exp $
  */
 
 #include <sys/types.h>
@@ -257,7 +257,7 @@ main(int argc, char **argv)
 	N_PUTVEC(R_CS, R_IP, video_vector);
     }
 
-    sc.sc_mask = 0;
+    sigemptyset(&sc.sc_mask);
     sc.sc_onstack = 0;
 
     if (tmode)
diff --git a/usr.bin/doscmd/signal.c b/usr.bin/doscmd/signal.c
index 434f00f..c79a24a 100644
--- a/usr.bin/doscmd/signal.c
+++ b/usr.bin/doscmd/signal.c
@@ -29,7 +29,7 @@
  *
  *	BSDI signal.c,v 2.2 1996/04/08 19:33:06 bostic Exp
  *
- * $Id: signal.c,v 1.5 1997/03/18 02:36:56 msmith Exp $
+ * $Id: signal.c,v 1.1 1997/08/09 01:42:55 dyson Exp $
  */
 
 #include "doscmd.h"
@@ -104,7 +104,9 @@ setsignal(int s, void (*h)(struct sigframe *))
 	handler[s] = h;
 
 	sa.sa_handler = (__sighandler_t *)generichandler;
-	sa.sa_mask = sigmask(SIGIO) | sigmask(SIGALRM);
+	sigemptyset(&sa.sa_mask);
+	sigaddset(&sa.sa_mask, SIGIO);
+	sigaddset(&sa.sa_mask, SIGALRM);
 	sa.sa_flags = SA_ONSTACK;
 	sigaction(s, &sa, NULL);
 
-- 
cgit v1.1