From 3e4f4b93f7d647dd203b0057e2d02aa2d523b3a5 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Sun, 29 Jun 1997 23:40:54 +0000 Subject: Updates from NetBSD (christos@netbsd.org) * Portability fixes: __const -> const BADSIG -> SIG_ERR int flags -> u_int flags #if __STDC__ -> #ifdef __STDC__ * Don't allow CSWTCH to interfere with CSUSP on __SVR4 systems. * Return -1 if the terminal set operation resulted in dumb terminal settings. * Handle properly the case where the last line in the sourced file does not have a trailing '\n'. From Jeffrey C Honig. * editrc -> editline in editline(3) --- lib/libedit/sig.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/libedit/sig.c') diff --git a/lib/libedit/sig.c b/lib/libedit/sig.c index 06a0d490ccd..3aeaab0938c 100644 --- a/lib/libedit/sig.c +++ b/lib/libedit/sig.c @@ -1,5 +1,5 @@ -/* $OpenBSD: sig.c,v 1.4 1997/03/14 05:13:02 millert Exp $ */ -/* $NetBSD: sig.c,v 1.2 1997/01/11 06:48:10 lukem Exp $ */ +/* $OpenBSD: sig.c,v 1.5 1997/06/29 23:40:52 millert Exp $ */ +/* $NetBSD: sig.c,v 1.3 1997/04/11 17:52:48 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)sig.c 8.1 (Berkeley) 6/4/93"; #else -static char rcsid[] = "$OpenBSD: sig.c,v 1.4 1997/03/14 05:13:02 millert Exp $"; +static char rcsid[] = "$OpenBSD: sig.c,v 1.5 1997/06/29 23:40:52 millert Exp $"; #endif #endif /* not lint && not SCCSID */ @@ -128,7 +128,7 @@ sig_init(el) el->el_signal = (sig_t *) el_malloc(SIGSIZE); for (i = 0; sighdl[i] != -1; i++) - el->el_signal[i] = BADSIG; + el->el_signal[i] = SIG_ERR; (void)sigprocmask(SIG_SETMASK, &oset, NULL); @@ -192,7 +192,7 @@ sig_clr(el) (void)sigprocmask(SIG_BLOCK, &nset, &oset); for (i = 0; sighdl[i] != -1; i++) - if (el->el_signal[i] != BADSIG) + if (el->el_signal[i] != SIG_ERR) (void)signal(sighdl[i], el->el_signal[i]); sel = NULL; /* we are going to die if the handler is called */ -- cgit v1.2.3