From 98d8dc64a9b9fc0dbd7af6cf2e4359403aaeb817 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 24 Feb 2003 03:51:24 +0000 Subject: [PATCH] 2003-02-23 Roland McGrath * sysdeps/posix/pause.c: New file. * sysdeps/unix/common/pause.c: File removed. --- sysdeps/{unix/common => posix}/pause.c | 31 +++++++++----------------- 1 file changed, 10 insertions(+), 21 deletions(-) rename sysdeps/{unix/common => posix}/pause.c (74%) diff --git a/sysdeps/unix/common/pause.c b/sysdeps/posix/pause.c similarity index 74% rename from sysdeps/unix/common/pause.c rename to sysdeps/posix/pause.c index 14b87e44d0..db2c54f29d 100644 --- a/sysdeps/unix/common/pause.c +++ b/sysdeps/posix/pause.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991, 1996, 2002, 2003 Free Software Foundation, Inc. +/* pause -- suspend the process until a signal arrives. POSIX.1 version. + Copyright (C) 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -18,32 +19,20 @@ #include #include -#include /* Suspend the process until a signal arrives. This always returns -1 and sets errno to EINTR. */ -static void -do_pause (void) -{ - sigset_t set; - - sigemptyset (&set); - - __sigsuspend (&set); -} - int __libc_pause (void) { - if (SINGLE_THREAD_P) - { - do_pause (); - return -1; - } + sigset_t set; - int oldtype = LIBC_CANCEL_ASYNC (); - (void) do_pause (); - LIBC_CANCEL_RESET (oldtype); - return -1; + __sigemptyset (&set); + __sigprocmask (SIG_BLOCK, NULL, &set); + + /* pause is a cancellation point, but so is sigsuspend. + So no need for anything special here. */ + + return __sigsuspend (&set); } weak_alias (__libc_pause, pause)