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

Convert to use libxo. Document use of libxo as well.

Browse Source 
Obtained from:  Phil Shafer <phil@juniper.net>
Sponsored by:   Juniper Networks, Inc.
This commit is contained in:
Marcel Moolenaar 2015-05-22 23:07:55 +00:00
parent 57cb4b9323
commit 8beb1a2fdc
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=283304
6 changed files with 253 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/ps/Makefile
View File

@ -11,6 +11,6 @@ SRCS= fmt.c keyword.c nlist.c print.c ps.c
# on large systems. # on large systems.
# #
CFLAGS+=-DLAZY_PS CFLAGS+=-DLAZY_PS
LIBADD= m kvm jail LIBADD= m kvm jail xo
.include <bsd.prog.mk> .include <bsd.prog.mk>

282
bin/ps/keyword.c
View File

@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <libxo/xo.h>
#include "ps.h" #include "ps.h"
@ -64,116 +65,170 @@ static int vcmp(const void *, const void *);
/* PLEASE KEEP THE TABLE BELOW SORTED ALPHABETICALLY!!! */ /* PLEASE KEEP THE TABLE BELOW SORTED ALPHABETICALLY!!! */
static VAR var[] = { static VAR var[] = {
{"%cpu", "%CPU", NULL, 0, pcpu, 0, CHAR, NULL, 0}, {"%cpu", "%CPU", NULL, "percent-cpu", 0, pcpu, 0, CHAR, NULL, 0},
{"%mem", "%MEM", NULL, 0, pmem, 0, CHAR, NULL, 0}, {"%mem", "%MEM", NULL, "percent-memory", 0, pmem, 0, CHAR, NULL, 0},
{"acflag", "ACFLG", NULL, 0, kvar, KOFF(ki_acflag), USHORT, "x", 0}, {"acflag", "ACFLG", NULL, "accounting-flag", 0, kvar, KOFF(ki_acflag),
{"acflg", "", "acflag", 0, NULL, 0, CHAR, NULL, 0}, USHORT, "x", 0},
{"args", "COMMAND", NULL, COMM|LJUST|USER, arguments, 0, {"acflg", "", "acflag", NULL, 0, NULL, 0, CHAR, NULL, 0},
CHAR, NULL, 0}, {"args", "COMMAND", NULL, "arguments", COMM|LJUST|USER, arguments, 0,
{"blocked", "", "sigmask", 0, NULL, 0, CHAR, NULL, 0}, CHAR, NULL, 0},
{"caught", "", "sigcatch", 0, NULL, 0, CHAR, NULL, 0}, {"blocked", "", "sigmask", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"class", "CLASS", NULL, LJUST, loginclass, 0, CHAR, NULL, 0}, {"caught", "", "sigcatch", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"comm", "COMMAND", NULL, LJUST, ucomm, 0, CHAR, NULL, 0}, {"class", "CLASS", NULL, "login-class", LJUST, loginclass, 0, CHAR,
{"command", "COMMAND", NULL, COMM|LJUST|USER, command, 0, NULL, 0},
CHAR, NULL, 0}, {"comm", "COMMAND", NULL, "command", LJUST, ucomm, 0, CHAR, NULL, 0},
{"cow", "COW", NULL, 0, kvar, KOFF(ki_cow), UINT, "u", 0}, {"command", "COMMAND", NULL, "command", COMM|LJUST|USER, command, 0,
{"cpu", "CPU", NULL, 0, kvar, KOFF(ki_estcpu), UINT, "d", 0}, CHAR, NULL, 0},
{"cputime", "", "time", 0, NULL, 0, CHAR, NULL, 0}, {"cow", "COW", NULL, "copy-on-write-faults", 0, kvar, KOFF(ki_cow),
{"dsiz", "DSIZ", NULL, 0, kvar, KOFF(ki_dsize), PGTOK, "ld", 0}, UINT, "u", 0},
{"egid", "", "gid", 0, NULL, 0, CHAR, NULL, 0}, {"cpu", "CPU", NULL, "cpu-usage", 0, kvar, KOFF(ki_estcpu), UINT, "d",
{"egroup", "", "group", 0, NULL, 0, CHAR, NULL, 0}, 0},
{"emul", "EMUL", NULL, LJUST, emulname, 0, CHAR, NULL, 0}, {"cputime", "", "time", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"etime", "ELAPSED", NULL, USER, elapsed, 0, CHAR, NULL, 0}, {"dsiz", "DSIZ", NULL, "data-size", 0, kvar, KOFF(ki_dsize), PGTOK,
{"etimes", "ELAPSED", NULL, USER, elapseds, 0, CHAR, NULL, 0}, "ld", 0},
{"euid", "", "uid", 0, NULL, 0, CHAR, NULL, 0}, {"egid", "", "gid", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"f", "F", NULL, 0, kvar, KOFF(ki_flag), INT, "x", 0}, {"egroup", "", "group", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"f2", "F2", NULL, 0, kvar, KOFF(ki_flag2), INT, "08x", 0}, {"emul", "EMUL", NULL, "emulation-envirnment", LJUST, emulname, 0,
{"fib", "FIB", NULL, 0, kvar, KOFF(ki_fibnum), INT, "d", 0}, CHAR, NULL, 0},
{"flags", "", "f", 0, NULL, 0, CHAR, NULL, 0}, {"etime", "ELAPSED", NULL, "elapsed-time", USER, elapsed, 0, CHAR,
{"flags2", "", "f2", 0, NULL, 0, CHAR, NULL, 0}, NULL, 0},
{"gid", "GID", NULL, 0, kvar, KOFF(ki_groups), UINT, UIDFMT, 0}, {"etimes", "ELAPSED", NULL, "elapsed-times", USER, elapseds, 0, CHAR,
{"group", "GROUP", NULL, LJUST, egroupname, 0, CHAR, NULL, 0}, NULL, 0},
{"ignored", "", "sigignore", 0, NULL, 0, CHAR, NULL, 0}, {"euid", "", "uid", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"inblk", "INBLK", NULL, USER, rvar, ROFF(ru_inblock), LONG, "ld", 0}, {"f", "F", NULL, "flags", 0, kvar, KOFF(ki_flag), INT, "x", 0},
{"inblock", "", "inblk", 0, NULL, 0, CHAR, NULL, 0}, {"f2", "F2", NULL, "flags2", 0, kvar, KOFF(ki_flag2), INT, "08x", 0},
{"jid", "JID", NULL, 0, kvar, KOFF(ki_jid), INT, "d", 0}, {"fib", "FIB", NULL, "fib", 0, kvar, KOFF(ki_fibnum), INT, "d", 0},
{"jobc", "JOBC", NULL, 0, kvar, KOFF(ki_jobc), SHORT, "d", 0}, {"flags", "", "f", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"ktrace", "KTRACE", NULL, 0, kvar, KOFF(ki_traceflag), INT, "x", 0}, {"flags2", "", "f2", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"label", "LABEL", NULL, LJUST, label, 0, CHAR, NULL, 0}, {"gid", "GID", NULL, "gid", 0, kvar, KOFF(ki_groups), UINT, UIDFMT, 0},
{"lim", "LIM", NULL, 0, maxrss, 0, CHAR, NULL, 0}, {"group", "GROUP", NULL, "group", LJUST, egroupname, 0, CHAR, NULL, 0},
{"lockname", "LOCK", NULL, LJUST, lockname, 0, CHAR, NULL, 0}, {"ignored", "", "sigignore", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"login", "LOGIN", NULL, LJUST, logname, 0, CHAR, NULL, 0}, {"inblk", "INBLK", NULL, "read-blocks", USER, rvar, ROFF(ru_inblock),
{"logname", "", "login", 0, NULL, 0, CHAR, NULL, 0}, LONG, "ld", 0},
{"lstart", "STARTED", NULL, LJUST|USER, lstarted, 0, CHAR, NULL, 0}, {"inblock", "", "inblk", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"lwp", "LWP", NULL, 0, kvar, KOFF(ki_tid), UINT, LWPFMT, 0}, {"jid", "JID", NULL, "jail-id", 0, kvar, KOFF(ki_jid), INT, "d", 0},
{"majflt", "MAJFLT", NULL, USER, rvar, ROFF(ru_majflt), LONG, "ld", 0}, {"jobc", "JOBC", NULL, "job-control-count", 0, kvar, KOFF(ki_jobc),
{"minflt", "MINFLT", NULL, USER, rvar, ROFF(ru_minflt), LONG, "ld", 0}, SHORT, "d", 0},
{"msgrcv", "MSGRCV", NULL, USER, rvar, ROFF(ru_msgrcv), LONG, "ld", 0}, {"ktrace", "KTRACE", NULL, "ktrace", 0, kvar, KOFF(ki_traceflag), INT,
{"msgsnd", "MSGSND", NULL, USER, rvar, ROFF(ru_msgsnd), LONG, "ld", 0}, "x", 0},
{"mwchan", "MWCHAN", NULL, LJUST, mwchan, 0, CHAR, NULL, 0}, {"label", "LABEL", NULL, "label", LJUST, label, 0, CHAR, NULL, 0},
{"ni", "", "nice", 0, NULL, 0, CHAR, NULL, 0}, {"lim", "LIM", NULL, "memory-limit", 0, maxrss, 0, CHAR, NULL, 0},
{"nice", "NI", NULL, 0, kvar, KOFF(ki_nice), CHAR, "d", 0}, {"lockname", "LOCK", NULL, "lock-name", LJUST, lockname, 0, CHAR, NULL,
{"nivcsw", "NIVCSW", NULL, USER, rvar, ROFF(ru_nivcsw), LONG, "ld", 0}, 0},
{"nlwp", "NLWP", NULL, 0, kvar, KOFF(ki_numthreads), UINT, NLWPFMT, 0}, {"login", "LOGIN", NULL, "login-name", LJUST, logname, 0, CHAR, NULL,
{"nsignals", "", "nsigs", 0, NULL, 0, CHAR, NULL, 0}, 0},
{"nsigs", "NSIGS", NULL, USER, rvar, ROFF(ru_nsignals), LONG, "ld", 0}, {"logname", "", "login", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"nswap", "NSWAP", NULL, USER, rvar, ROFF(ru_nswap), LONG, "ld", 0}, {"lstart", "STARTED", NULL, "start-time", LJUST|USER, lstarted, 0,
{"nvcsw", "NVCSW", NULL, USER, rvar, ROFF(ru_nvcsw), LONG, "ld", 0}, CHAR, NULL, 0},
{"nwchan", "NWCHAN", NULL, LJUST, nwchan, 0, CHAR, NULL, 0}, {"lwp", "LWP", NULL, "process-thread-id", 0, kvar, KOFF(ki_tid), UINT,
{"oublk", "OUBLK", NULL, USER, rvar, ROFF(ru_oublock), LONG, "ld", 0}, LWPFMT, 0},
{"oublock", "", "oublk", 0, NULL, 0, CHAR, NULL, 0}, {"majflt", "MAJFLT", NULL, "major-faults", USER, rvar, ROFF(ru_majflt),
{"paddr", "PADDR", NULL, 0, kvar, KOFF(ki_paddr), KPTR, "lx", 0}, LONG, "ld", 0},
{"pagein", "PAGEIN", NULL, USER, pagein, 0, CHAR, NULL, 0}, {"minflt", "MINFLT", NULL, "minor-faults", USER, rvar, ROFF(ru_minflt),
{"pcpu", "", "%cpu", 0, NULL, 0, CHAR, NULL, 0}, LONG, "ld", 0},
{"pending", "", "sig", 0, NULL, 0, CHAR, NULL, 0}, {"msgrcv", "MSGRCV", NULL, "received-messages", USER, rvar,
{"pgid", "PGID", NULL, 0, kvar, KOFF(ki_pgid), UINT, PIDFMT, 0}, ROFF(ru_msgrcv), LONG, "ld", 0},
{"pid", "PID", NULL, 0, kvar, KOFF(ki_pid), UINT, PIDFMT, 0}, {"msgsnd", "MSGSND", NULL, "sent-messages", USER, rvar,
{"pmem", "", "%mem", 0, NULL, 0, CHAR, NULL, 0}, ROFF(ru_msgsnd), LONG, "ld", 0},
{"ppid", "PPID", NULL, 0, kvar, KOFF(ki_ppid), UINT, PIDFMT, 0}, {"mwchan", "MWCHAN", NULL, "wait-channel", LJUST, mwchan, 0, CHAR,
{"pri", "PRI", NULL, 0, pri, 0, CHAR, NULL, 0}, NULL, 0},
{"re", "RE", NULL, INF127, kvar, KOFF(ki_swtime), UINT, "d", 0}, {"ni", "", "nice", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"rgid", "RGID", NULL, 0, kvar, KOFF(ki_rgid), UINT, UIDFMT, 0}, {"nice", "NI", NULL, "nice", 0, kvar, KOFF(ki_nice), CHAR, "d", 0},
{"rgroup", "RGROUP", NULL, LJUST, rgroupname, 0, CHAR, NULL, 0}, {"nivcsw", "NIVCSW", NULL, "involuntary-context-switches", USER, rvar,
{"rss", "RSS", NULL, 0, kvar, KOFF(ki_rssize), PGTOK, "ld", 0}, ROFF(ru_nivcsw), LONG, "ld", 0},
{"rtprio", "RTPRIO", NULL, 0, priorityr, KOFF(ki_pri), CHAR, NULL, 0}, {"nlwp", "NLWP", NULL, "threads", 0, kvar, KOFF(ki_numthreads), UINT,
{"ruid", "RUID", NULL, 0, kvar, KOFF(ki_ruid), UINT, UIDFMT, 0}, NLWPFMT, 0},
{"ruser", "RUSER", NULL, LJUST, runame, 0, CHAR, NULL, 0}, {"nsignals", "", "nsigs", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"sid", "SID", NULL, 0, kvar, KOFF(ki_sid), UINT, PIDFMT, 0}, {"nsigs", "NSIGS", NULL, "signals-taken", USER, rvar,
{"sig", "PENDING", NULL, 0, kvar, KOFF(ki_siglist), INT, "x", 0}, ROFF(ru_nsignals), LONG, "ld", 0},
{"sigcatch", "CAUGHT", NULL, 0, kvar, KOFF(ki_sigcatch), UINT, "x", 0}, {"nswap", "NSWAP", NULL, "swaps", USER, rvar, ROFF(ru_nswap), LONG,
{"sigignore", "IGNORED", NULL, 0, kvar, KOFF(ki_sigignore), "ld", 0},
UINT, "x", 0}, {"nvcsw", "NVCSW", NULL, "voluntary-context-switches", USER, rvar,
{"sigmask", "BLOCKED", NULL, 0, kvar, KOFF(ki_sigmask), UINT, "x", 0}, ROFF(ru_nvcsw), LONG, "ld", 0},
{"sl", "SL", NULL, INF127, kvar, KOFF(ki_slptime), UINT, "d", 0}, {"nwchan", "NWCHAN", NULL, "wait-channel-address", LJUST, nwchan, 0,
{"ssiz", "SSIZ", NULL, 0, kvar, KOFF(ki_ssize), PGTOK, "ld", 0}, CHAR, NULL, 0},
{"start", "STARTED", NULL, LJUST|USER, started, 0, CHAR, NULL, 0}, {"oublk", "OUBLK", NULL, "written-blocks", USER, rvar,
{"stat", "", "state", 0, NULL, 0, CHAR, NULL, 0}, ROFF(ru_oublock), LONG, "ld", 0},
{"state", "STAT", NULL, LJUST, state, 0, CHAR, NULL, 0}, {"oublock", "", "oublk", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"svgid", "SVGID", NULL, 0, kvar, KOFF(ki_svgid), UINT, UIDFMT, 0}, {"paddr", "PADDR", NULL, "process-address", 0, kvar, KOFF(ki_paddr),
{"svuid", "SVUID", NULL, 0, kvar, KOFF(ki_svuid), UINT, UIDFMT, 0}, KPTR, "lx", 0},
{"systime", "SYSTIME", NULL, USER, systime, 0, CHAR, NULL, 0}, {"pagein", "PAGEIN", NULL, "pageins", USER, pagein, 0, CHAR, NULL, 0},
{"tdaddr", "TDADDR", NULL, 0, kvar, KOFF(ki_tdaddr), KPTR, "lx", 0}, {"pcpu", "", "%cpu", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"tdev", "TDEV", NULL, 0, tdev, 0, CHAR, NULL, 0}, {"pending", "", "sig", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"tdnam", "TDNAM", NULL, LJUST, tdnam, 0, CHAR, NULL, 0}, {"pgid", "PGID", NULL, "process-group", 0, kvar, KOFF(ki_pgid), UINT,
{"time", "TIME", NULL, USER, cputime, 0, CHAR, NULL, 0}, PIDFMT, 0},
{"tpgid", "TPGID", NULL, 0, kvar, KOFF(ki_tpgid), UINT, PIDFMT, 0}, {"pid", "PID", NULL, "pid", 0, kvar, KOFF(ki_pid), UINT, PIDFMT, 0},
{"tracer", "TRACER", NULL, 0, kvar, KOFF(ki_tracer), UINT, PIDFMT, 0}, {"pmem", "", "%mem", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"tsid", "TSID", NULL, 0, kvar, KOFF(ki_tsid), UINT, PIDFMT, 0}, {"ppid", "PPID", NULL, "ppid", 0, kvar, KOFF(ki_ppid), UINT, PIDFMT, 0},
{"tsiz", "TSIZ", NULL, 0, kvar, KOFF(ki_tsize), PGTOK, "ld", 0}, {"pri", "PRI", NULL, "priority", 0, pri, 0, CHAR, NULL, 0},
{"tt", "TT ", NULL, 0, tname, 0, CHAR, NULL, 0}, {"re", "RE", NULL, "residency-time", INF127, kvar, KOFF(ki_swtime),
{"tty", "TTY", NULL, LJUST, longtname, 0, CHAR, NULL, 0}, UINT, "d", 0},
{"ucomm", "UCOMM", NULL, LJUST, ucomm, 0, CHAR, NULL, 0}, {"rgid", "RGID", NULL, "real-gid", 0, kvar, KOFF(ki_rgid), UINT,
{"uid", "UID", NULL, 0, kvar, KOFF(ki_uid), UINT, UIDFMT, 0}, UIDFMT, 0},
{"upr", "UPR", NULL, 0, upr, 0, CHAR, NULL, 0}, {"rgroup", "RGROUP", NULL, "real-group", LJUST, rgroupname, 0, CHAR,
{"uprocp", "UPROCP", NULL, 0, kvar, KOFF(ki_paddr), KPTR, "lx", 0}, NULL, 0},
{"user", "USER", NULL, LJUST, uname, 0, CHAR, NULL, 0}, {"rss", "RSS", NULL, "rss", 0, kvar, KOFF(ki_rssize), PGTOK, "ld", 0},
{"usertime", "USERTIME", NULL, USER, usertime, 0, CHAR, NULL, 0}, {"rtprio", "RTPRIO", NULL, "realtime-priority", 0, priorityr,
{"usrpri", "", "upr", 0, NULL, 0, CHAR, NULL, 0}, KOFF(ki_pri), CHAR, NULL, 0},
{"vsize", "", "vsz", 0, NULL, 0, CHAR, NULL, 0}, {"ruid", "RUID", NULL, "real-uid", 0, kvar, KOFF(ki_ruid), UINT,
{"vsz", "VSZ", NULL, 0, vsize, 0, CHAR, NULL, 0}, UIDFMT, 0},
{"wchan", "WCHAN", NULL, LJUST, wchan, 0, CHAR, NULL, 0}, {"ruser", "RUSER", NULL, "real-user", LJUST, runame, 0, CHAR, NULL, 0},
{"xstat", "XSTAT", NULL, 0, kvar, KOFF(ki_xstat), USHORT, "x", 0}, {"sid", "SID", NULL, "sid", 0, kvar, KOFF(ki_sid), UINT, PIDFMT, 0},
{"", NULL, NULL, 0, NULL, 0, CHAR, NULL, 0}, {"sig", "PENDING", NULL, "signals-pending", 0, kvar, KOFF(ki_siglist),
INT, "x", 0},
{"sigcatch", "CAUGHT", NULL, "signals-caught", 0, kvar,
KOFF(ki_sigcatch), UINT, "x", 0},
{"sigignore", "IGNORED", NULL, "signals-ignored", 0, kvar,
KOFF(ki_sigignore), UINT, "x", 0},
{"sigmask", "BLOCKED", NULL, "signal-mask", 0, kvar, KOFF(ki_sigmask),
UINT, "x", 0},
{"sl", "SL", NULL, "sleep-time", INF127, kvar, KOFF(ki_slptime), UINT,
"d", 0},
{"ssiz", "SSIZ", NULL, "stack-size", 0, kvar, KOFF(ki_ssize), PGTOK,
"ld", 0},
{"start", "STARTED", NULL, "start-time", LJUST|USER, started, 0, CHAR,
NULL, 0},
{"stat", "", "state", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"state", "STAT", NULL, "state", LJUST, state, 0, CHAR, NULL, 0},
{"svgid", "SVGID", NULL, "saved-gid", 0, kvar, KOFF(ki_svgid), UINT,
UIDFMT, 0},
{"svuid", "SVUID", NULL, "saved-uid", 0, kvar, KOFF(ki_svuid), UINT,
UIDFMT, 0},
{"systime", "SYSTIME", NULL, "system-time", USER, systime, 0, CHAR,
NULL, 0},
{"tdaddr", "TDADDR", NULL, "thread-address", 0, kvar, KOFF(ki_tdaddr),
KPTR, "lx", 0},
{"tdev", "TDEV", NULL, "terminal-device", 0, tdev, 0, CHAR, NULL, 0},
{"tdnam", "TDNAM", NULL, "terminal-device-name", LJUST, tdnam, 0, CHAR,
NULL, 0},
{"time", "TIME", NULL, "cpu-time", USER, cputime, 0, CHAR, NULL, 0},
{"tpgid", "TPGID", NULL, "terminal-process-gid", 0, kvar,
KOFF(ki_tpgid), UINT, PIDFMT, 0},
{"tracer", "TRACER", NULL, "tracer", 0, kvar, KOFF(ki_tracer), UINT,
PIDFMT, 0},
{"tsid", "TSID", NULL, "terminal-sid", 0, kvar, KOFF(ki_tsid), UINT,
PIDFMT, 0},
{"tsiz", "TSIZ", NULL, "text-size", 0, kvar, KOFF(ki_tsize), PGTOK,
"ld", 0},
{"tt", "TT ", NULL, "terminal-name", 0, tname, 0, CHAR, NULL, 0},
{"tty", "TTY", NULL, "tty", LJUST, longtname, 0, CHAR, NULL, 0},
{"ucomm", "UCOMM", NULL, "accounting-name", LJUST, ucomm, 0, CHAR,
NULL, 0},
{"uid", "UID", NULL, "uid", 0, kvar, KOFF(ki_uid), UINT, UIDFMT, 0},
{"upr", "UPR", NULL, "user-priority", 0, upr, 0, CHAR, NULL, 0},
{"uprocp", "UPROCP", NULL, "process-address", 0, kvar, KOFF(ki_paddr),
KPTR, "lx", 0},
{"user", "USER", NULL, "user", LJUST, uname, 0, CHAR, NULL, 0},
{"usertime", "USERTIME", NULL, "user-time", USER, usertime, 0, CHAR,
NULL, 0},
{"usrpri", "", "upr", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"vsize", "", "vsz", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"vsz", "VSZ", NULL, "virtual-size", 0, vsize, 0, CHAR, NULL, 0},
{"wchan", "WCHAN", NULL, "wait-channel", LJUST, wchan, 0, CHAR, NULL,
0},
{"xstat", "XSTAT", NULL, "exit-status", 0, kvar, KOFF(ki_xstat),
USHORT, "x", 0},
{"", NULL, NULL, NULL, 0, NULL, 0, CHAR, NULL, 0},
}; };
void void
@ -185,16 +240,19 @@ showkey(void)
i = 0; i = 0;
sep = ""; sep = "";
xo_open_list("key");
for (v = var; *(p = v->name); ++v) { for (v = var; *(p = v->name); ++v) {
int len = strlen(p); int len = strlen(p);
if (termwidth && (i += len + 1) > termwidth) { if (termwidth && (i += len + 1) > termwidth) {
i = len; i = len;
sep = "\n"; sep = "\n";
} }
(void) printf("%s%s", sep, p); xo_emit("{P:/%s}{l:key/%s}", sep, p);
sep = " "; sep = " ";
} }
(void) printf("\n"); xo_emit("\n");
xo_close_list("key");
xo_finish();
} }
void void

