Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Take the normal return path in sigtimedwait when the current thread was 

canceled as well. From Stephan Uphoff.
This commit is contained in:
fvdl 2003-07-17 18:15:21 +00:00
parent 619dee76f6
commit 2949ab0051
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libpthread/pthread_sig.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pthread_sig.c,v 1.14 2003/05/27 15:24:25 christos Exp $ */
/* $NetBSD: pthread_sig.c,v 1.15 2003/07/17 18:15:21 fvdl Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__RCSID("$NetBSD: pthread_sig.c,v 1.14 2003/05/27 15:24:25 christos Exp $");
__RCSID("$NetBSD: pthread_sig.c,v 1.15 2003/07/17 18:15:21 fvdl Exp $");
/* We're interposing a specific version of the signal interface. */
#define __LIBC12_SOURCE__
@ -419,7 +419,7 @@ sigtimedwait(const sigset_t * __restrict set, siginfo_t * __restrict info, const
error = __sigtimedwait(&wset, info, (timeout) ? &timo : NULL);
pthread_spinlock(self, &pt_sigwaiting_lock);
if ((error && errno != ECANCELED)
if ((error && (errno != ECANCELED || self->pt_cancel))
|| (!error && __sigismember14(set, info->si_signo)) ) {
/*
* Normal function return. Clear pt_sigwmaster,