[apple/libc.git] / gen / FreeBSD / pause.c.patch

--- pause.c.orig	2009-11-07 14:51:38.000000000 -0800
+++ pause.c	2009-11-07 14:51:40.000000000 -0800
@@ -30,6 +30,13 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)pause.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
+
+/* For the cancelable variant, we call the cancelable sigsuspend */
+#ifdef VARIANT_CANCELABLE
+#undef __DARWIN_NON_CANCELABLE
+#define __DARWIN_NON_CANCELABLE 0
+#endif /* VARIANT_CANCELABLE */
+
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/gen/pause.c,v 1.7 2007/01/09 00:27:54 imp Exp $");
 
@@ -42,7 +49,10 @@ __FBSDID("$FreeBSD: src/lib/libc/gen/pau
 int
 __pause()
 {
-	return sigpause(sigblock(0L));
+	sigset_t set;
+
+	sigprocmask(0, NULL, &set);
+	return sigsuspend(&set);
 }
 __weak_reference(__pause, pause);
 __weak_reference(__pause, _pause);
Commit	Line	Data
1f2f436a A	1	--- pause.c.orig 2009-11-07 14:51:38.000000000 -0800
	2	+++ pause.c 2009-11-07 14:51:40.000000000 -0800
	3	@@ -30,6 +30,13 @@
224c7076 A	4	#if defined(LIBC_SCCS) && !defined(lint)
	5	static char sccsid[] = "@(#)pause.c 8.1 (Berkeley) 6/4/93";
	6	#endif /* LIBC_SCCS and not lint */
	7	+
	8	+/* For the cancelable variant, we call the cancelable sigsuspend */
	9	+#ifdef VARIANT_CANCELABLE
	10	+#undef __DARWIN_NON_CANCELABLE
	11	+#define __DARWIN_NON_CANCELABLE 0
	12	+#endif /* VARIANT_CANCELABLE */
	13	+
	14	#include <sys/cdefs.h>
1f2f436a	15	__FBSDID("$FreeBSD: src/lib/libc/gen/pause.c,v 1.7 2007/01/09 00:27:54 imp Exp $");
224c7076	16
1f2f436a	17	@@ -42,7 +49,10 @@ __FBSDID("$FreeBSD: src/lib/libc/gen/pau
224c7076 A	18	int
	19	__pause()
	20	{
	21	- return sigpause(sigblock(0L));
	22	+ sigset_t set;
	23	+
	24	+ sigprocmask(0, NULL, &set);
	25	+ return sigsuspend(&set);
	26	}
	27	__weak_reference(__pause, pause);
	28	__weak_reference(__pause, _pause);