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

Dynamically adjust size of displayed username to the longest username which

Browse Source 
appears, not the longest _maximum_ username (this should probably also go
into 2.2, for the day when we bump up the username length there too).

Submitted-By: Terry Lambert <terry@lambert.org>
This commit is contained in:
Jordan K. Hubbard 1997-04-29 05:26:05 +00:00
parent 298c8e3d6b
commit 6a2d726b82
5 changed files with 254 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/ps/extern.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)extern.h 8.3 (Berkeley) 4/2/94 * @(#)extern.h 8.3 (Berkeley) 4/2/94
* $Id$ * $Id: extern.h,v 1.5 1997/02/22 14:04:59 peter Exp $
*/ */
struct kinfo; struct kinfo;
@ -68,6 +68,7 @@ void printheader __P((void));
void pvar __P((KINFO *, VARENT *)); void pvar __P((KINFO *, VARENT *));
void rssize __P((KINFO *, VARENT *)); void rssize __P((KINFO *, VARENT *));
void runame __P((KINFO *, VARENT *)); void runame __P((KINFO *, VARENT *));
int s_runame __P((KINFO *));
void rvar __P((KINFO *, VARENT *)); void rvar __P((KINFO *, VARENT *));
void showkey __P((void)); void showkey __P((void));
void started __P((KINFO *, VARENT *)); void started __P((KINFO *, VARENT *));
@ -80,6 +81,7 @@ void trss __P((KINFO *, VARENT *));
void tsize __P((KINFO *, VARENT *)); void tsize __P((KINFO *, VARENT *));
void ucomm __P((KINFO *, VARENT *)); void ucomm __P((KINFO *, VARENT *));
void uname __P((KINFO *, VARENT *)); void uname __P((KINFO *, VARENT *));
int s_uname __P((KINFO *));
void uvar __P((KINFO *, VARENT *)); void uvar __P((KINFO *, VARENT *));
void vsize __P((KINFO *, VARENT *)); void vsize __P((KINFO *, VARENT *));
void wchan __P((KINFO *, VARENT *)); void wchan __P((KINFO *, VARENT *));

314
bin/ps/keyword.c
View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: keyword.c,v 1.13 1997/03/03 08:20:28 ache Exp $ * $Id: keyword.c,v 1.14 1997/03/04 00:33:56 ache Exp $
*/ */
#ifndef lint #ifndef lint
@ -67,11 +67,11 @@ static int vcmp __P((const void *, const void *));
#ifdef NOTINUSE #ifdef NOTINUSE
int utime(), stime(), ixrss(), idrss(), isrss(); int utime(), stime(), ixrss(), idrss(), isrss();
{{"utime"}, "UTIME", USER, utime, 4}, {{"utime"}, "UTIME", USER, utime, NULL, 4},
{{"stime"}, "STIME", USER, stime, 4}, {{"stime"}, "STIME", USER, stime, NULL, 4},
{{"ixrss"}, "IXRSS", USER, ixrss, 4}, {{"ixrss"}, "IXRSS", USER, ixrss, NULL, 4},
{{"idrss"}, "IDRSS", USER, idrss, 4}, {{"idrss"}, "IDRSS", USER, idrss, NULL, 4},
{{"isrss"}, "ISRSS", USER, isrss, 4}, {{"isrss"}, "ISRSS", USER, isrss, NULL, 4},
#endif #endif
/* Compute offset in common structures. */ /* Compute offset in common structures. */
@ -88,180 +88,220 @@ int utime(), stime(), ixrss(), idrss(), isrss();
VAR var[] = { VAR var[] = {
#ifdef NEWVM #ifdef NEWVM
{"%cpu", "%CPU", NULL, 0, pcpu, 4}, {"%cpu", "%CPU", NULL, 0, pcpu, NULL, 4},
{"%mem", "%MEM", NULL, 0, pmem, 4}, {"%mem", "%MEM", NULL, 0, pmem, NULL, 4},
{"acflag", "ACFLG", NULL, 0, pvar, 3, POFF(p_acflag), USHORT, "x"}, {"acflag", "ACFLG",
NULL, 0, pvar, NULL, 3, POFF(p_acflag), USHORT, "x"},
{"acflg", "", "acflag"}, {"acflg", "", "acflag"},
{"blocked", "", "sigmask"}, {"blocked", "", "sigmask"},
{"caught", "", "sigcatch"}, {"caught", "", "sigcatch"},
{"command", "COMMAND", NULL, COMM|LJUST|USER, command, 16}, {"command", "COMMAND", NULL, COMM|LJUST|USER, command, NULL, 16},
{"cpu", "CPU", NULL, 0, pvar, 3, POFF(p_estcpu), ULONG, "d"}, {"cpu", "CPU", NULL, 0, pvar, NULL, 3, POFF(p_estcpu), ULONG, "d"},
{"cputime", "", "time"}, {"cputime", "", "time"},
{"f", "F", NULL, 0, pvar, 7, POFF(p_flag), LONG, "x"}, {"f", "F", NULL, 0, pvar, NULL, 7, POFF(p_flag), LONG, "x"},
{"flags", "", "f"}, {"flags", "", "f"},
{"ignored", "", "sigignore"}, {"ignored", "", "sigignore"},
{"inblk", "INBLK", NULL, USER, rvar, 4, ROFF(ru_inblock), LONG, "d"}, {"inblk", "INBLK",
NULL, USER, rvar, NULL, 4, ROFF(ru_inblock), LONG, "d"},
{"inblock", "", "inblk"}, {"inblock", "", "inblk"},
{"jobc", "JOBC", NULL, 0, evar, 4, EOFF(e_jobc), SHORT, "d"}, {"jobc", "JOBC", NULL, 0, evar, NULL, 4, EOFF(e_jobc), SHORT, "d"},
{"ktrace", "KTRACE", NULL, 0, pvar, 8, POFF(p_traceflag), LONG, "x"}, {"ktrace", "KTRACE",
{"ktracep", "KTRACEP", NULL, 0, pvar, 8, POFF(p_tracep), LONG, "x"}, NULL, 0, pvar, NULL, 8, POFF(p_traceflag), LONG, "x"},
{"lim", "LIM", NULL, 0, maxrss, 5}, {"ktracep", "KTRACEP",
{"login", "LOGIN", NULL, LJUST, logname, MAXLOGNAME-1}, NULL, 0, pvar, NULL, 8, POFF(p_tracep), LONG, "x"},
{"lim", "LIM", NULL, 0, maxrss, NULL, 5},
{"login", "LOGIN", NULL, LJUST, logname, NULL, MAXLOGNAME-1},
{"logname", "", "login"}, {"logname", "", "login"},
{"lstart", "STARTED", NULL, LJUST|USER, lstarted, 28}, {"lstart", "STARTED", NULL, LJUST|USER, lstarted, NULL, 28},
{"majflt", "MAJFLT", NULL, USER, rvar, 4, ROFF(ru_majflt), LONG, "d"}, {"majflt", "MAJFLT",
{"minflt", "MINFLT", NULL, USER, rvar, 4, ROFF(ru_minflt), LONG, "d"}, NULL, USER, rvar, NULL, 4, ROFF(ru_majflt), LONG, "d"},
{"msgrcv", "MSGRCV", NULL, USER, rvar, 4, ROFF(ru_msgrcv), LONG, "d"}, {"minflt", "MINFLT",
{"msgsnd", "MSGSND", NULL, USER, rvar, 4, ROFF(ru_msgsnd), LONG, "d"}, NULL, USER, rvar, NULL, 4, ROFF(ru_minflt), LONG, "d"},
{"msgrcv", "MSGRCV",
NULL, USER, rvar, NULL, 4, ROFF(ru_msgrcv), LONG, "d"},
{"msgsnd", "MSGSND",
NULL, USER, rvar, NULL, 4, ROFF(ru_msgsnd), LONG, "d"},
{"ni", "", "nice"}, {"ni", "", "nice"},
{"nice", "NI", NULL, 0, pvar, 2, POFF(p_nice), CHAR, "d"}, {"nice", "NI", NULL, 0, pvar, NULL, 2, POFF(p_nice), CHAR, "d"},
{"nivcsw", "NIVCSW", NULL, USER, rvar, 5, ROFF(ru_nivcsw), LONG, "d"}, {"nivcsw", "NIVCSW",
NULL, USER, rvar, NULL, 5, ROFF(ru_nivcsw), LONG, "d"},
{"nsignals", "", "nsigs"}, {"nsignals", "", "nsigs"},
{"nsigs", "NSIGS", NULL, USER, rvar, 4, ROFF(ru_nsignals), LONG, "d"}, {"nsigs", "NSIGS",
{"nswap", "NSWAP", NULL, USER, rvar, 4, ROFF(ru_nswap), LONG, "d"}, NULL, USER, rvar, NULL, 4, ROFF(ru_nsignals), LONG, "d"},
{"nvcsw", "NVCSW", NULL, USER, rvar, 5, ROFF(ru_nvcsw), LONG, "d"}, {"nswap", "NSWAP",
{"nwchan", "WCHAN", NULL, 0, pvar, 6, POFF(p_wchan), KPTR, "x"}, NULL, USER, rvar, NULL, 4, ROFF(ru_nswap), LONG, "d"},
{"oublk", "OUBLK", NULL, USER, rvar, 4, ROFF(ru_oublock), LONG, "d"}, {"nvcsw", "NVCSW",
NULL, USER, rvar, NULL, 5, ROFF(ru_nvcsw), LONG, "d"},
{"nwchan", "WCHAN", NULL, 0, pvar, NULL, 6, POFF(p_wchan), KPTR, "x"},
{"oublk", "OUBLK",
NULL, USER, rvar, NULL, 4, ROFF(ru_oublock), LONG, "d"},
{"oublock", "", "oublk"}, {"oublock", "", "oublk"},
{"p_ru", "P_RU", NULL, 0, pvar, 6, POFF(p_ru), KPTR, "x"}, {"p_ru", "P_RU", NULL, 0, pvar, NULL, 6, POFF(p_ru), KPTR, "x"},
{"paddr", "PADDR", NULL, 0, evar, 6, EOFF(e_paddr), KPTR, "x"}, {"paddr", "PADDR", NULL, 0, evar, NULL, 6, EOFF(e_paddr), KPTR, "x"},
{"pagein", "PAGEIN", NULL, USER, pagein, 6}, {"pagein", "PAGEIN", NULL, USER, pagein, NULL, 6},
{"pcpu", "", "%cpu"}, {"pcpu", "", "%cpu"},
{"pending", "", "sig"}, {"pending", "", "sig"},
{"pgid", "PGID", NULL, 0, evar, PIDLEN, EOFF(e_pgid), ULONG, PIDFMT}, {"pgid", "PGID",
{"pid", "PID", NULL, 0, pvar, PIDLEN, POFF(p_pid), LONG, PIDFMT}, NULL, 0, evar, NULL, PIDLEN, EOFF(e_pgid), ULONG, PIDFMT},
{"pid", "PID", NULL, 0, pvar, NULL, PIDLEN, POFF(p_pid), LONG, PIDFMT},
{"pmem", "", "%mem"}, {"pmem", "", "%mem"},
{"ppid", "PPID", NULL, 0, evar, PIDLEN, EOFF(e_ppid), LONG, PIDFMT}, {"ppid", "PPID",
{"pri", "PRI", NULL, 0, pri, 3}, NULL, 0, evar, NULL, PIDLEN, EOFF(e_ppid), LONG, PIDFMT},
{"re", "RE", NULL, 0, pvar, 3, POFF(p_swtime), ULONG, "d"}, {"pri", "PRI", NULL, 0, pri, NULL, 3},
{"rgid", "RGID", NULL, 0, evar, UIDLEN, EOFF(e_pcred.p_rgid), {"re", "RE", NULL, 0, pvar, NULL, 3, POFF(p_swtime), ULONG, "d"},
{"rgid", "RGID", NULL, 0, evar, NULL, UIDLEN, EOFF(e_pcred.p_rgid),
ULONG, UIDFMT}, ULONG, UIDFMT},
{"rlink", "RLINK", NULL, 0, pvar, 8, POFF(p_procq.tqe_prev), KPTR, "x"}, {"rlink", "RLINK",
{"rss", "RSS", NULL, 0, p_rssize, 4}, NULL, 0, pvar, NULL, 8, POFF(p_procq.tqe_prev), KPTR, "x"},
{"rss", "RSS", NULL, 0, p_rssize, NULL, 4},
{"rssize", "", "rsz"}, {"rssize", "", "rsz"},
{"rsz", "RSZ", NULL, 0, rssize, 4}, {"rsz", "RSZ", NULL, 0, rssize, NULL, 4},
{"rtprio", "RTPRIO", NULL, 0, pvar, 7, POFF(p_rtprio), LONG, "d"}, {"rtprio", "RTPRIO", NULL, 0, pvar, NULL, 7, POFF(p_rtprio), LONG, "d"},
{"ruid", "RUID", NULL, 0, evar, UIDLEN, EOFF(e_pcred.p_ruid), {"ruid", "RUID", NULL, 0, evar, NULL, UIDLEN, EOFF(e_pcred.p_ruid),
ULONG, UIDFMT}, ULONG, UIDFMT},
{"ruser", "RUSER", NULL, LJUST, runame, USERLEN}, {"ruser", "RUSER", NULL, LJUST|DSIZ, runame, s_runame, USERLEN},
{"sess", "SESS", NULL, 0, evar, 6, EOFF(e_sess), KPTR, "x"}, {"sess", "SESS", NULL, 0, evar, NULL, 6, EOFF(e_sess), KPTR, "x"},
{"sig", "PENDING", NULL, 0, pvar, 8, POFF(p_siglist), LONG, "x"}, {"sig", "PENDING", NULL, 0, pvar, NULL, 8, POFF(p_siglist), LONG, "x"},
{"sigcatch", "CAUGHT", NULL, 0, pvar, 8, POFF(p_sigcatch), LONG, "x"}, {"sigcatch", "CAUGHT",
NULL, 0, pvar, NULL, 8, POFF(p_sigcatch), LONG, "x"},
{"sigignore", "IGNORED", {"sigignore", "IGNORED",
NULL, 0, pvar, 8, POFF(p_sigignore), LONG, "x"}, NULL, 0, pvar, NULL, 8, POFF(p_sigignore), LONG, "x"},
{"sigmask", "BLOCKED", NULL, 0, pvar, 8, POFF(p_sigmask), LONG, "x"}, {"sigmask", "BLOCKED",
{"sl", "SL", NULL, 0, pvar, 3, POFF(p_slptime), ULONG, "d"}, NULL, 0, pvar, NULL, 8, POFF(p_sigmask), LONG, "x"},
{"start", "STARTED", NULL, LJUST|USER, started, 7}, {"sl", "SL", NULL, 0, pvar, NULL, 3, POFF(p_slptime), ULONG, "d"},
{"start", "STARTED", NULL, LJUST|USER, started, NULL, 7},
{"stat", "", "state"}, {"stat", "", "state"},
{"state", "STAT", NULL, 0, state, 4}, {"state", "STAT", NULL, 0, state, NULL, 4},
{"svgid", "SVGID", {"svgid", "SVGID", NULL, 0,
NULL, 0, evar, UIDLEN, EOFF(e_pcred.p_svgid), ULONG, UIDFMT}, evar, NULL, UIDLEN, EOFF(e_pcred.p_svgid), ULONG, UIDFMT},
{"svuid", "SVUID", {"svuid", "SVUID", NULL, 0,
NULL, 0, evar, UIDLEN, EOFF(e_pcred.p_svuid), ULONG, UIDFMT}, evar, NULL, UIDLEN, EOFF(e_pcred.p_svuid), ULONG, UIDFMT},
{"tdev", "TDEV", NULL, 0, tdev, 4}, {"tdev", "TDEV", NULL, 0, tdev, NULL, 4},
{"time", "TIME", NULL, USER, cputime, 9}, {"time", "TIME", NULL, USER, cputime, NULL, 9},
{"tpgid", "TPGID", NULL, 0, evar, 4, EOFF(e_tpgid), ULONG, PIDFMT}, {"tpgid", "TPGID",
{"tsess", "TSESS", NULL, 0, evar, 6, EOFF(e_tsess), KPTR, "x"}, NULL, 0, evar, NULL, 4, EOFF(e_tpgid), ULONG, PIDFMT},
{"tsiz", "TSIZ", NULL, 0, tsize, 4}, {"tsess", "TSESS", NULL, 0, evar, NULL, 6, EOFF(e_tsess), KPTR, "x"},
{"tt", "TT ", NULL, 0, tname, 4}, {"tsiz", "TSIZ", NULL, 0, tsize, NULL, 4},
{"tty", "TTY", NULL, LJUST, longtname, 8}, {"tt", "TT ", NULL, 0, tname, NULL, 4},
{"ucomm", "UCOMM", NULL, LJUST, ucomm, MAXCOMLEN}, {"tty", "TTY", NULL, LJUST, longtname, NULL, 8},
{"uid", "UID", NULL, 0, evar, UIDLEN, EOFF(e_ucred.cr_uid), {"ucomm", "UCOMM", NULL, LJUST, ucomm, NULL, MAXCOMLEN},
{"uid", "UID", NULL, 0, evar, NULL, UIDLEN, EOFF(e_ucred.cr_uid),
ULONG, UIDFMT}, ULONG, UIDFMT},
{"upr", "UPR", NULL, 0, pvar, 3, POFF(p_usrpri), CHAR, "d"}, {"upr", "UPR", NULL, 0, pvar, NULL, 3, POFF(p_usrpri), CHAR, "d"},
{"user", "USER", NULL, LJUST, uname, USERLEN}, {"user", "USER", NULL, LJUST|DSIZ, uname, s_uname, USERLEN},
{"usrpri", "", "upr"}, {"usrpri", "", "upr"},
{"vsize", "", "vsz"}, {"vsize", "", "vsz"},
{"vsz", "VSZ", NULL, 0, vsize, 5}, {"vsz", "VSZ", NULL, 0, vsize, NULL, 5},
{"wchan", "WCHAN", NULL, LJUST, wchan, 6}, {"wchan", "WCHAN", NULL, LJUST, wchan, NULL, 6},
{"xstat", "XSTAT", NULL, 0, pvar, 4, POFF(p_xstat), USHORT, "x"}, {"xstat", "XSTAT", NULL, 0, pvar, NULL, 4, POFF(p_xstat), USHORT, "x"},
#else #else
{"%cpu", "%CPU", NULL, 0, pcpu, 4}, {"%cpu", "%CPU", NULL, 0, pcpu, NULL, 4},
{"%mem", "%MEM", NULL, 0, pmem, 4}, {"%mem", "%MEM", NULL, 0, pmem, NULL, 4},
{"acflag", "ACFLG", NULL, USER, uvar, 3, UOFF(u_acflag), SHORT, "x"}, {"acflag", "ACFLG",
NULL, USER, uvar, NULL, 3, UOFF(u_acflag), SHORT, "x"},
{"acflg", "", "acflag"}, {"acflg", "", "acflag"},
{"blocked", "", "sigmask"}, {"blocked", "", "sigmask"},
{"caught", "", "sigcatch"}, {"caught", "", "sigcatch"},
{"command", "COMMAND", NULL, COMM|LJUST|USER, command, 16}, {"command", "COMMAND", NULL, COMM|LJUST|USER, command, NULL, 16},
{"cpu", "CPU", NULL, 0, pvar, 3, POFF(p_cpu), ULONG, "d"}, {"cpu", "CPU", NULL, 0, pvar, NULL, 3, POFF(p_cpu), ULONG, "d"},
{"cputime", "", "time"}, {"cputime", "", "time"},
{"f", "F", NULL, 0, pvar, 7, POFF(p_flag), LONG, "x"}, {"f", "F", NULL, 0, pvar, NULL, 7, POFF(p_flag), LONG, "x"},
{"flags", "", "f"}, {"flags", "", "f"},
{"ignored", "", "sigignore"}, {"ignored", "", "sigignore"},
{"inblk", "INBLK", NULL, USER, rvar, 4, ROFF(ru_inblock), LONG, "d"}, {"inblk", "INBLK",
NULL, USER, rvar, NULL, 4, ROFF(ru_inblock), LONG, "d"},
{"inblock", "", "inblk"}, {"inblock", "", "inblk"},
{"jobc", "JOBC", NULL, 0, evar, 4, EOFF(e_jobc), SHORT, "d"}, {"jobc", "JOBC", NULL, 0, evar, NULL, 4, EOFF(e_jobc), SHORT, "d"},
{"ktrace", "KTRACE", NULL, 0, pvar, 8, POFF(p_traceflag), LONG, "x"}, {"ktrace", "KTRACE",
{"ktracep", "KTRACEP", NULL, 0, pvar, 8, POFF(p_tracep), LONG, "x"}, NULL, 0, pvar, NULL, 8, POFF(p_traceflag), LONG, "x"},
{"lim", "LIM", NULL, 0, maxrss, 5}, {"ktracep", "KTRACEP",
{"logname", "LOGNAME", NULL, LJUST, logname, MAXLOGNAME-1}, NULL, 0, pvar, NULL, 8, POFF(p_tracep), LONG, "x"},
{"lstart", "STARTED", NULL, LJUST|USER, lstarted, 28}, {"lim", "LIM", NULL, 0, maxrss, NULL, 5},
{"majflt", "MAJFLT", NULL, USER, rvar, 4, ROFF(ru_majflt), LONG, "d"}, {"logname", "LOGNAME", NULL, LJUST, logname, NULL, MAXLOGNAME-1},
{"minflt", "MINFLT", NULL, USER, rvar, 4, ROFF(ru_minflt), LONG, "d"}, {"lstart", "STARTED", NULL, LJUST|USER, lstarted, NULL, 28},
{"msgrcv", "MSGRCV", NULL, USER, rvar, 4, ROFF(ru_msgrcv), LONG, "d"}, {"majflt", "MAJFLT",
{"msgsnd", "MSGSND", NULL, USER, rvar, 4, ROFF(ru_msgsnd), LONG, "d"}, NULL, USER, rvar, NULL, 4, ROFF(ru_majflt), LONG, "d"},
{"minflt", "MINFLT",
NULL, USER, rvar, NULL, 4, ROFF(ru_minflt), LONG, "d"},
{"msgrcv", "MSGRCV",
NULL, USER, rvar, NULL, 4, ROFF(ru_msgrcv), LONG, "d"},
{"msgsnd", "MSGSND",
NULL, USER, rvar, NULL, 4, ROFF(ru_msgsnd), LONG, "d"},
{"ni", "", "nice"}, {"ni", "", "nice"},
{"nice", "NI", NULL, 0, pvar, 2, POFF(p_nice), CHAR, "d"}, {"nice", "NI", NULL, 0, pvar, NULL, 2, POFF(p_nice), CHAR, "d"},
{"nivcsw", "NIVCSW", NULL, USER, rvar, 5, ROFF(ru_nivcsw), LONG, "d"}, {"nivcsw", "NIVCSW",
NULL, USER, rvar, NULL, 5, ROFF(ru_nivcsw), LONG, "d"},
{"nsignals", "", "nsigs"}, {"nsignals", "", "nsigs"},
{"nsigs", "NSIGS", NULL, USER, rvar, 4, ROFF(ru_nsignals), LONG, "d"}, {"nsigs", "NSIGS",
{"nswap", "NSWAP", NULL, USER, rvar, 4, ROFF(ru_nswap), LONG, "d"}, NULL, USER, rvar, NULL, 4, ROFF(ru_nsignals), LONG, "d"},
{"nvcsw", "NVCSW", NULL, USER, rvar, 5, ROFF(ru_nvcsw), LONG, "d"}, {"nswap", "NSWAP",
{"nwchan", "WCHAN", NULL, 0, pvar, 6, POFF(p_wchan), KPTR, "x"}, NULL, USER, rvar, NULL, 4, ROFF(ru_nswap), LONG, "d"},
{"oublk", "OUBLK", NULL, USER, rvar, 4, ROFF(ru_oublock), LONG, "d"}, {"nvcsw", "NVCSW",
NULL, USER, rvar, NULL, 5, ROFF(ru_nvcsw), LONG, "d"},
{"nwchan", "WCHAN", NULL, 0, pvar, NULL, 6, POFF(p_wchan), KPTR, "x"},
{"oublk", "OUBLK",
NULL, USER, rvar, NULL, 4, ROFF(ru_oublock), LONG, "d"},
{"oublock", "", "oublk"}, {"oublock", "", "oublk"},
{"p_ru", "P_RU", NULL, 0, pvar, 6, POFF(p_ru), KPTR, "x"}, {"p_ru", "P_RU", NULL, 0, pvar, NULL, 6, POFF(p_ru), KPTR, "x"},
{"paddr", "PADDR", NULL, 0, evar, 6, EOFF(e_paddr), KPTR, "x"}, {"paddr", "PADDR", NULL, 0, evar, NULL, 6, EOFF(e_paddr), KPTR, "x"},
{"pagein", "PAGEIN", NULL, USER, pagein, 6}, {"pagein", "PAGEIN", NULL, USER, pagein, NULL, 6},
{"pcpu", "", "%cpu"}, {"pcpu", "", "%cpu"},
{"pending", "", "sig"}, {"pending", "", "sig"},
{"pgid", "PGID", NULL, 0, evar, PIDLEN, EOFF(e_pgid), ULONG, PIDFMT}, {"pgid", "PGID",
{"pid", "PID", NULL, 0, pvar, PIDLEN, POFF(p_pid), LONG, PIDFMT}, NULL, 0, evar, NULL, PIDLEN, EOFF(e_pgid), ULONG, PIDFMT},
{"pid", "PID", NULL, 0, pvar, NULL, PIDLEN, POFF(p_pid), LONG, PIDFMT},
{"pmem", "", "%mem"}, {"pmem", "", "%mem"},
{"poip", "POIP", NULL, 0, pvar, 4, POFF(p_poip), SHORT, "d"}, {"poip", "POIP", NULL, 0, pvar, NULL, 4, POFF(p_poip), SHORT, "d"},
{"ppid", "PPID", NULL, 0, pvar, PIDLEN, POFF(p_ppid), LONG, PIDFMT}, {"ppid", "PPID",
{"pri", "PRI", NULL, 0, pri, 3}, NULL, 0, pvar, NULL, PIDLEN, POFF(p_ppid), LONG, PIDFMT},
{"re", "RE", NULL, 0, pvar, 3, POFF(p_swtime), ULONG, "d"}, {"pri", "PRI", NULL, 0, pri, NULL, 3},
{"rgid", "RGID", NULL, 0, pvar, UIDLEN, POFF(p_rgid), USHORT, UIDFMT}, {"re", "RE", NULL, 0, pvar, NULL, 3, POFF(p_swtime), ULONG, "d"},
{"rlink", "RLINK", NULL, 0, pvar, 8, POFF(p_rlink), KPTR, "x"}, {"rgid", "RGID",
{"rss", "RSS", NULL, 0, p_rssize, 4}, NULL, 0, pvar, NULL, UIDLEN, POFF(p_rgid), USHORT, UIDFMT},
{"rlink", "RLINK", NULL, 0, pvar, NULL, 8, POFF(p_rlink), KPTR, "x"},
{"rss", "RSS", NULL, 0, p_rssize, NULL, 4},
{"rssize", "", "rsz"}, {"rssize", "", "rsz"},
{"rsz", "RSZ", NULL, 0, rssize, 4}, {"rsz", "RSZ", NULL, 0, rssize, NULL, 4},
{"ruid", "RUID", NULL, 0, pvar, UIDLEN, POFF(p_ruid), USHORT, UIDFMT}, {"ruid", "RUID",
{"rtprio", "RTPRIO", NULL, 0, pvar, 7, POFF(p_rtprio), LONG, "d"}, NULL, 0, pvar, NULL, UIDLEN, POFF(p_ruid), USHORT, UIDFMT},
{"ruser", "RUSER", NULL, LJUST, runame, USERLEN}, {"rtprio", "RTPRIO", NULL, 0, pvar, NULL, 7, POFF(p_rtprio), LONG, "d"},
{"sess", "SESS", NULL, 0, evar, 6, EOFF(e_sess), KPTR, "x"}, {"ruser", "RUSER", NULL, LJUST|DSIZ, runame, s_runame, USERLEN},
{"sig", "PENDING", NULL, 0, pvar, 8, POFF(p_sig), LONG, "x"}, {"sess", "SESS", NULL, 0, evar, NULL, 6, EOFF(e_sess), KPTR, "x"},
{"sigcatch", "CAUGHT", NULL, 0, pvar, 8, POFF(p_sigcatch), LONG, "x"}, {"sig", "PENDING", NULL, 0, pvar, NULL, 8, POFF(p_sig), LONG, "x"},
{"sigcatch", "CAUGHT",
NULL, 0, pvar, NULL, 8, POFF(p_sigcatch), LONG, "x"},
{"sigignore", "IGNORED", {"sigignore", "IGNORED",
NULL, 0, pvar, 8, POFF(p_sigignore), LONG, "x"}, NULL, 0, pvar, NULL, 8, POFF(p_sigignore), LONG, "x"},
{"sigmask", "BLOCKED", NULL, 0, pvar, 8, POFF(p_sigmask), LONG, "x"}, {"sigmask", "BLOCKED",
{"sl", "SL", NULL, 0, pvar, 3, POFF(p_slptime), ULONG, "d"}, NULL, 0, pvar, NULL, 8, POFF(p_sigmask), LONG, "x"},
{"start", "STARTED", NULL, LJUST|USER, started, 7}, {"sl", "SL", NULL, 0, pvar, NULL, 3, POFF(p_slptime), ULONG, "d"},
{"start", "STARTED", NULL, LJUST|USER, started, NULL, 7},
{"stat", "", "state"}, {"stat", "", "state"},
{"state", "STAT", NULL, 0, state, 4}, {"state", "STAT", NULL, 0, state, NULL, 4},
{"svgid", "SVGID", {"svgid", "SVGID",
NULL, 0, pvar, UIDLEN, POFF(p_svgid), USHORT, UIDFMT}, NULL, 0, pvar, NULL, UIDLEN, POFF(p_svgid), USHORT, UIDFMT},
{"svuid", "SVUID", {"svuid", "SVUID",
NULL, 0, pvar, UIDLEN, POFF(p_svuid), USHORT, UIDFMT}, NULL, 0, pvar, NULL, UIDLEN, POFF(p_svuid), USHORT, UIDFMT},
{"tdev", "TDEV", NULL, 0, tdev, 4}, {"tdev", "TDEV", NULL, 0, tdev, NULL, 4},
{"time", "TIME", NULL, USER, cputime, 9}, {"time", "TIME", NULL, USER, cputime, NULL, 9},
{"tpgid", "TPGID", NULL, 0, evar, 4, EOFF(e_tpgid), ULONG, PIDFMT}, {"tpgid", "TPGID",
{"trs", "TRS", NULL, 0, trss, 3}, NULL, 0, evar, NULL, 4, EOFF(e_tpgid), ULONG, PIDFMT},
{"tsess", "TSESS", NULL, 0, evar, 6, EOFF(e_tsess), KPTR, "x"}, {"trs", "TRS", NULL, 0, trss, NULL, 3},
{"tsiz", "TSIZ", NULL, 0, tsize, 4}, {"tsess", "TSESS", NULL, 0, evar, NULL, 6, EOFF(e_tsess), KPTR, "x"},
{"tt", "TT", NULL, LJUST, tname, 4}, {"tsiz", "TSIZ", NULL, 0, tsize, NULL, 4},
{"tty", "TTY", NULL, LJUST, longtname, 8}, {"tt", "TT", NULL, LJUST, tname, NULL, 4},
{"ucomm", "UCOMM", NULL, LJUST, ucomm, MAXCOMLEN}, {"tty", "TTY", NULL, LJUST, longtname, NULL, 8},
{"uid", "UID", NULL, 0, pvar, UIDLEN, POFF(p_uid),USHORT, UIDFMT}, {"ucomm", "UCOMM", NULL, LJUST, ucomm, NULL, MAXCOMLEN},
{"upr", "UPR", NULL, 0, pvar, 3, POFF(p_usrpri), CHAR, "d"}, {"uid", "UID", NULL, 0, pvar, NULL, UIDLEN, POFF(p_uid),USHORT, UIDFMT},
{"uprocp", "UPROCP", NULL, USER, uvar, 6, UOFF(u_procp), KPTR, "x"}, {"upr", "UPR", NULL, 0, pvar, NULL, 3, POFF(p_usrpri), CHAR, "d"},
{"user", "USER", NULL, LJUST, uname, USERLEN}, {"uprocp", "UPROCP",
NULL, USER, uvar, NULL, 6, UOFF(u_procp), KPTR, "x"},
{"user", "USER", NULL, LJUST|DSIZ, uname, s_uname, USERLEN},
{"usrpri", "", "upr"}, {"usrpri", "", "upr"},
{"vsize", "", "vsz"}, {"vsize", "", "vsz"},
{"vsz", "VSZ", NULL, 0, vsize, 5}, {"vsz", "VSZ", NULL, 0, vsize, NULL, 5},
{"wchan", "WCHAN", NULL, LJUST, wchan, 6}, {"wchan", "WCHAN", NULL, LJUST, wchan, NULL, 6},
{"xstat", "XSTAT", NULL, 0, pvar, 4, POFF(p_xstat), USHORT, "x"}, {"xstat", "XSTAT", NULL, 0, pvar, NULL, 4, POFF(p_xstat), USHORT, "x"},
#endif #endif
{""}, {""},
}; };

24
bin/ps/print.c
View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: print.c,v 1.19 1997/02/22 14:05:05 peter Exp $ * $Id: print.c,v 1.20 1997/04/16 16:08:11 jdp Exp $
*/ */
#ifndef lint #ifndef lint
@ -284,6 +284,17 @@ uname(k, ve)
#endif #endif
} }
int
s_uname(k)
KINFO *k;
{
#ifndef NEWVM
return (strlen(user_from_uid(KI_PROC(k)->p_uid, 0)));
#else
return (strlen(user_from_uid(KI_EPROC(k)->e_ucred.cr_uid, 0)));
#endif
}
void void
runame(k, ve) runame(k, ve)
KINFO *k; KINFO *k;
@ -301,6 +312,17 @@ runame(k, ve)
#endif #endif
} }
int
s_runame(k)
KINFO *k;
{
#ifndef NEWVM
return (strlen(user_from_uid(KI_PROC(k)->p_ruid, 0)));
#else
return (strlen(user_from_uid(KI_EPROC(k)->e_pcred.p_ruid, 0)));
#endif
}
void void
tdev(k, ve) tdev(k, ve)
KINFO *k; KINFO *k;

