diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index 9c5384e54759..5532550994c4 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)ps.1 6.17 (Berkeley) 6/20/91 -.\" $Id: ps.1,v 1.7 1993/08/01 07:48:14 mycroft Exp $ +.\" $Id: ps.1,v 1.8 1993/10/07 00:45:59 cgd Exp $ .\" .Dd June 20, 1991 .Dt PS 1 @@ -140,7 +140,7 @@ option implies the option. .It Fl v Display information associated with the following keywords: -pid, state, time, sl, re, pagein, vsz, rss, lim, tsiz, trss, +pid, state, time, sl, re, pagein, vsz, rss, lim, tsiz, %cpu, %mem and command. The .Fl v @@ -450,8 +450,6 @@ accumulated cpu time, user + system (alias cputime) .It tpgid control terminal process group .Tn ID -.It trss -text resident set size (in Kbytes) .It tsess control terminal session pointer .It tsiz diff --git a/bin/ps/ps.c b/bin/ps/ps.c index d5e9c3fe4f5a..ead0bbf6710a 100644 --- a/bin/ps/ps.c +++ b/bin/ps/ps.c @@ -39,7 +39,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)ps.c 5.43 (Berkeley) 7/1/91";*/ -static char rcsid[] = "$Id: ps.c,v 1.8 1993/08/01 18:59:06 mycroft Exp $"; +static char rcsid[] = "$Id: ps.c,v 1.9 1993/10/07 00:46:02 cgd Exp $"; #endif /* not lint */ #include @@ -88,7 +88,11 @@ char o1[] = "pid"; char o2[] = "tt state time command"; char ufmt[] = "user pid %cpu %mem vsz rss tt state start time command"; char vfmt[] = +#ifdef NEWVM + "pid state time sl re pagein vsz rss lim tsiz %cpu %mem command"; +#else "pid state time sl re pagein vsz rss lim tsiz trs %cpu %mem command"; +#endif main(argc, argv) int argc;