Deleted Added
full compact
sigcompat.c (52040) sigcompat.c (55837)
1/*
2 * Copyright (c) 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
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * 3. All advertising materials mentioning features or use of this software
14 * must display the following acknowledgement:
15 * This product includes software developed by the University of
16 * California, Berkeley and its contributors.
17 * 4. Neither the name of the University nor the names of its contributors
18 * may be used to endorse or promote products derived from this software
19 * without specific prior written permission.
20 *
21 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
22 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
23 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
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) 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
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * 3. All advertising materials mentioning features or use of this software
14 * must display the following acknowledgement:
15 * This product includes software developed by the University of
16 * California, Berkeley and its contributors.
17 * 4. Neither the name of the University nor the names of its contributors
18 * may be used to endorse or promote products derived from this software
19 * without specific prior written permission.
20 *
21 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
22 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
23 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
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/compat-43/sigcompat.c 55837 2000-01-12 09:23:48Z jasone $
32 */
33
34#if defined(LIBC_SCCS) && !defined(lint)
35#if 0
36static char sccsid[] = "@(#)sigcompat.c 8.1 (Berkeley) 6/2/93";
37#endif
38static const char rcsid[] =
34 */
35
36#if defined(LIBC_SCCS) && !defined(lint)
37#if 0
38static char sccsid[] = "@(#)sigcompat.c 8.1 (Berkeley) 6/2/93";
39#endif
40static const char rcsid[] =
39 "$FreeBSD: head/lib/libc/compat-43/sigcompat.c 52040 1999-10-09 00:25:29Z jdp $";
41 "$FreeBSD: head/lib/libc/compat-43/sigcompat.c 55837 2000-01-12 09:23:48Z jasone $";
40#endif /* LIBC_SCCS and not lint */
41
42#include <sys/param.h>
43#include <signal.h>
44
45int
46sigvec(signo, sv, osv)
47 int signo;
48 struct sigvec *sv, *osv;
49{
50 struct sigaction sa, osa;
51 struct sigaction *sap, *osap;
52 int ret;
53
54 if (sv != NULL) {
55 sa.sa_handler = sv->sv_handler;
56 sa.sa_flags = sv->sv_flags ^ SV_INTERRUPT;
57 sigemptyset(&sa.sa_mask);
58 sa.sa_mask.__bits[0] = sv->sv_mask;
59 sap = &sa;
60 } else
61 sap = NULL;
62 osap = osv != NULL ? &osa : NULL;
63 ret = sigaction(signo, sap, osap);
64 if (ret == 0 && osv != NULL) {
65 osv->sv_handler = osa.sa_handler;
66 osv->sv_flags = osa.sa_flags ^ SV_INTERRUPT;
67 osv->sv_mask = osa.sa_mask.__bits[0];
68 }
69 return (ret);
70}
71
72int
73sigsetmask(mask)
74 int mask;
75{
76 sigset_t set, oset;
77 int n;
78
79 sigemptyset(&set);
80 set.__bits[0] = mask;
81 n = sigprocmask(SIG_SETMASK, &set, &oset);
82 if (n)
83 return (n);
84 return (oset.__bits[0]);
85}
86
87int
88sigblock(mask)
89 int mask;
90{
91 sigset_t set, oset;
92 int n;
93
94 sigemptyset(&set);
95 set.__bits[0] = mask;
96 n = sigprocmask(SIG_BLOCK, &set, &oset);
97 if (n)
98 return (n);
99 return (oset.__bits[0]);
100}
101
102int
103sigpause(mask)
104 int mask;
105{
106 sigset_t set;
107
108 sigemptyset(&set);
109 set.__bits[0] = mask;
42#endif /* LIBC_SCCS and not lint */
43
44#include <sys/param.h>
45#include <signal.h>
46
47int
48sigvec(signo, sv, osv)
49 int signo;
50 struct sigvec *sv, *osv;
51{
52 struct sigaction sa, osa;
53 struct sigaction *sap, *osap;
54 int ret;
55
56 if (sv != NULL) {
57 sa.sa_handler = sv->sv_handler;
58 sa.sa_flags = sv->sv_flags ^ SV_INTERRUPT;
59 sigemptyset(&sa.sa_mask);
60 sa.sa_mask.__bits[0] = sv->sv_mask;
61 sap = &sa;
62 } else
63 sap = NULL;
64 osap = osv != NULL ? &osa : NULL;
65 ret = sigaction(signo, sap, osap);
66 if (ret == 0 && osv != NULL) {
67 osv->sv_handler = osa.sa_handler;
68 osv->sv_flags = osa.sa_flags ^ SV_INTERRUPT;
69 osv->sv_mask = osa.sa_mask.__bits[0];
70 }
71 return (ret);
72}
73
74int
75sigsetmask(mask)
76 int mask;
77{
78 sigset_t set, oset;
79 int n;
80
81 sigemptyset(&set);
82 set.__bits[0] = mask;
83 n = sigprocmask(SIG_SETMASK, &set, &oset);
84 if (n)
85 return (n);
86 return (oset.__bits[0]);
87}
88
89int
90sigblock(mask)
91 int mask;
92{
93 sigset_t set, oset;
94 int n;
95
96 sigemptyset(&set);
97 set.__bits[0] = mask;
98 n = sigprocmask(SIG_BLOCK, &set, &oset);
99 if (n)
100 return (n);
101 return (oset.__bits[0]);
102}
103
104int
105sigpause(mask)
106 int mask;
107{
108 sigset_t set;
109
110 sigemptyset(&set);
111 set.__bits[0] = mask;
110 return (sigsuspend(&set));
112 return (_libc_sigsuspend(&set));
111}
113}