From owner-svn-src-all@FreeBSD.ORG  Sat Oct 30 08:18:17 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 7374710656AB;
	Sat, 30 Oct 2010 08:18:17 +0000 (UTC) (envelope-from avg@freebsd.org)
Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140])
	by mx1.freebsd.org (Postfix) with ESMTP id 192988FC13;
	Sat, 30 Oct 2010 08:18:15 +0000 (UTC)
Received: from porto.topspin.kiev.ua (porto-e.starpoint.kiev.ua
	[212.40.38.100])
	by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id LAA18403;
	Sat, 30 Oct 2010 11:18:14 +0300 (EEST)
	(envelope-from avg@freebsd.org)
Received: from localhost.topspin.kiev.ua ([127.0.0.1])
	by porto.topspin.kiev.ua with esmtp (Exim 4.34 (FreeBSD))
	id 1PC6di-000J4t-EI; Sat, 30 Oct 2010 11:18:14 +0300
Message-ID: <4CCBD4C6.2070505@freebsd.org>
Date: Sat, 30 Oct 2010 11:18:14 +0300
From: Andriy Gapon <avg@freebsd.org>
User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US;
	rv:1.9.2.11) Gecko/20101021 Lightning/1.0b2 Thunderbird/3.1.5
MIME-Version: 1.0
To: David Xu <davidxu@freebsd.org>
References: <201010290935.o9T9ZbXH089952@svn.freebsd.org>
In-Reply-To: <201010290935.o9T9ZbXH089952@svn.freebsd.org>
X-Enigmail-Version: 1.1.2
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org
Subject: Re: svn commit: r214506 - head/lib/libthr/thread
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Oct 2010 08:18:17 -0000

on 29/10/2010 12:35 David Xu said the following:
> Author: davidxu
> Date: Fri Oct 29 09:35:36 2010
> New Revision: 214506
> URL: http://svn.freebsd.org/changeset/base/214506
> 
> Log:
>   Return previous sigaction correctly.
>   
>   Submitted by:	avg

Thanks!

> Modified:
>   head/lib/libthr/thread/thr_sig.c
> 
> Modified: head/lib/libthr/thread/thr_sig.c
> ==============================================================================
> --- head/lib/libthr/thread/thr_sig.c	Fri Oct 29 09:23:26 2010	(r214505)
> +++ head/lib/libthr/thread/thr_sig.c	Fri Oct 29 09:35:36 2010	(r214506)
> @@ -547,7 +547,10 @@ _sigaction(int sig, const struct sigacti
>  
>  	if (oldact.sa_handler != SIG_DFL &&
>  	    oldact.sa_handler != SIG_IGN) {
> -		oldact = _thr_sigact[sig-1].sigact;
> +		if (act != NULL)
> +			oldact = oldact2;
> +		else if (oact != NULL)
> +			oldact = _thr_sigact[sig-1].sigact;
>  	}
>  
>  	_thr_rwl_unlock(&_thr_sigact[sig-1].lock);


-- 
Andriy Gapon