Mon Jan 10 16:42:37 2011 UTC ()
remove clauses 3/4


(christos)
diff -r1.1 -r1.2 src/lib/libc/sys/sigqueue.c
diff -r1.2 -r1.3 src/tests/lib/libc/sys/t_sigqueue.c
cvs diff -r1.1 -r1.2 src/lib/libc/sys/sigqueue.c (switch to unified diff)

--- src/lib/libc/sys/sigqueue.c 2011/01/10 04:41:27 1.1
+++ src/lib/libc/sys/sigqueue.c 2011/01/10 16:42:36 1.2
@@ -1,68 +1,61 @@ @@ -1,68 +1,61 @@
1/* $NetBSD: sigqueue.c,v 1.1 2011/01/10 04:41:27 christos Exp $ */ 1/* $NetBSD: sigqueue.c,v 1.2 2011/01/10 16:42:36 christos Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2011 The NetBSD Foundation, Inc. 4 * Copyright (c) 2011 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Christos Zoulas. 8 * by Christos Zoulas.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
15 * 2. Redistributions in binary form must reproduce the above copyright 15 * 2. Redistributions in binary form must reproduce the above copyright
16 * notice, this list of conditions and the following disclaimer in the 16 * notice, this list of conditions and the following disclaimer in the
17 * documentation and/or other materials provided with the distribution. 17 * documentation and/or other materials provided with the distribution.
18 * 3. All advertising materials mentioning features or use of this software 
19 * must display the following acknowledgement: 
20 * This product includes software developed by the NetBSD 
21 * Foundation, Inc. and its contributors. 
22 * 4. Neither the name of The NetBSD Foundation nor the names of its 
23 * contributors may be used to endorse or promote products derived 
24 * from this software without specific prior written permission. 
25 * 18 *
26 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS 19 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
27 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
28 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
29 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
30 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
31 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
32 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
33 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
34 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
35 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
36 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
37 */ 30 */
38#include <sys/cdefs.h> 31#include <sys/cdefs.h>
39#if defined(LIBC_SCCS) && !defined(lint) 32#if defined(LIBC_SCCS) && !defined(lint)
40__RCSID("$NetBSD: sigqueue.c,v 1.1 2011/01/10 04:41:27 christos Exp $"); 33__RCSID("$NetBSD: sigqueue.c,v 1.2 2011/01/10 16:42:36 christos Exp $");
41#endif /* LIBC_SCCS and not lint */ 34#endif /* LIBC_SCCS and not lint */
42 35
43#include "namespace.h" 36#include "namespace.h"
44#include <sys/types.h> 37#include <sys/types.h>
45#include <sys/syscall.h> 38#include <sys/syscall.h>
46#include <string.h> 39#include <string.h>
47#include <signal.h> 40#include <signal.h>
48#include <unistd.h> 41#include <unistd.h>
49 42
50/* 43/*
51 * This is wrapper around sigqueueinfo(2), providing a sigqueue() 44 * This is wrapper around sigqueueinfo(2), providing a sigqueue()
52 * implementation for userland. 45 * implementation for userland.
53 */ 46 */
54int 47int
55sigqueue(pid_t pid, int signo, const union sigval value) 48sigqueue(pid_t pid, int signo, const union sigval value)
56{ 49{
57 siginfo_t info; 50 siginfo_t info;
58 51
59 (void)memset(&info, 0, sizeof(info)); 52 (void)memset(&info, 0, sizeof(info));
60 53
61 info.si_signo = signo; 54 info.si_signo = signo;
62 info.si_code = SI_QUEUE; 55 info.si_code = SI_QUEUE;
63 info.si_pid = getpid(); 56 info.si_pid = getpid();
64 info.si_uid = geteuid(); 57 info.si_uid = geteuid();
65 info.si_value = value; 58 info.si_value = value;
66 59
67 return sigqueueinfo(pid, &info); 60 return sigqueueinfo(pid, &info);
68} 61}
cvs diff -r1.2 -r1.3 src/tests/lib/libc/sys/t_sigqueue.c (switch to unified diff)

