OpenBSD CVS

CVS log for src/bin/ps/keyword.c


[BACK] Up to [local] / src / bin / ps

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.52 / (download) - annotate - [select for diffs], Fri Feb 25 18:05:49 2022 UTC (2 years, 3 months ago) by rob
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1, HEAD
Changes since 1.51: +2 -2 lines
Diff to previous 1.51 (colored)

A few additional changes related to the now 32 bit accounting flag.
Pointers from and discussions with millert and deraadt.
Ok millert@, deraadt@, bluhm@

Revision 1.51 / (download) - annotate - [select for diffs], Tue Feb 22 17:42:52 2022 UTC (2 years, 3 months ago) by millert
Branch: MAIN
Changes since 1.50: +5 -4 lines
Diff to previous 1.50 (colored)

Use sizeof() instead of KI_MAXCOMLEN and KI_WMESGLEN in structs.
This way we keep the size of the strings in the private struct in
sync with what the kernel gives us.  OK deraadt@

Revision 1.50 / (download) - annotate - [select for diffs], Tue Feb 22 17:30:07 2022 UTC (2 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.49: +4 -3 lines
Diff to previous 1.49 (colored)

Instead of using MAXCOMLEN from sys/param.h, use KI_MAXCOMLEN as width,
from sysctl.h.  This isn't a perfect transition, still thinking about
other ways to do it.
ok millert

Revision 1.49 / (download) - annotate - [select for diffs], Wed Jan 5 04:10:36 2022 UTC (2 years, 4 months ago) by guenther
Branch: MAIN
Changes since 1.48: +1 -2 lines
Diff to previous 1.48 (colored)

Delete 'emul' keyword: it's been just returned 'native' for a long time

ok jsg@ deraadt@

Revision 1.48 / (download) - annotate - [select for diffs], Sat Aug 28 20:54:54 2021 UTC (2 years, 9 months ago) by chrisz
Branch: MAIN
CVS Tags: OPENBSD_7_0_BASE, OPENBSD_7_0
Changes since 1.47: +3 -1 lines
Diff to previous 1.47 (colored)

/bin/ps: Implement reporting of supplemental groups

with help from sthen@ and tim@. OK tim@

Revision 1.47 / (download) - annotate - [select for diffs], Sun Jun 23 17:18:50 2019 UTC (4 years, 11 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_6_9_BASE, OPENBSD_6_9, OPENBSD_6_8_BASE, OPENBSD_6_8, OPENBSD_6_7_BASE, OPENBSD_6_7, OPENBSD_6_6_BASE, OPENBSD_6_6
Changes since 1.46: +2 -1 lines
Diff to previous 1.46 (colored)

add "ps -o pledge" option, which prints a comma-seperated list of pledges
active on each process.  So go forth and "ps agux -o pledge" to find pledges
which can be improved.

(I hesitated adding this before because I am afraid of people
enforcing extra-strict pledge in programs without testing all the use
cases -- thereby breaking software).

Revision 1.46 / (download) - annotate - [select for diffs], Sun Jun 23 16:57:02 2019 UTC (4 years, 11 months ago) by deraadt
Branch: MAIN
Changes since 1.45: +2 -2 lines
Diff to previous 1.45 (colored)

Export unveil state so that ps(8) can show it.  Two new status flags,
you'll see one, or neither.
'u' - process installed unveils, but not yet locked with unveil(0,0)
      or pledge w/o "unveil"
'U' - process has installed unveils, and locked.
ok rob

Revision 1.45 / (download) - annotate - [select for diffs], Tue Jan 24 22:40:09 2017 UTC (7 years, 4 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4, OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2, OPENBSD_6_1_BASE, OPENBSD_6_1
Changes since 1.44: +1 -2 lines
Diff to previous 1.44 (colored)

do not need sys/proc.h

Revision 1.44 / (download) - annotate - [select for diffs], Thu Sep 8 15:11:29 2016 UTC (7 years, 8 months ago) by tedu
Branch: MAIN
Changes since 1.43: +2 -2 lines
Diff to previous 1.43 (colored)

etime isn't just an alias for start. the output format is different.
diff from Carlin Bingham. ok millert.

Revision 1.43 / (download) - annotate - [select for diffs], Wed Dec 30 14:59:10 2015 UTC (8 years, 5 months ago) by tedu
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE, OPENBSD_6_0, OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.42: +2 -2 lines
Diff to previous 1.42 (colored)

rename a few variables/functions to avoid shadowing

Revision 1.42 / (download) - annotate - [select for diffs], Fri Jan 16 06:39:32 2015 UTC (9 years, 4 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8, OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.41: +3 -3 lines
Diff to previous 1.41 (colored)

Replace <sys/param.h> with <limits.h> and other less dirty headers where
possible.  Annotate <sys/param.h> lines with their current reasons.  Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc.  Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution.  These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)

Revision 1.41 / (download) - annotate - [select for diffs], Mon Oct 13 17:30:21 2014 UTC (9 years, 7 months ago) by schwarze
Branch: MAIN
Changes since 1.40: +1 -2 lines
Diff to previous 1.40 (colored)

Remove duplicate and misleading vcmp() prototype;
patch from Martin <Natano at natano dot net>;
ok deraadt

Revision 1.40 / (download) - annotate - [select for diffs], Thu Mar 20 03:38:33 2014 UTC (10 years, 2 months ago) by lteo
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6
Changes since 1.39: +2 -2 lines
Diff to previous 1.39 (colored)

Move the "minflt" entry to the correct spot in the var array so that all
keywords are sorted in ascending order again.  This fixes a bug where
ps(1) thought that "minflt" was an invalid keyword.

This bug was introduced when the "maxrss" keyword was accidentally added
to the array after "minflt" instead of before, so the bsearch(3)-based
keyword lookup could never find "minflt".

ok deraadt@ guenther@ millert@ tedu@

Revision 1.39 / (download) - annotate - [select for diffs], Thu Oct 24 06:21:47 2013 UTC (10 years, 7 months ago) by guenther
Branch: MAIN
CVS Tags: OPENBSD_5_5_BASE, OPENBSD_5_5
Changes since 1.38: +8 -9 lines
Diff to previous 1.38 (colored)

Fix field header overriding on fields that are (internally) aliases for others.
Follow POSIX spec for the default headers for the comm, etime, and tty fields.

Problem noted by lotheac (at) iki.fi
ok deraadt@

Revision 1.38 / (download) - annotate - [select for diffs], Sun Sep 22 17:28:34 2013 UTC (10 years, 8 months ago) by guenther
Branch: MAIN
Changes since 1.37: +3 -1 lines
Diff to previous 1.37 (colored)

Stop merging the per-thread and per-process flags when reporting
them via sysctl(KERN_PROC).  In struct kinfo_proc the per-process
flags move to p_psflags, leaving the per-thread flags in p_flags.
Flag descriptions in ps(1) updated to be less obtuse.

discussed with matthew@ some time ago; ok jca@, manpage bits ok jmc@

Revision 1.37 / (download) - annotate - [select for diffs], Wed Apr 11 17:33:26 2012 UTC (12 years, 1 month ago) by guenther
Branch: MAIN
CVS Tags: OPENBSD_5_4_BASE, OPENBSD_5_4, OPENBSD_5_3_BASE, OPENBSD_5_3, OPENBSD_5_2_BASE, OPENBSD_5_2
Changes since 1.36: +2 -1 lines
Diff to previous 1.36 (colored)

Add maxrss keyword for the ru_maxrss value...which ariane@ is making work

Revision 1.36 / (download) - annotate - [select for diffs], Wed Apr 4 16:13:11 2012 UTC (12 years, 2 months ago) by jsing
Branch: MAIN
Changes since 1.35: +6 -0 lines
Diff to previous 1.35 (colored)

Add "tid" as a formatting keyword. If the -H option is specified, include
the thread ID in the default format.

ok deraadt@ sthen@

Revision 1.35 / (download) - annotate - [select for diffs], Sat Jan 7 05:38:12 2012 UTC (12 years, 4 months ago) by guenther
Branch: MAIN
CVS Tags: OPENBSD_5_1_BASE, OPENBSD_5_1
Changes since 1.34: +2 -1 lines
Diff to previous 1.34 (colored)

Add rtable id and thread id to struct kinfo_proc (and fix process id)
and add an 'rtableid' keyword to ps.

Add rtable id, thread id, and socket splice info to struct kinfo_file2
and make fstat display socket splice information.

Remove old KVM_PROC2 and kinfo_proc2 interfaces; bump libkvm major

Socket splice info and corrections from bluhm@  "Lovely" deraadt@

Revision 1.34 / (download) - annotate - [select for diffs], Thu Dec 29 17:13:55 2011 UTC (12 years, 5 months ago) by guenther
Branch: MAIN
Changes since 1.33: +4 -1 lines
Diff to previous 1.33 (colored)

Suppress the header line if all the field headers have been set to empty.

ok millert@

Revision 1.33 / (download) - annotate - [select for diffs], Sun Dec 11 00:16:49 2011 UTC (12 years, 5 months ago) by nicm
Branch: MAIN
Changes since 1.32: +3 -1 lines
Diff to previous 1.32 (colored)

Make ps understand -o cwd using the new KERN_PROC_CWD sysctl. Some help
and suggestions from guenther.

ok guenther

Revision 1.32 / (download) - annotate - [select for diffs], Sun Apr 10 03:20:58 2011 UTC (13 years, 1 month ago) by guenther
Branch: MAIN
CVS Tags: OPENBSD_5_0_BASE, OPENBSD_5_0
Changes since 1.31: +3 -3 lines
Diff to previous 1.31 (colored)

Switch back from KERN_PROC2/kinfo_proc2 to KERN_PROC/kinfo_proc now
that we've got name we want for the API we want

"ZAP!" deraadt@

Revision 1.31 / (download) - annotate - [select for diffs], Sat Mar 12 04:54:28 2011 UTC (13 years, 2 months ago) by guenther
Branch: MAIN
Changes since 1.30: +3 -3 lines
Diff to previous 1.30 (colored)

Replace the old, broken KERN_PROC ABI and its matching functions
in libkvm with the stable-ABI versions that are currently named
KERN_PROC2, kvm_get{proc,argv,envv}2().  The latter names and symbols
will continue to be supported for a few releases.

Committing now that they ports people have had a couple releases
to update pkgs that usd the old functions

Revision 1.30 / (download) - annotate - [select for diffs], Sun Feb 14 00:17:14 2010 UTC (14 years, 3 months ago) by guenther
Branch: MAIN
CVS Tags: OPENBSD_4_9_BASE, OPENBSD_4_9, OPENBSD_4_8_BASE, OPENBSD_4_8, OPENBSD_4_7_BASE, OPENBSD_4_7
Changes since 1.29: +5 -5 lines
Diff to previous 1.29 (colored)

Avoid overflow and wraparound in memory fields by using unsigned
long long arithmetic and formats.
Use PTRWIDTH for the column size for various address fields.

ok otto@ tedu@

Revision 1.29 / (download) - annotate - [select for diffs], Tue Oct 27 23:59:22 2009 UTC (14 years, 7 months ago) by deraadt
Branch: MAIN
Changes since 1.28: +1 -9 lines
Diff to previous 1.28 (colored)

rcsid[] and sccsid[] and copyright[] are essentially unmaintained (and
unmaintainable).  these days, people use source.  these id's do not provide
any benefit, and do hurt the small install media
(the 33,000 line diff is essentially mechanical)
ok with the idea millert, ok dms

Revision 1.28 / (download) - annotate - [select for diffs], Sat Mar 8 19:20:12 2008 UTC (16 years, 2 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE, OPENBSD_4_6, OPENBSD_4_5_BASE, OPENBSD_4_5, OPENBSD_4_4_BASE, OPENBSD_4_4
Changes since 1.27: +5 -5 lines
Diff to previous 1.27 (colored)

Instead of calling donlist() in the format print routines, call it
a single time before we print anything, if needed.  Uses a flag to
specify which formats need the kernel info donlist() provides.
OK deraadt@

Revision 1.27 / (download) - annotate - [select for diffs], Fri Apr 13 19:20:23 2007 UTC (17 years, 1 month ago) by miod
Branch: MAIN
CVS Tags: OPENBSD_4_3_BASE, OPENBSD_4_3, OPENBSD_4_2_BASE, OPENBSD_4_2
Changes since 1.26: +4 -4 lines
Diff to previous 1.26 (colored)

Userland gets 7 chars of wchan, not 6; noticed by thib@
ok mickey@ otto@

Revision 1.26 / (download) - annotate - [select for diffs], Wed Nov 29 12:34:19 2006 UTC (17 years, 6 months ago) by miod
Branch: MAIN
CVS Tags: OPENBSD_4_1_BASE, OPENBSD_4_1
Changes since 1.25: +2 -3 lines
Diff to previous 1.25 (colored)

Do not test for processes being swapped out since this can't happen anymore.

Revision 1.25 / (download) - annotate - [select for diffs], Mon Oct 16 15:00:10 2006 UTC (17 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.24: +5 -5 lines
Diff to previous 1.24 (colored)

The session field is a pointer and so should be 8 chars for
32-bit CPUs and 16 chars for 64-bit ones.  Also, left-justify
the state field name to match the justification of the state data.
OK jmc@

Revision 1.24 / (download) - annotate - [select for diffs], Tue May 2 05:25:19 2006 UTC (18 years, 1 month ago) by hugh
Branch: MAIN
CVS Tags: OPENBSD_4_0_BASE, OPENBSD_4_0
Changes since 1.23: +3 -3 lines
Diff to previous 1.23 (colored)

Format nicelevel relative NZERO as other tools do.
Surely, says millert.

Revision 1.23 / (download) - annotate - [select for diffs], Tue Sep 14 23:45:14 2004 UTC (19 years, 8 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_9_BASE, OPENBSD_3_9, OPENBSD_3_8_BASE, OPENBSD_3_8, OPENBSD_3_7_BASE, OPENBSD_3_7
Changes since 1.22: +3 -3 lines
Diff to previous 1.22 (colored)

rename internal uname() to euname() to avoid libc conflict

Revision 1.22 / (download) - annotate - [select for diffs], Fri Jun 11 01:32:13 2004 UTC (19 years, 11 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_6_BASE, OPENBSD_3_6
Changes since 1.21: +3 -2 lines
Diff to previous 1.21 (colored)

export cpuid via kproc2, and make ps & top aware... from niklas

Revision 1.21 / (download) - annotate - [select for diffs], Thu Jan 8 18:18:35 2004 UTC (20 years, 4 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_3_5_BASE, OPENBSD_3_5
Changes since 1.20: +45 -47 lines
Diff to previous 1.20 (colored)

Convert to kinfo_proc2.  The sort order for -u and -m will be different
due to a bug fix in the sort routine.

Revision 1.20 / (download) - annotate - [select for diffs], Tue Dec 16 00:37:21 2003 UTC (20 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.19: +3 -3 lines
Diff to previous 1.19 (colored)

typo; mjc@bitz.ca

Revision 1.19 / (download) - annotate - [select for diffs], Wed Jun 25 21:12:45 2003 UTC (20 years, 11 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_4_BASE, OPENBSD_3_4
Changes since 1.18: +3 -3 lines
Diff to previous 1.18 (colored)

protos

Revision 1.18 / (download) - annotate - [select for diffs], Wed Jun 11 23:42:12 2003 UTC (20 years, 11 months ago) by deraadt
Branch: MAIN
Changes since 1.17: +6 -9 lines
Diff to previous 1.17 (colored)

ansification, art ok

Revision 1.17 / (download) - annotate - [select for diffs], Mon Jun 2 23:32:09 2003 UTC (21 years ago) by millert
Branch: MAIN
Changes since 1.16: +3 -7 lines
Diff to previous 1.16 (colored)

Remove the advertising clause in the UCB license which Berkeley
rescinded 22 July 1999.  Proofed by myself and Theo.

Revision 1.16 / (download) - annotate - [select for diffs], Thu Dec 19 21:29:46 2002 UTC (21 years, 5 months ago) by mickey
Branch: MAIN
CVS Tags: OPENBSD_3_3_BASE, OPENBSD_3_3
Changes since 1.15: +4 -2 lines
Diff to previous 1.15 (colored)

add dsiz and ssiz to accompany tsiz; millert@ ok

Revision 1.15 / (download) - annotate - [select for diffs], Fri Jul 19 14:20:44 2002 UTC (21 years, 10 months ago) by drahn
Branch: MAIN
CVS Tags: OPENBSD_3_2_BASE, OPENBSD_3_2
Changes since 1.14: +3 -3 lines
Diff to previous 1.14 (colored)

Fix format bug with ps -o group. ok deraadt@

Revision 1.14 / (download) - annotate - [select for diffs], Sat Feb 16 21:27:07 2002 UTC (22 years, 3 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_3_1_BASE, OPENBSD_3_1
Changes since 1.13: +4 -4 lines
Diff to previous 1.13 (colored)

Part one of userland __P removal.  Done with a simple regexp with some minor hand editing to make comments line up correctly.  Another pass is forthcoming that handles the cases that could not be done automatically.

Revision 1.13 / (download) - annotate - [select for diffs], Wed Nov 25 22:33:38 1998 UTC (25 years, 6 months ago) by aaron
Branch: MAIN
CVS Tags: OPENBSD_3_0_BASE, OPENBSD_3_0, OPENBSD_2_9_BASE, OPENBSD_2_9, OPENBSD_2_8_BASE, OPENBSD_2_8, OPENBSD_2_7_BASE, OPENBSD_2_7, OPENBSD_2_6_BASE, OPENBSD_2_6, OPENBSD_2_5_BASE, OPENBSD_2_5
Changes since 1.12: +4 -2 lines
Diff to previous 1.12 (colored)

null pointers are not your friend

Revision 1.12 / (download) - annotate - [select for diffs], Thu Nov 6 15:59:54 1997 UTC (26 years, 7 months ago) by kstailey
Branch: MAIN
CVS Tags: OPENBSD_2_4_BASE, OPENBSD_2_4, OPENBSD_2_3_BASE, OPENBSD_2_3
Changes since 1.11: +3 -3 lines
Diff to previous 1.11 (colored)

fix ps(1) LIM column

Revision 1.11 / (download) - annotate - [select for diffs], Wed Sep 3 13:51:40 1997 UTC (26 years, 9 months ago) by kstailey
Branch: MAIN
CVS Tags: OPENBSD_2_2_BASE, OPENBSD_2_2
Changes since 1.10: +3 -2 lines
Diff to previous 1.10 (colored)

add ps "emul" option

Revision 1.10 / (download) - annotate - [select for diffs], Fri Aug 22 20:08:14 1997 UTC (26 years, 9 months ago) by kstailey
Branch: MAIN
Changes since 1.9: +7 -2 lines
Diff to previous 1.9 (colored)

XPG4 compatibility for format options:
two new options: group and rgroup.
three new aliases: etime for start, comm for ucomm, and args for command.

Revision 1.9 / (download) - annotate - [select for diffs], Fri Aug 8 19:30:09 1997 UTC (26 years, 10 months ago) by millert
Branch: MAIN
Changes since 1.8: +38 -37 lines
Diff to previous 1.8 (colored)

Add a "parsed" flag for ps fields so we don't print the same field
multiple times.  Fixes PR #298 from Carsten Hammer <chammer@vogon.party.de>

Revision 1.8 / (download) - annotate - [select for diffs], Mon Aug 4 05:37:03 1997 UTC (26 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.7: +2 -97 lines
Diff to previous 1.7 (colored)

toast non-NEWVM code; freebsd

Revision 1.7 / (download) - annotate - [select for diffs], Wed Jul 23 19:18:18 1997 UTC (26 years, 10 months ago) by kstailey
Branch: MAIN
Changes since 1.6: +4 -4 lines
Diff to previous 1.6 (colored)

tabify

Revision 1.6 / (download) - annotate - [select for diffs], Wed Jun 18 18:54:05 1997 UTC (26 years, 11 months ago) by kstailey
Branch: MAIN
Changes since 1.5: +4 -4 lines
Diff to previous 1.5 (colored)

(foo *)NULL -> NULL

Revision 1.5 / (download) - annotate - [select for diffs], Wed Feb 12 15:28:24 1997 UTC (27 years, 3 months ago) by kstailey
Branch: MAIN
CVS Tags: OPENBSD_2_1_BASE, OPENBSD_2_1
Changes since 1.4: +3 -3 lines
Diff to previous 1.4 (colored)

Stat field takes 5 chars not 4 (think "IW<s+")

Revision 1.4 / (download) - annotate - [select for diffs], Wed Feb 5 17:10:55 1997 UTC (27 years, 4 months ago) by kstailey
Branch: MAIN
Changes since 1.3: +4 -2 lines
Diff to previous 1.3 (colored)

Added "gid" keyword to print effective group ID of process.
(also alpha-sorted some of the man page that was nearly sorted.)

BEFORE:

kstailey@hermes$ ps -o ruid,svuid,uid,command
 RUID SVUID   UID COMMAND
  333   333   333 -bash (bash)

worked, but group equivalent failed:

kstailey@hermes$ ps -o rgid,svgid,gid,command
ps: gid: keyword not found
 RGID SVGID COMMAND
   20    20 -bash (bash)

AFTER:

kstailey@hermes$ ps -o rgid,svgid,gid,command
 RGID SVGID   GID COMMAND
   20    20    20 -bash (bash)

Revision 1.3 / (download) - annotate - [select for diffs], Sun Jun 23 14:20:49 1996 UTC (27 years, 11 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_2_0_BASE, OPENBSD_2_0
Changes since 1.2: +2 -1 lines
Diff to previous 1.2 (colored)

update rcsid

Revision 1.2 / (download) - annotate - [select for diffs], Mon Jun 10 04:35:55 1996 UTC (27 years, 11 months ago) by deraadt
Branch: MAIN
Changes since 1.1: +3 -2 lines
Diff to previous 1.1 (colored)

in findvar() return NULL for keywords not found

Revision 1.1.1.1 / (download) - annotate - [select for diffs] (vendor branch), Wed Oct 18 08:37:19 1995 UTC (28 years, 7 months ago) by deraadt
CVS Tags: netbsd_1_1
Changes since 1.1: +0 -0 lines
Diff to previous 1.1 (colored)

initial import of NetBSD tree

Revision 1.1 / (download) - annotate - [select for diffs], Wed Oct 18 08:37:19 1995 UTC (28 years, 7 months ago) by deraadt
Branch: MAIN

Initial revision

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.