Date: Fri, 29 Oct 2010 09:35:37 +0000 (UTC) From: David Xu <davidxu@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r214506 - head/lib/libthr/thread Message-ID: <201010290935.o9T9ZbXH089952@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201010290935.o9T9ZbXH089952>