From 36939a0a5cbfb8cf975a26766a51ca1ca0ea9250 Mon Sep 17 00:00:00 2001 From: David Xu Date: Mon, 7 Jun 2004 13:35:02 +0000 Subject: [PATCH] According to SUSv3, sigwait is different with sigwaitinfo, sigwait returns error code in return value, not in errno. --- sys/kern/kern_sig.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index adda9bdb4e8..81f5bbb5a7b 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -746,12 +746,18 @@ sigwait(struct thread *td, struct sigwait_args *uap) int error; error = copyin(uap->set, &set, sizeof(set)); - if (error) - return (error); + if (error) { + td->td_retval[0] = error; + return (0); + } error = kern_sigtimedwait(td, set, &info, NULL); - if (error) - return (error); + if (error) { + if (error == ERESTART) + return (error); + td->td_retval[0] = error; + return (0); + } error = copyout(&info.si_signo, uap->sig, sizeof(info.si_signo)); /* Repost if we got an error. */ @@ -760,7 +766,8 @@ sigwait(struct thread *td, struct sigwait_args *uap) tdsignal(td, info.si_signo, SIGTARGET_TD); PROC_UNLOCK(td->td_proc); } - return (error); + td->td_retval[0] = error; + return (0); } /* * MPSAFE