Deleted Added
full compact
signal.c (1574) signal.c (71579)
1/*
2 * Copyright (c) 1985, 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
1/*
2 * Copyright (c) 1985, 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * $FreeBSD: head/lib/libc/gen/signal.c 71579 2001-01-24 13:01:12Z deischen $
32 */
33
34#if defined(LIBC_SCCS) && !defined(lint)
35static char sccsid[] = "@(#)signal.c 8.1 (Berkeley) 6/4/93";
36#endif /* LIBC_SCCS and not lint */
37
38/*
39 * Almost backwards compatible signal.
40 */
34 */
35
36#if defined(LIBC_SCCS) && !defined(lint)
37static char sccsid[] = "@(#)signal.c 8.1 (Berkeley) 6/4/93";
38#endif /* LIBC_SCCS and not lint */
39
40/*
41 * Almost backwards compatible signal.
42 */
43#include "namespace.h"
41#include <signal.h>
44#include <signal.h>
45#include "un-namespace.h"
46#include "libc_private.h"
42
43sigset_t _sigintr; /* shared with siginterrupt */
44
45sig_t
46signal(s, a)
47 int s;
48 sig_t a;
49{
50 struct sigaction sa, osa;
51
52 sa.sa_handler = a;
53 sigemptyset(&sa.sa_mask);
54 sa.sa_flags = 0;
55 if (!sigismember(&_sigintr, s))
56 sa.sa_flags |= SA_RESTART;
47
48sigset_t _sigintr; /* shared with siginterrupt */
49
50sig_t
51signal(s, a)
52 int s;
53 sig_t a;
54{
55 struct sigaction sa, osa;
56
57 sa.sa_handler = a;
58 sigemptyset(&sa.sa_mask);
59 sa.sa_flags = 0;
60 if (!sigismember(&_sigintr, s))
61 sa.sa_flags |= SA_RESTART;
57 if (sigaction(s, &sa, &osa) < 0)
62 if (_sigaction(s, &sa, &osa) < 0)
58 return (SIG_ERR);
59 return (osa.sa_handler);
60}
63 return (SIG_ERR);
64 return (osa.sa_handler);
65}