--- src/tests/lib/libc/sys/t_sigqueue.c 2011/01/10 05:15:00 1.2
+++ src/tests/lib/libc/sys/t_sigqueue.c 2011/01/10 16:42:37 1.3
@@ -1,92 +1,85 @@ @@ -1,92 +1,85 @@
1/* $NetBSD: t_sigqueue.c,v 1.2 2011/01/10 05:15:00 christos Exp $ */ 1/* $NetBSD: t_sigqueue.c,v 1.3 2011/01/10 16:42:37 christos Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2011 The NetBSD Foundation, Inc. 4 * Copyright (c) 2011 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Christos Zoulas. 8 * by Christos Zoulas.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
15 * 2. Redistributions in binary form must reproduce the above copyright 15 * 2. Redistributions in binary form must reproduce the above copyright
16 * notice, this list of conditions and the following disclaimer in the 16 * notice, this list of conditions and the following disclaimer in the
17 * documentation and/or other materials provided with the distribution. 17 * documentation and/or other materials provided with the distribution.
18 * 3. All advertising materials mentioning features or use of this software 
19 * must display the following acknowledgement: 
20 * This product includes software developed by the NetBSD 
21 * Foundation, Inc. and its contributors. 
22 * 4. Neither the name of The NetBSD Foundation nor the names of its 
23 * contributors may be used to endorse or promote products derived 
24 * from this software without specific prior written permission. 
25 * 18 *
26 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS 19 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
27 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
28 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
29 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
30 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
31 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
32 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
33 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
34 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
35 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
36 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
37 */ 30 */
38 31
39#include <sys/cdefs.h> 32#include <sys/cdefs.h>
40__RCSID("$NetBSD: t_sigqueue.c,v 1.2 2011/01/10 05:15:00 christos Exp $"); 33__RCSID("$NetBSD: t_sigqueue.c,v 1.3 2011/01/10 16:42:37 christos Exp $");
41 34
42#include <signal.h> 35#include <signal.h>
43#include <unistd.h> 36#include <unistd.h>
44#include <stdlib.h> 37#include <stdlib.h>
45#include <sched.h> 38#include <sched.h>
46#include <err.h> 39#include <err.h>
47 40
48#include <atf-c.h> 41#include <atf-c.h>
49 42
50ATF_TC(sigqueue); 43ATF_TC(sigqueue);
51ATF_TC_HEAD(sigqueue, tc) 44ATF_TC_HEAD(sigqueue, tc)
52{ 45{
53 atf_tc_set_md_var(tc, "descr", "Checks sigqueue sigval delivery"); 46 atf_tc_set_md_var(tc, "descr", "Checks sigqueue sigval delivery");
54} 47}
55 48
56#define VALUE (int)0xc001dad1 49#define VALUE (int)0xc001dad1
57static int value; 50static int value;
58 51
59static void 52static void
60/*ARGSUSED*/ 53/*ARGSUSED*/
61handler(int signo, siginfo_t *info, void *data) 54handler(int signo, siginfo_t *info, void *data)
62{ 55{
63 value = info->si_value.sival_int; 56 value = info->si_value.sival_int;
64 kill(0, SIGINFO); 57 kill(0, SIGINFO);
65} 58}
66 59
67ATF_TC_BODY(sigqueue, tc) 60ATF_TC_BODY(sigqueue, tc)
68{ 61{
69 struct sigaction sa; 62 struct sigaction sa;
70 union sigval sv; 63 union sigval sv;
71 64
72 sa.sa_sigaction = handler; 65 sa.sa_sigaction = handler;
73 sigemptyset(&sa.sa_mask); 66 sigemptyset(&sa.sa_mask);
74 sa.sa_flags = SA_SIGINFO; 67 sa.sa_flags = SA_SIGINFO;
75 68
76 if (sigaction(SIGUSR1, &sa, NULL) == -1) 69 if (sigaction(SIGUSR1, &sa, NULL) == -1)
77 err(1, "sigaction"); 70 err(1, "sigaction");
78 71
79 sv.sival_int = VALUE; 72 sv.sival_int = VALUE;
80 if (sigqueue(0, SIGUSR1, sv) == -1) 73 if (sigqueue(0, SIGUSR1, sv) == -1)
81 err(1, "sigqueue"); 74 err(1, "sigqueue");
82 75
83 sched_yield(); 76 sched_yield();
84 ATF_REQUIRE_EQ(sv.sival_int, value); 77 ATF_REQUIRE_EQ(sv.sival_int, value);
85} 78}
86 79
87ATF_TP_ADD_TCS(tp) 80ATF_TP_ADD_TCS(tp)
88{ 81{
89 ATF_TP_ADD_TC(tp, sigqueue); 82 ATF_TP_ADD_TC(tp, sigqueue);
90 83
91 return atf_no_error(); 84 return atf_no_error();
92} 85}