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

Introduce __sigtimedwait1 which will help adding COMPAT_NETBSD32 support 

for __sigtimedwait(2).
This commit is contained in:
cube 2005-07-23 22:02:13 +00:00
parent a6b803a79f
commit 875e65cda6
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/kern/kern_sig.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_sig.c,v 1.207 2005/06/10 05:10:13 matt Exp $ */
/* $NetBSD: kern_sig.c,v 1.208 2005/07/23 22:02:13 cube Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1991, 1993
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.207 2005/06/10 05:10:13 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.208 2005/07/23 22:02:13 cube Exp $");
#include "opt_ktrace.h"
#include "opt_compat_sunos.h"
@ -2329,6 +2329,13 @@ sys_setcontext(struct lwp *l, void *v, register_t *retval)
*/
int
sys___sigtimedwait(struct lwp *l, void *v, register_t *retval)
{
return __sigtimedwait1(l, v, retval, copyout, copyin, copyout);
}
int
__sigtimedwait1(struct lwp *l, void *v, register_t *retval,
copyinout_t put_info, copyinout_t fetch_timeout, copyinout_t put_timeout)
{
struct sys___sigtimedwait_args /* {
syscallarg(const sigset_t *) set;
@ -2384,7 +2391,7 @@ sys___sigtimedwait(struct lwp *l, void *v, register_t *retval)
if (SCARG(uap, timeout)) {
uint64_t ms;
if ((error = copyin(SCARG(uap, timeout), &ts, sizeof(ts))))
if ((error = (*fetch_timeout)(SCARG(uap, timeout), &ts, sizeof(ts))))
return (error);
ms = (ts.tv_sec * 1000) + (ts.tv_nsec / 1000000);
@ -2469,7 +2476,8 @@ sys___sigtimedwait(struct lwp *l, void *v, register_t *retval)
TIMEVAL_TO_TIMESPEC(&tvtimo, &ts);
/* copy updated timeout to userland */
if ((err = copyout(&ts, SCARG(uap, timeout), sizeof(ts)))) {
if ((err = (*put_timeout)(&ts, SCARG(uap, timeout),
sizeof(ts)))) {
error = err;
goto fail;
}
@ -2484,7 +2492,7 @@ sys___sigtimedwait(struct lwp *l, void *v, register_t *retval)
* left unchanged (userland is not supposed to touch it anyway).
*/
sig:
error = copyout(&ksi->ksi_info, SCARG(uap, info), sizeof(ksi->ksi_info));
return (*put_info)(&ksi->ksi_info, SCARG(uap, info), sizeof(ksi->ksi_info));
fail:
FREE(waitset, M_TEMP);

5
sys/sys/signalvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: signalvar.h,v 1.56 2005/06/19 23:10:03 christos Exp $ */
/* $NetBSD: signalvar.h,v 1.57 2005/07/23 22:02:13 cube Exp $ */
/*
* Copyright (c) 1991, 1993
@ -178,6 +178,9 @@ void sigactsfree(struct sigacts *);
void kpsendsig(struct lwp *, const struct ksiginfo *, const sigset_t *);
int __sigtimedwait1(struct lwp *, void *, register_t *, copyinout_t,
copyinout_t, copyinout_t);
/*
* Machine-dependent functions:
*/