summaryrefslogtreecommitdiff
path: root/bin/ps
diff options
context:
space:
mode:
Diffstat (limited to 'bin/ps')
-rw-r--r--bin/ps/print.c4
-rw-r--r--bin/ps/ps.18
2 files changed, 9 insertions, 3 deletions
diff --git a/bin/ps/print.c b/bin/ps/print.c
index 9f22e0276e9..fb4faeb2f4e 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print.c,v 1.61 2015/06/29 15:03:33 bluhm Exp $ */
+/* $OpenBSD: print.c,v 1.62 2015/07/19 19:26:00 deraadt Exp $ */
/* $NetBSD: print.c,v 1.27 1995/09/29 21:58:12 cgd Exp $ */
/*-
@@ -269,6 +269,8 @@ state(const struct kinfo_proc *kp, VARENT *ve)
*cp++ = 's';
if ((kp->p_psflags & PS_CONTROLT) && kp->p__pgid == kp->p_tpgid)
*cp++ = '+';
+ if (kp->p_psflags & PS_TAMED)
+ *cp++ = 't';
*cp = '\0';
if (state == 'R' && kp->p_cpuid != KI_NOCPU) {
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index 2d324488f1d..3ce7d6d5637 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ps.1,v 1.99 2015/06/29 15:03:33 bluhm Exp $
+.\" $OpenBSD: ps.1,v 1.100 2015/07/19 19:26:00 deraadt Exp $
.\" $NetBSD: ps.1,v 1.16 1996/03/21 01:36:28 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1991, 1993, 1994
@@ -30,7 +30,7 @@
.\"
.\" @(#)ps.1 8.3 (Berkeley) 4/18/94
.\"
-.Dd $Mdocdate: June 29 2015 $
+.Dd $Mdocdate: July 19 2015 $
.Dt PS 1
.Os
.Sh NAME
@@ -341,6 +341,7 @@ PS_SYSTEM 0x10000 No signals, stats or swapping
PS_EMBRYO 0x20000 New process, not yet fledged
PS_ZOMBIE 0x40000 Dead and ready to be waited for
PS_NOBROADCASTKILL 0x80000 Process excluded from kill -1
+PS_TAMED 0x100000 process has called tame(2)
.Ed
.It Cm re
Core residency time (in seconds; 127 = infinity).
@@ -463,6 +464,9 @@ scheduling priority.
.\" sequentially address voluminous data).
.It s
The process is a session leader.
+.It t
+The process has called
+.Xr tame 2 .
.It V
The process is suspended during a
.Xr vfork 2 .