| sig.c (84260) | sig.c (148834) |
|---|---|
| 1/*- 2 * Copyright (c) 1992, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley by 6 * Christos Zoulas of Cornell University. 7 * 8 * Redistribution and use in source and binary forms, with or without 9 * modification, are permitted provided that the following conditions 10 * are met: 11 * 1. Redistributions of source code must retain the above copyright 12 * notice, this list of conditions and the following disclaimer. 13 * 2. Redistributions in binary form must reproduce the above copyright 14 * notice, this list of conditions and the following disclaimer in the 15 * documentation and/or other materials provided with the distribution. | 1/*- 2 * Copyright (c) 1992, 1993 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley by 6 * Christos Zoulas of Cornell University. 7 * 8 * Redistribution and use in source and binary forms, with or without 9 * modification, are permitted provided that the following conditions 10 * are met: 11 * 1. Redistributions of source code must retain the above copyright 12 * notice, this list of conditions and the following disclaimer. 13 * 2. Redistributions in binary form must reproduce the above copyright 14 * notice, this list of conditions and the following disclaimer in the 15 * documentation and/or other materials provided with the distribution. |
| 16 * 3. All advertising materials mentioning features or use of this software 17 * must display the following acknowledgement: 18 * This product includes software developed by the University of 19 * California, Berkeley and its contributors. 20 * 4. Neither the name of the University nor the names of its contributors | 16 * 3. Neither the name of the University nor the names of its contributors |
| 21 * may be used to endorse or promote products derived from this software 22 * without specific prior written permission. 23 * 24 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 25 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 26 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 27 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 28 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 34 * SUCH DAMAGE. 35 * | 17 * may be used to endorse or promote products derived from this software 18 * without specific prior written permission. 19 * 20 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 21 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 22 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 23 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 30 * SUCH DAMAGE. 31 * |
| 36 * $NetBSD: sig.c,v 1.7 2001/01/04 15:55:03 christos Exp $ | 32 * $NetBSD: sig.c,v 1.11 2003/08/07 16:44:33 agc Exp $ |
| 37 */ 38 39#if !defined(lint) && !defined(SCCSID) 40static char sccsid[] = "@(#)sig.c 8.1 (Berkeley) 6/4/93"; 41#endif /* not lint && not SCCSID */ 42#include <sys/cdefs.h> | 33 */ 34 35#if !defined(lint) && !defined(SCCSID) 36static char sccsid[] = "@(#)sig.c 8.1 (Berkeley) 6/4/93"; 37#endif /* not lint && not SCCSID */ 38#include <sys/cdefs.h> |
| 43__FBSDID("$FreeBSD: head/lib/libedit/sig.c 84260 2001-10-01 08:41:27Z obrien $"); | 39__FBSDID("$FreeBSD: head/lib/libedit/sig.c 148834 2005-08-07 20:55:59Z stefanf $"); |
| 44 45/* 46 * sig.c: Signal handling stuff. 47 * our policy is to trap all signals, set a good state 48 * and pass the ball to our caller. 49 */ 50#include "sys.h" 51#include "el.h" --- 62 unchanged lines hidden (view full) --- 114 sigset_t nset, oset; 115 116 (void) sigemptyset(&nset); 117#define _DO(a) (void) sigaddset(&nset, a); 118 ALLSIGS 119#undef _DO 120 (void) sigprocmask(SIG_BLOCK, &nset, &oset); 121 | 40 41/* 42 * sig.c: Signal handling stuff. 43 * our policy is to trap all signals, set a good state 44 * and pass the ball to our caller. 45 */ 46#include "sys.h" 47#include "el.h" --- 62 unchanged lines hidden (view full) --- 110 sigset_t nset, oset; 111 112 (void) sigemptyset(&nset); 113#define _DO(a) (void) sigaddset(&nset, a); 114 ALLSIGS 115#undef _DO 116 (void) sigprocmask(SIG_BLOCK, &nset, &oset); 117 |
| 122#define SIGSIZE (sizeof(sighdl) / sizeof(sighdl[0]) * sizeof(sig_t)) | 118#define SIGSIZE (sizeof(sighdl) / sizeof(sighdl[0]) * sizeof(el_signalhandler_t)) |
| 123 | 119 |
| 124 el->el_signal = (sig_t *) el_malloc(SIGSIZE); | 120 el->el_signal = (el_signalhandler_t *) el_malloc(SIGSIZE); |
| 125 if (el->el_signal == NULL) 126 return (-1); 127 for (i = 0; sighdl[i] != -1; i++) 128 el->el_signal[i] = SIG_ERR; 129 130 (void) sigprocmask(SIG_SETMASK, &oset, NULL); 131 132 return (0); --- 23 unchanged lines hidden (view full) --- 156 157 (void) sigemptyset(&nset); 158#define _DO(a) (void) sigaddset(&nset, a); 159 ALLSIGS 160#undef _DO 161 (void) sigprocmask(SIG_BLOCK, &nset, &oset); 162 163 for (i = 0; sighdl[i] != -1; i++) { | 121 if (el->el_signal == NULL) 122 return (-1); 123 for (i = 0; sighdl[i] != -1; i++) 124 el->el_signal[i] = SIG_ERR; 125 126 (void) sigprocmask(SIG_SETMASK, &oset, NULL); 127 128 return (0); --- 23 unchanged lines hidden (view full) --- 152 153 (void) sigemptyset(&nset); 154#define _DO(a) (void) sigaddset(&nset, a); 155 ALLSIGS 156#undef _DO 157 (void) sigprocmask(SIG_BLOCK, &nset, &oset); 158 159 for (i = 0; sighdl[i] != -1; i++) { |
| 164 sig_t s; | 160 el_signalhandler_t s; |
| 165 /* This could happen if we get interrupted */ 166 if ((s = signal(sighdl[i], sig_handler)) != sig_handler) 167 el->el_signal[i] = s; 168 } 169 sel = el; 170 (void) sigprocmask(SIG_SETMASK, &oset, NULL); 171} 172 --- 24 unchanged lines hidden --- | 161 /* This could happen if we get interrupted */ 162 if ((s = signal(sighdl[i], sig_handler)) != sig_handler) 163 el->el_signal[i] = s; 164 } 165 sel = el; 166 (void) sigprocmask(SIG_SETMASK, &oset, NULL); 167} 168 --- 24 unchanged lines hidden --- |