From 9dbc4bc4ff1bd640f526fd2da359c0768fe7e462 Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Mon, 10 Nov 1997 11:32:24 +0000
Subject: Fixed some type and value mismatches.  setsignal() returned a bogusly
 cast value that was always ignored.  Rev.1.9 of trap.c made this more bogus
 by returning a semantically different value after calling siginterrupt(). 
 Avoid these problems by not returning a value.

---
 bin/sh/trap.c | 19 +++++++++----------
 bin/sh/trap.h |  4 ++--
 2 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'bin')

diff --git a/bin/sh/trap.c b/bin/sh/trap.c
index 809f1b6..94d6d7c 100644
--- a/bin/sh/trap.c
+++ b/bin/sh/trap.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: trap.c,v 1.8 1997/02/22 13:58:46 peter Exp $
+ *	$Id: trap.c,v 1.9 1997/11/05 23:33:58 ache Exp $
  */
 
 #ifndef lint
@@ -205,14 +205,13 @@ clear_traps()
  * Set the signal handler for the specified signal.  The routine figures
  * out what it should be set to.
  */
-long
+void
 setsignal(signo)
 	int signo;
 {
 	int action;
-	sig_t sigact = SIG_DFL;
+	sig_t sig, sigact = SIG_DFL;
 	char *t;
-	long sig;
 
 	if ((t = trap[signo]) == NULL)
 		action = S_DFL;
@@ -261,7 +260,7 @@ setsignal(signo)
 			 * here, but other shells don't. We don't alter
 			 * sigmode, so that we retry every time.
 			 */
-			return 0;
+			return;
 		}
 		if (sigact == SIG_IGN) {
 			if (mflag && (signo == SIGTSTP ||
@@ -274,19 +273,18 @@ setsignal(signo)
 		}
 	}
 	if (*t == S_HARD_IGN || *t == action)
-		return 0;
+		return;
 	switch (action) {
 		case S_DFL:	sigact = SIG_DFL;	break;
 		case S_CATCH:  	sigact = onsig;		break;
 		case S_IGN:	sigact = SIG_IGN;	break;
 	}
 	*t = action;
-	sig = (long)signal(signo, sigact);
+	sig = signal(signo, sigact);
 #ifdef BSD
-	if (sig != -1 && action == S_CATCH)
-		sig = siginterrupt(signo, 1);
+	if (sig != SIG_ERR && action == S_CATCH)
+		siginterrupt(signo, 1);
 #endif
-	return sig;
 }
 
 
@@ -345,6 +343,7 @@ void
 onsig(signo)
 	int signo;
 {
+
 #ifndef BSD
 	signal(signo, onsig);
 #endif
diff --git a/bin/sh/trap.h b/bin/sh/trap.h
index 24866a5..a042a16 100644
--- a/bin/sh/trap.h
+++ b/bin/sh/trap.h
@@ -34,14 +34,14 @@
  * SUCH DAMAGE.
  *
  *	@(#)trap.h	8.3 (Berkeley) 6/5/95
- *	$Id$
+ *	$Id: trap.h,v 1.6 1997/02/22 13:58:47 peter Exp $
  */
 
 extern int pendingsigs;
 
 int trapcmd __P((int, char **));
 void clear_traps __P((void));
-long setsignal __P((int));
+void setsignal __P((int));
 void ignoresig __P((int));
 void onsig __P((int));
 void dotrap __P((void));
-- 
cgit v1.1