27
bin/ps/print.c
View File

@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$");
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <vis.h> #include <vis.h>
#include <libxo/xo.h>
#include "ps.h" #include "ps.h"
@ -85,15 +86,15 @@ printheader(void)
v = vent->var; v = vent->var;
if (v->flag & LJUST) { if (v->flag & LJUST) {
if (STAILQ_NEXT(vent, next_ve) == NULL) /* last one */ if (STAILQ_NEXT(vent, next_ve) == NULL) /* last one */
(void)printf("%s", vent->header); xo_emit("{T:/%s}", vent->header);
else else
(void)printf("%-*s", v->width, vent->header); xo_emit("{T:/%-*s}", v->width, vent->header);
} else } else
(void)printf("%*s", v->width, vent->header); xo_emit("{T:/%*s}", v->width, vent->header);
if (STAILQ_NEXT(vent, next_ve) != NULL) if (STAILQ_NEXT(vent, next_ve) != NULL)
(void)putchar(' '); xo_emit("{P: }");
} }
(void)putchar('\n'); xo_emit("\n");
} }
char * char *
@ -102,7 +103,7 @@ arguments(KINFO *k, VARENT *ve)
char *vis_args; char *vis_args;
if ((vis_args = malloc(strlen(k->ki_args) * 4 + 1)) == NULL) if ((vis_args = malloc(strlen(k->ki_args) * 4 + 1)) == NULL)
errx(1, "malloc failed"); xo_errx(1, "malloc failed");
strvis(vis_args, k->ki_args, VIS_TAB | VIS_NL | VIS_NOSLASH); strvis(vis_args, k->ki_args, VIS_TAB | VIS_NL | VIS_NOSLASH);
if (STAILQ_NEXT(ve, next_ve) != NULL && strlen(vis_args) > ARGUMENTS_WIDTH) if (STAILQ_NEXT(ve, next_ve) != NULL && strlen(vis_args) > ARGUMENTS_WIDTH)
@ -130,7 +131,7 @@ command(KINFO *k, VARENT *ve)
return (str); return (str);
} }
if ((vis_args = malloc(strlen(k->ki_args) * 4 + 1)) == NULL) if ((vis_args = malloc(strlen(k->ki_args) * 4 + 1)) == NULL)
errx(1, "malloc failed"); xo_errx(1, "malloc failed");
strvis(vis_args, k->ki_args, VIS_TAB | VIS_NL | VIS_NOSLASH); strvis(vis_args, k->ki_args, VIS_TAB | VIS_NL | VIS_NOSLASH);
if (STAILQ_NEXT(ve, next_ve) == NULL) { if (STAILQ_NEXT(ve, next_ve) == NULL) {
@ -139,7 +140,7 @@ command(KINFO *k, VARENT *ve)
if (k->ki_env) { if (k->ki_env) {
if ((vis_env = malloc(strlen(k->ki_env) * 4 + 1)) if ((vis_env = malloc(strlen(k->ki_env) * 4 + 1))
== NULL) == NULL)
errx(1, "malloc failed"); xo_errx(1, "malloc failed");
strvis(vis_env, k->ki_env, strvis(vis_env, k->ki_env,
VIS_TAB | VIS_NL | VIS_NOSLASH); VIS_TAB | VIS_NL | VIS_NOSLASH);
} else } else
@ -215,7 +216,7 @@ state(KINFO *k, VARENT *ve __unused)
buf = malloc(16); buf = malloc(16);
if (buf == NULL) if (buf == NULL)
errx(1, "malloc failed"); xo_errx(1, "malloc failed");
flag = k->ki_p->ki_flag; flag = k->ki_p->ki_flag;
tdflags = k->ki_p->ki_tdflags; /* XXXKSE */ tdflags = k->ki_p->ki_tdflags; /* XXXKSE */
@ -391,7 +392,7 @@ started(KINFO *k, VARENT *ve __unused)
buf = malloc(buflen); buf = malloc(buflen);
if (buf == NULL) if (buf == NULL)
errx(1, "malloc failed"); xo_errx(1, "malloc failed");
then = k->ki_p->ki_start.tv_sec; then = k->ki_p->ki_start.tv_sec;
tp = localtime(&then); tp = localtime(&then);
@ -416,7 +417,7 @@ lstarted(KINFO *k, VARENT *ve __unused)
buf = malloc(buflen); buf = malloc(buflen);
if (buf == NULL) if (buf == NULL)
errx(1, "malloc failed"); xo_errx(1, "malloc failed");
then = k->ki_p->ki_start.tv_sec; then = k->ki_p->ki_start.tv_sec;
(void)strftime(buf, buflen, "%c", localtime(&then)); (void)strftime(buf, buflen, "%c", localtime(&then));
@ -762,7 +763,7 @@ printval(void *bp, VAR *v)
(void)asprintf(&str, ofmt, ps_pgtok(*(u_long *)bp)); (void)asprintf(&str, ofmt, ps_pgtok(*(u_long *)bp));
break; break;
default: default:
errx(1, "unknown type %d", v->type); xo_errx(1, "unknown type %d", v->type);
} }
return (str); return (str);
@ -804,7 +805,7 @@ label(KINFO *k, VARENT *ve __unused)
string = NULL; string = NULL;
if (mac_prepare_process_label(&proclabel) == -1) { if (mac_prepare_process_label(&proclabel) == -1) {
warn("mac_prepare_process_label"); xo_warn("mac_prepare_process_label");
goto out; goto out;
} }
error = mac_get_pid(k->ki_p->ki_pid, proclabel); error = mac_get_pid(k->ki_p->ki_pid, proclabel);

