d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-enable the options in ps(1) that were disabled with the Linux

Browse Source 
threads support.

Submitted by:	"Richard Seaman, Jr." <dick@tar.com>
This commit is contained in:
Julian Elischer 1999-01-13 03:11:43 +00:00
parent 97f2835300
commit d8c85307b2
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/ps/keyword.c
View File

@ -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"},

7
sys/kern/kern_proc.c
View File

@ -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;

5
sys/sys/user.h
View File

@ -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 */