From owner-svn-src-all@FreeBSD.ORG Thu Feb 25 13:51:12 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1AF9B106564A; Thu, 25 Feb 2010 13:51:12 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0A1A98FC0A; Thu, 25 Feb 2010 13:51:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1PDpBUG028306; Thu, 25 Feb 2010 13:51:11 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1PDpBUR028304; Thu, 25 Feb 2010 13:51:11 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201002251351.o1PDpBUR028304@svn.freebsd.org> From: Konstantin Belousov Date: Thu, 25 Feb 2010 13:51:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r204307 - head/lib/libc/gen X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Feb 2010 13:51:12 -0000 Author: kib Date: Thu Feb 25 13:51:11 2010 New Revision: 204307 URL: http://svn.freebsd.org/changeset/base/204307 Log: Make pause(3) implementation not depended on the legacy sigcompat.c interfaces. Do not block rt signals during and after pause(3) calls. Use private libc namespace to call proper methods. MFC after: 1 week Modified: head/lib/libc/gen/pause.c Modified: head/lib/libc/gen/pause.c ============================================================================== --- head/lib/libc/gen/pause.c Thu Feb 25 13:28:05 2010 (r204306) +++ head/lib/libc/gen/pause.c Thu Feb 25 13:51:11 2010 (r204307) @@ -33,8 +33,10 @@ static char sccsid[] = "@(#)pause.c 8.1 #include __FBSDID("$FreeBSD$"); +#include "namespace.h" #include #include +#include "un-namespace.h" /* * Backwards compatible pause. @@ -42,7 +44,11 @@ __FBSDID("$FreeBSD$"); int __pause(void) { - return sigpause(sigblock(0L)); + sigset_t oset; + + if (_sigprocmask(SIG_BLOCK, NULL, &oset) == -1) + return (-1); + return (_sigsuspend(&oset)); } __weak_reference(__pause, pause); __weak_reference(__pause, _pause);