diff options
| author | Julian Elischer <julian@FreeBSD.org> | 1999-01-13 03:11:43 +0000 |
|---|---|---|
| committer | Julian Elischer <julian@FreeBSD.org> | 1999-01-13 03:11:43 +0000 |
| commit | d8c85307b2a43adad67ca87caa58c975a43df29b (patch) | |
| tree | 80c402719d60c7370672aef9e9ae7370a21ca597 | |
| parent | 97f28353009083155da91104d38ff5b5daa35a6e (diff) | |
Notes
| -rw-r--r-- | bin/ps/keyword.c | 7 | ||||
| -rw-r--r-- | sys/kern/kern_proc.c | 7 | ||||
| -rw-r--r-- | sys/sys/user.h | 5 |
3 files changed, 16 insertions, 3 deletions
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index 023c55df3ff62..6cd2c3572dc96 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)keyword.c 8.5 (Berkeley) 4/2/94"; #else static const char rcsid[] = - "$Id: keyword.c,v 1.20 1998/09/14 08:32:20 dfr Exp $"; + "$Id: keyword.c,v 1.21 1998/12/19 02:55:32 julian Exp $"; #endif #endif /* not lint */ @@ -162,6 +162,11 @@ VAR var[] = { NULL, 0, pvar, NULL, 8, POFF(p_sigcatch), UINT, "x"}, {"sigignore", "IGNORED", NULL, 0, pvar, NULL, 8, POFF(p_sigignore), UINT, "x"}, +#else + {"sigcatch", "CAUGHT", + NULL, 0, evar, NULL, 8, EOFF(e_procsig.ps_sigcatch), UINT, "x"}, + {"sigignore", "IGNORED", + NULL, 0, evar, NULL, 8, EOFF(e_procsig.ps_sigignore), UINT, "x"}, #endif /* COMPAT_LINUX_THREADS */ {"sigmask", "BLOCKED", NULL, 0, pvar, NULL, 8, POFF(p_sigmask), UINT, "x"}, diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index c615d951a3987..0c6feac328a0f 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_proc.c 8.7 (Berkeley) 2/14/95 - * $Id: kern_proc.c,v 1.41 1999/01/08 17:31:09 eivind Exp $ + * $Id: kern_proc.c,v 1.42 1999/01/10 01:58:24 eivind Exp $ */ #include <sys/param.h> @@ -415,6 +415,11 @@ fill_eproc(p, ep) if (p->p_ucred) ep->e_ucred = *p->p_ucred; } +#ifdef COMPAT_LINUX_THREADS + if (p->p_procsig){ + ep->e_procsig = *p->p_procsig; + } +#endif if (p->p_stat != SIDL && p->p_stat != SZOMB && p->p_vmspace != NULL) { register struct vmspace *vm = p->p_vmspace; diff --git a/sys/sys/user.h b/sys/sys/user.h index df6715461183c..2f8e393f09344 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)user.h 8.2 (Berkeley) 9/23/93 - * $Id: user.h,v 1.17 1998/12/19 02:55:34 julian Exp $ + * $Id: user.h,v 1.18 1999/01/07 21:23:47 julian Exp $ */ #ifndef _SYS_USER_H_ @@ -69,6 +69,9 @@ struct kinfo_proc { struct session *e_sess; /* session pointer */ struct pcred e_pcred; /* process credentials */ struct ucred e_ucred; /* current credentials */ +#ifdef COMPAT_LINUX_THREADS + struct procsig e_procsig; /* shared signal structure */ +#endif struct vmspace e_vm; /* address space */ pid_t e_ppid; /* parent process id */ pid_t e_pgid; /* process group id */ |