6
bin/ps/ps.1
View File

@ -29,7 +29,7 @@
.\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" @(#)ps.1 8.3 (Berkeley) 4/18/94
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd December 9, 2014 .Dd May 22, 2015
.Dt PS 1 .Dt PS 1
.Os .Os
.Sh NAME .Sh NAME
@ -37,6 +37,7 @@
.Nd process status .Nd process status
.Sh SYNOPSIS .Sh SYNOPSIS
.Nm .Nm
.Op Fl -libxo
.Op Fl aCcdefHhjlmrSTuvwXxZ .Op Fl aCcdefHhjlmrSTuvwXxZ
.Op Fl O Ar fmt | Fl o Ar fmt .Op Fl O Ar fmt | Fl o Ar fmt
.Op Fl G Ar gid Ns Op , Ns Ar gid Ns Ar ... .Op Fl G Ar gid Ns Op , Ns Ar gid Ns Ar ...
@ -47,6 +48,7 @@
.Op Fl t Ar tty Ns Op , Ns Ar tty Ns Ar ... .Op Fl t Ar tty Ns Op , Ns Ar tty Ns Ar ...
.Op Fl U Ar user Ns Op , Ns Ar user Ns Ar ... .Op Fl U Ar user Ns Op , Ns Ar user Ns Ar ...
.Nm .Nm
.Op Fl -libxo
.Op Fl L .Op Fl L
.Sh DESCRIPTION .Sh DESCRIPTION
The The
@ -733,7 +735,9 @@ Display information on all system processes:
.Xr procstat 1 , .Xr procstat 1 ,
.Xr w 1 , .Xr w 1 ,
.Xr kvm 3 , .Xr kvm 3 ,
.Xr libxo 3
.Xr strftime 3 , .Xr strftime 3 ,
.Xr xo_parse_args 3
.Xr mac 4 , .Xr mac 4 ,
.Xr procfs 5 , .Xr procfs 5 ,
.Xr pstat 8 , .Xr pstat 8 ,