51
bin/ps/ps.c
View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: ps.c,v 1.17 1997/02/22 14:05:08 peter Exp $ * $Id: ps.c,v 1.18 1997/03/28 15:24:29 imp Exp $
*/ */
#ifndef lint #ifndef lint
@ -92,6 +92,8 @@ static char *kludge_oldps_options __P((char *));
static int pscomp __P((const void *, const void *)); static int pscomp __P((const void *, const void *));
static void saveuser __P((KINFO *)); static void saveuser __P((KINFO *));
static void scanvars __P((void)); static void scanvars __P((void));
static void dynsizevars __P((KINFO *));
static void sizevars __P((void));
static void usage __P((void)); static void usage __P((void));
char dfmt[] = "pid tt state time command"; char dfmt[] = "pid tt state time command";
@ -324,7 +326,11 @@ main(argc, argv)
kinfo[i].ki_p = kp; kinfo[i].ki_p = kp;
if (needuser) if (needuser)
saveuser(&kinfo[i]); saveuser(&kinfo[i]);
dynsizevars(&kinfo[i]);
} }
sizevars();
/* /*
* print header * print header
*/ */
@ -359,6 +365,45 @@ main(argc, argv)
static void static void
scanvars() scanvars()
{
struct varent *vent;
VAR *v;
for (vent = vhead; vent; vent = vent->next) {
v = vent->var;
if (v->flag & DSIZ) {
v->dwidth = v->width;
v->width = 0;
}
if (v->flag & USER)
needuser = 1;
if (v->flag & COMM)
needcomm = 1;
}
}
static void
dynsizevars(ki)
KINFO *ki;
{
struct varent *vent;
VAR *v;
int i;
for (vent = vhead; vent; vent = vent->next) {
v = vent->var;
if (!(v->flag & DSIZ))
continue;
i = (v->sproc)( ki);
if (v->width < i)
v->width = i;
if (v->width > v->dwidth)
v->width = v->dwidth;
}
}
static void
sizevars()
{ {
struct varent *vent; struct varent *vent;
VAR *v; VAR *v;
@ -370,10 +415,6 @@ scanvars()
if (v->width < i) if (v->width < i)
v->width = i; v->width = i;
totwidth += v->width + 1; /* +1 for space */ totwidth += v->width + 1; /* +1 for space */
if (v->flag & USER)
needuser = 1;
if (v->flag & COMM)
needcomm = 1;
} }
totwidth--; totwidth--;
} }