101
bin/ps/ps.c
View File

@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$");
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <libxo/xo.h>
#include "ps.h" #include "ps.h"
@ -184,7 +185,9 @@ main(int argc, char *argv[])
int all, ch, elem, flag, _fmt, i, lineno, linelen, left; int all, ch, elem, flag, _fmt, i, lineno, linelen, left;
int descendancy, nentries, nkept, nselectors; int descendancy, nentries, nkept, nselectors;
int prtheader, wflag, what, xkeep, xkeep_implied; int prtheader, wflag, what, xkeep, xkeep_implied;
int fwidthmin, fwidthmax;
char errbuf[_POSIX2_LINE_MAX]; char errbuf[_POSIX2_LINE_MAX];
char fmtbuf[_POSIX2_LINE_MAX];
(void) setlocale(LC_ALL, ""); (void) setlocale(LC_ALL, "");
time(&now); /* Used by routines in print.c. */ time(&now); /* Used by routines in print.c. */
@ -221,6 +224,11 @@ main(int argc, char *argv[])
init_list(&uidlist, addelem_uid, sizeof(uid_t), "user"); init_list(&uidlist, addelem_uid, sizeof(uid_t), "user");
memf = _PATH_DEVNULL; memf = _PATH_DEVNULL;
nlistf = NULL; nlistf = NULL;
argc = xo_parse_args(argc, argv);
if (argc < 0)
exit(1);
while ((ch = getopt(argc, argv, PS_ARGS)) != -1) while ((ch = getopt(argc, argv, PS_ARGS)) != -1)
switch (ch) { switch (ch) {
case 'A': case 'A':
@ -363,7 +371,7 @@ main(int argc, char *argv[])
#endif #endif
case 'T': case 'T':
if ((optarg = ttyname(STDIN_FILENO)) == NULL) if ((optarg = ttyname(STDIN_FILENO)) == NULL)
errx(1, "stdin: not a terminal"); xo_errx(1, "stdin: not a terminal");
/* FALLTHROUGH */ /* FALLTHROUGH */
case 't': case 't':
add_list(&ttylist, optarg); add_list(&ttylist, optarg);
@ -434,8 +442,7 @@ main(int argc, char *argv[])
argv++; argv++;
} }
if (*argv) { if (*argv) {
fprintf(stderr, "%s: illegal argument: %s\n", xo_warnx("illegal argument: %s\n", *argv);
getprogname(), *argv);
usage(); usage();
} }
if (optfatal) if (optfatal)
@ -445,7 +452,7 @@ main(int argc, char *argv[])
kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, errbuf); kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, errbuf);
if (kd == 0) if (kd == 0)
errx(1, "%s", errbuf); xo_errx(1, "%s", errbuf);
if (!_fmt) if (!_fmt)
parsefmt(dfmt, 0); parsefmt(dfmt, 0);
@ -453,7 +460,7 @@ main(int argc, char *argv[])
if (nselectors == 0) { if (nselectors == 0) {
uidlist.l.ptr = malloc(sizeof(uid_t)); uidlist.l.ptr = malloc(sizeof(uid_t));
if (uidlist.l.ptr == NULL) if (uidlist.l.ptr == NULL)
errx(1, "malloc failed"); xo_errx(1, "malloc failed");
nselectors = 1; nselectors = 1;
uidlist.count = uidlist.maxcount = 1; uidlist.count = uidlist.maxcount = 1;
*uidlist.l.uids = getuid(); *uidlist.l.uids = getuid();
@ -515,11 +522,11 @@ main(int argc, char *argv[])
nentries = -1; nentries = -1;
kp = kvm_getprocs(kd, what, flag, &nentries); kp = kvm_getprocs(kd, what, flag, &nentries);
if ((kp == NULL && nentries > 0) || (kp != NULL && nentries < 0)) if ((kp == NULL && nentries > 0) || (kp != NULL && nentries < 0))
errx(1, "%s", kvm_geterr(kd)); xo_errx(1, "%s", kvm_geterr(kd));
nkept = 0; nkept = 0;
if (nentries > 0) { if (nentries > 0) {
if ((kinfo = malloc(nentries * sizeof(*kinfo))) == NULL) if ((kinfo = malloc(nentries * sizeof(*kinfo))) == NULL)
errx(1, "malloc failed"); xo_errx(1, "malloc failed");
for (i = nentries; --i >= 0; ++kp) { for (i = nentries; --i >= 0; ++kp) {
/* /*
* If the user specified multiple selection-criteria, * If the user specified multiple selection-criteria,
@ -629,13 +636,18 @@ main(int argc, char *argv[])
/* /*
* Print header. * Print header.
*/ */
xo_open_container("process-information");
printheader(); printheader();
if (xo_get_style(NULL) != XO_STYLE_TEXT)
termwidth = UNLIMITED;
/* /*
* Output formatted lines. * Output formatted lines.
*/ */
xo_open_list("process");
for (i = lineno = 0; i < nkept; i++) { for (i = lineno = 0; i < nkept; i++) {
linelen = 0; linelen = 0;
xo_open_instance("process");
STAILQ_FOREACH(vent, &varlist, next_ve) { STAILQ_FOREACH(vent, &varlist, next_ve) {
if (vent->var->flag & LJUST) if (vent->var->flag & LJUST)
fmtstr = "%-*s"; fmtstr = "%-*s";
@ -645,21 +657,27 @@ main(int argc, char *argv[])
ks = STAILQ_FIRST(&kinfo[i].ki_ks); ks = STAILQ_FIRST(&kinfo[i].ki_ks);
STAILQ_REMOVE_HEAD(&kinfo[i].ki_ks, ks_next); STAILQ_REMOVE_HEAD(&kinfo[i].ki_ks, ks_next);
/* Truncate rightmost column if necessary. */ /* Truncate rightmost column if necessary. */
fwidthmax = _POSIX2_LINE_MAX;
if (STAILQ_NEXT(vent, next_ve) == NULL && if (STAILQ_NEXT(vent, next_ve) == NULL &&
termwidth != UNLIMITED && ks->ks_str != NULL) { termwidth != UNLIMITED && ks->ks_str != NULL) {
left = termwidth - linelen; left = termwidth - linelen;
if (left > 0 && left < (int)strlen(ks->ks_str)) if (left > 0 && left < (int)strlen(ks->ks_str))
ks->ks_str[left] = '\0'; fwidthmax = left;
} }
str = ks->ks_str; str = ks->ks_str;
if (str == NULL) if (str == NULL)
str = "-"; str = "-";
/* No padding for the last column, if it's LJUST. */ /* No padding for the last column, if it's LJUST. */
if (STAILQ_NEXT(vent, next_ve) == NULL && fwidthmin = (xo_get_style(NULL) != XO_STYLE_TEXT ||
vent->var->flag & LJUST) (STAILQ_NEXT(vent, next_ve) == NULL &&
linelen += printf(fmtstr, 0, str); (vent->var->flag & LJUST))) ? 0 : vent->var->width;
else snprintf(fmtbuf, sizeof(fmtbuf), "{:%s/%%%s%d..%ds}",
linelen += printf(fmtstr, vent->var->width, str); vent->var->field ?: vent->var->name,
(vent->var->flag & LJUST) ? "-" : "",
fwidthmin, fwidthmax);
xo_emit(fmtbuf, str);
linelen += fwidthmin;
if (ks->ks_str != NULL) { if (ks->ks_str != NULL) {
free(ks->ks_str); free(ks->ks_str);
@ -669,17 +687,22 @@ main(int argc, char *argv[])
ks = NULL; ks = NULL;
if (STAILQ_NEXT(vent, next_ve) != NULL) { if (STAILQ_NEXT(vent, next_ve) != NULL) {
(void)putchar(' '); xo_emit("{P: }");
linelen++; linelen++;
} }
} }
(void)putchar('\n'); xo_emit("\n");
xo_close_instance("process");
if (prtheader && lineno++ == prtheader - 4) { if (prtheader && lineno++ == prtheader - 4) {
(void)putchar('\n'); xo_emit("\n");
printheader(); printheader();
lineno = 0; lineno = 0;
} }
} }
xo_close_list("process");
xo_close_container("process-information");
xo_finish();
free_list(&gidlist); free_list(&gidlist);
free_list(&jidlist); free_list(&jidlist);
free_list(&pidlist); free_list(&pidlist);
@ -705,9 +728,9 @@ addelem_gid(struct listinfo *inf, const char *elem)
if (*elem == '\0' || strlen(elem) >= MAXLOGNAME) { if (*elem == '\0' || strlen(elem) >= MAXLOGNAME) {
if (*elem == '\0') if (*elem == '\0')
warnx("Invalid (zero-length) %s name", inf->lname); xo_warnx("Invalid (zero-length) %s name", inf->lname);
else else
warnx("%s name too long: %s", inf->lname, elem); xo_warnx("%s name too long: %s", inf->lname, elem);
optfatal = 1; optfatal = 1;
return (0); /* Do not add this value. */ return (0); /* Do not add this value. */
} }
@ -732,7 +755,7 @@ addelem_gid(struct listinfo *inf, const char *elem)
if (grp == NULL) if (grp == NULL)
grp = getgrnam(elem); grp = getgrnam(elem);
if (grp == NULL) { if (grp == NULL) {
warnx("No %s %s '%s'", inf->lname, nameorID, elem); xo_warnx("No %s %s '%s'", inf->lname, nameorID, elem);
optfatal = 1; optfatal = 1;
return (0); return (0);
} }
@ -773,7 +796,7 @@ addelem_pid(struct listinfo *inf, const char *elem)
long tempid; long tempid;
if (*elem == '\0') { if (*elem == '\0') {
warnx("Invalid (zero-length) process id"); xo_warnx("Invalid (zero-length) process id");
optfatal = 1; optfatal = 1;
return (0); /* Do not add this value. */ return (0); /* Do not add this value. */
} }
@ -781,10 +804,10 @@ addelem_pid(struct listinfo *inf, const char *elem)
errno = 0; errno = 0;
tempid = strtol(elem, &endp, 10); tempid = strtol(elem, &endp, 10);
if (*endp != '\0' || tempid < 0 || elem == endp) { if (*endp != '\0' || tempid < 0 || elem == endp) {
warnx("Invalid %s: %s", inf->lname, elem); xo_warnx("Invalid %s: %s", inf->lname, elem);
errno = ERANGE; errno = ERANGE;
} else if (errno != 0 || tempid > pid_max) { } else if (errno != 0 || tempid > pid_max) {
warnx("%s too large: %s", inf->lname, elem); xo_warnx("%s too large: %s", inf->lname, elem);
errno = ERANGE; errno = ERANGE;
} }
if (errno == ERANGE) { if (errno == ERANGE) {
@ -855,19 +878,19 @@ addelem_tty(struct listinfo *inf, const char *elem)
if (ttypath) { if (ttypath) {
if (stat(ttypath, &sb) == -1) { if (stat(ttypath, &sb) == -1) {
if (pathbuf3[0] != '\0') if (pathbuf3[0] != '\0')
warn("%s, %s, and %s", pathbuf3, pathbuf2, xo_warn("%s, %s, and %s", pathbuf3, pathbuf2,
ttypath); ttypath);
else else
warn("%s", ttypath); xo_warn("%s", ttypath);
optfatal = 1; optfatal = 1;
return (0); return (0);
} }
if (!S_ISCHR(sb.st_mode)) { if (!S_ISCHR(sb.st_mode)) {
if (pathbuf3[0] != '\0') if (pathbuf3[0] != '\0')
warnx("%s, %s, and %s: Not a terminal", xo_warnx("%s, %s, and %s: Not a terminal",
pathbuf3, pathbuf2, ttypath); pathbuf3, pathbuf2, ttypath);
else else
warnx("%s: Not a terminal", ttypath); xo_warnx("%s: Not a terminal", ttypath);
optfatal = 1; optfatal = 1;
return (0); return (0);
} }
@ -887,9 +910,9 @@ addelem_uid(struct listinfo *inf, const char *elem)
if (*elem == '\0' || strlen(elem) >= MAXLOGNAME) { if (*elem == '\0' || strlen(elem) >= MAXLOGNAME) {
if (*elem == '\0') if (*elem == '\0')
warnx("Invalid (zero-length) %s name", inf->lname); xo_warnx("Invalid (zero-length) %s name", inf->lname);
else else
warnx("%s name too long: %s", inf->lname, elem); xo_warnx("%s name too long: %s", inf->lname, elem);
optfatal = 1; optfatal = 1;
return (0); /* Do not add this value. */ return (0); /* Do not add this value. */
} }
@ -899,12 +922,12 @@ addelem_uid(struct listinfo *inf, const char *elem)
errno = 0; errno = 0;
bigtemp = strtoul(elem, &endp, 10); bigtemp = strtoul(elem, &endp, 10);
if (errno != 0 || *endp != '\0' || bigtemp > UID_MAX) if (errno != 0 || *endp != '\0' || bigtemp > UID_MAX)
warnx("No %s named '%s'", inf->lname, elem); xo_warnx("No %s named '%s'", inf->lname, elem);
else { else {
/* The string is all digits, so it might be a userID. */ /* The string is all digits, so it might be a userID. */
pwd = getpwuid((uid_t)bigtemp); pwd = getpwuid((uid_t)bigtemp);
if (pwd == NULL) if (pwd == NULL)
warnx("No %s name or ID matches '%s'", xo_warnx("No %s name or ID matches '%s'",
inf->lname, elem); inf->lname, elem);
} }
} }
@ -961,7 +984,7 @@ add_list(struct listinfo *inf, const char *argp)
while (*argp != '\0' && strchr(W_SEP T_SEP, while (*argp != '\0' && strchr(W_SEP T_SEP,
*argp) == NULL) *argp) == NULL)
argp++; argp++;
warnx("Value too long: %.*s", (int)(argp - savep), xo_warnx("Value too long: %.*s", (int)(argp - savep),
savep); savep);
optfatal = 1; optfatal = 1;
} }
@ -1062,7 +1085,7 @@ descendant_sort(KINFO *ki, int items)
continue; continue;
} }
if ((ki[src].ki_d.prefix = malloc(lvl * 2 + 1)) == NULL) if ((ki[src].ki_d.prefix = malloc(lvl * 2 + 1)) == NULL)
errx(1, "malloc failed"); xo_errx(1, "malloc failed");
for (n = 0; n < lvl - 2; n++) { for (n = 0; n < lvl - 2; n++) {
ki[src].ki_d.prefix[n * 2] = ki[src].ki_d.prefix[n * 2] =
path[n / 8] & 1 << (n % 8) ? '|' : ' '; path[n / 8] & 1 << (n % 8) ? '|' : ' ';
@ -1100,7 +1123,7 @@ expand_list(struct listinfo *inf)
newlist = realloc(inf->l.ptr, newmax * inf->elemsize); newlist = realloc(inf->l.ptr, newmax * inf->elemsize);
if (newlist == NULL) { if (newlist == NULL) {
free(inf->l.ptr); free(inf->l.ptr);
errx(1, "realloc to %d %ss failed", newmax, inf->lname); xo_errx(1, "realloc to %d %ss failed", newmax, inf->lname);
} }
inf->maxcount = newmax; inf->maxcount = newmax;
inf->l.ptr = newlist; inf->l.ptr = newlist;
@ -1174,7 +1197,7 @@ format_output(KINFO *ki)
str = (v->oproc)(ki, vent); str = (v->oproc)(ki, vent);
ks = malloc(sizeof(*ks)); ks = malloc(sizeof(*ks));
if (ks == NULL) if (ks == NULL)
errx(1, "malloc failed"); xo_errx(1, "malloc failed");
ks->ks_str = str; ks->ks_str = str;
STAILQ_INSERT_TAIL(&ki->ki_ks, ks, ks_next); STAILQ_INSERT_TAIL(&ki->ki_ks, ks, ks_next);
if (str != NULL) { if (str != NULL) {
@ -1240,7 +1263,7 @@ saveuser(KINFO *ki)
else else
asprintf(&ki->ki_args, "(%s)", ki->ki_p->ki_comm); asprintf(&ki->ki_args, "(%s)", ki->ki_p->ki_comm);
if (ki->ki_args == NULL) if (ki->ki_args == NULL)
errx(1, "malloc failed"); xo_errx(1, "malloc failed");
} else { } else {
ki->ki_args = NULL; ki->ki_args = NULL;
} }
@ -1251,7 +1274,7 @@ saveuser(KINFO *ki)
else else
ki->ki_env = strdup("()"); ki->ki_env = strdup("()");
if (ki->ki_env == NULL) if (ki->ki_env == NULL)
errx(1, "malloc failed"); xo_errx(1, "malloc failed");
} else { } else {
ki->ki_env = NULL; ki->ki_env = NULL;
} }
@ -1372,7 +1395,7 @@ kludge_oldps_options(const char *optlist, char *origval, const char *nextarg)
* original value. * original value.
*/ */
if ((newopts = ns = malloc(len + 3)) == NULL) if ((newopts = ns = malloc(len + 3)) == NULL)
errx(1, "malloc failed"); xo_errx(1, "malloc failed");
if (*origval != '-') if (*origval != '-')
*ns++ = '-'; /* add option flag */ *ns++ = '-'; /* add option flag */
@ -1401,7 +1424,7 @@ pidmax_init(void)
intsize = sizeof(pid_max); intsize = sizeof(pid_max);
if (sysctlbyname("kern.pid_max", &pid_max, &intsize, NULL, 0) < 0) { if (sysctlbyname("kern.pid_max", &pid_max, &intsize, NULL, 0) < 0) {
warn("unable to read kern.pid_max"); xo_warn("unable to read kern.pid_max");
pid_max = 99999; pid_max = 99999;
} }
} }
@ -1411,7 +1434,7 @@ usage(void)
{ {
#define SINGLE_OPTS "[-aCcde" OPT_LAZY_f "HhjlmrSTuvwXxZ]" #define SINGLE_OPTS "[-aCcde" OPT_LAZY_f "HhjlmrSTuvwXxZ]"
(void)fprintf(stderr, "%s\n%s\n%s\n%s\n", (void)xo_error("%s\n%s\n%s\n%s\n",
"usage: ps " SINGLE_OPTS " [-O fmt | -o fmt] [-G gid[,gid...]]", "usage: ps " SINGLE_OPTS " [-O fmt | -o fmt] [-G gid[,gid...]]",
" [-J jid[,jid...]] [-M core] [-N system]", " [-J jid[,jid...]] [-M core] [-N system]",
" [-p pid[,pid...]] [-t tty[,tty...]] [-U user[,user...]]", " [-p pid[,pid...]] [-t tty[,tty...]] [-U user[,user...]]",

1
bin/ps/ps.h
View File

@ -65,6 +65,7 @@ typedef struct var {
const char *name; /* name(s) of variable */ const char *name; /* name(s) of variable */
const char *header; /* default header */ const char *header; /* default header */
const char *alias; /* aliases */ const char *alias; /* aliases */
const char *field; /* xo field name */
#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 */