6
bin/ps/ps.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)ps.h 8.1 (Berkeley) 5/31/93 * @(#)ps.h 8.1 (Berkeley) 5/31/93
* $Id$ * $Id: ps.h,v 1.4 1997/02/22 14:05:09 peter Exp $
*/ */
#define UNLIMITED 0 /* unlimited terminal width */ #define UNLIMITED 0 /* unlimited terminal width */
@ -68,9 +68,12 @@ typedef struct var {
#define COMM 0x01 /* needs exec arguments and environment (XXX) */ #define COMM 0x01 /* needs exec arguments and environment (XXX) */
#define LJUST 0x02 /* left adjust on output (trailing blanks) */ #define LJUST 0x02 /* left adjust on output (trailing blanks) */
#define USER 0x04 /* needs user structure */ #define USER 0x04 /* needs user structure */
#define DSIZ 0x08 /* field size is dynamic*/
u_int flag; u_int flag;
/* output routine */ /* output routine */
void (*oproc) __P((struct kinfo *, struct varent *)); void (*oproc) __P((struct kinfo *, struct varent *));
/* sizing routine*/
int (*sproc) __P((struct kinfo *));
short width; /* printing width */ short width; /* printing width */
/* /*
* The following (optional) elements are hooks for passing information * The following (optional) elements are hooks for passing information
@ -81,6 +84,7 @@ typedef struct var {
enum type type; /* type of element */ enum type type; /* type of element */
char *fmt; /* printf format */ char *fmt; /* printf format */
char *time; /* time format */ char *time; /* time format */
short dwidth; /* dynamic printing width */
/* /*
* glue to link selected fields together * glue to link selected fields together
*/ */