d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e4d4e793db
freebsd-skq/bin/ps/keyword.c

378 lines
14 KiB
C
Raw Normal View History

BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
/*-
General further adoption of SPDX licensing ID tags. Mainly focus on files that use BSD 3-Clause license. The Software Package Data Exchange (SPDX) group provides a specification to make it easier for automated tools to detect and summarize well known opensource licenses. We are gradually adopting the specification, noting that the tags are considered only advisory and do not, in any way, superceed or replace the license texts. Special thanks to Wind River for providing access to "The Duke of Highlander" tool: an older (2014) run over FreeBSD tree was useful as a starting point.
2017-11-20 19:49:47 +00:00
* SPDX-License-Identifier: BSD-3-Clause
*
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
Renumber copyright clause 4 Renumber cluase 4 to 3, per what everybody else did when BSD granted them permission to remove clause 3. My insistance on keeping the same numbering for legal reasons is too pedantic, so give up on that point. Submitted by: Jan Schaumann <jschauma@stevens.edu> Pull Request: https://github.com/freebsd/freebsd/pull/96
2017-02-28 23:42:47 +00:00
* 3. Neither the name of the University nor the names of its contributors
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
Remove #ifdef NEWVM code and remove extra "key.name = p" line.
1997-08-11 02:35:16 +00:00
#if 0
WARNS=4 fixes (incomplete, so set NO_WERROR), and lots of extra cleanup courtesy of automatic checking (lint).
2002-02-03 14:43:04 +00:00
#ifndef lint
Remove #ifdef NEWVM code and remove extra "key.name = p" line.
1997-08-11 02:35:16 +00:00
static char sccsid[] = "@(#)keyword.c 8.5 (Berkeley) 4/2/94";
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
#endif /* not lint */
WARNS=4 fixes (incomplete, so set NO_WERROR), and lots of extra cleanup courtesy of automatic checking (lint).
2002-02-03 14:43:04 +00:00
#endif
Consistently use FBSDID
2002-06-30 05:15:05 +00:00
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
#include <sys/proc.h>
Oops, add #include's (forgotten in last commit) to make this compile again.
1997-08-11 02:41:02 +00:00
#include <sys/sysctl.h>
#include <sys/user.h>
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
#include <err.h>
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Convert to use libxo. Document use of libxo as well. Obtained from: Phil Shafer <phil@juniper.net> Sponsored by: Juniper Networks, Inc.
2015-05-22 23:07:55 +00:00
#include <libxo/xo.h>
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
#include "ps.h"
Per-variable\ entry headers, to allow the 'ps -otime -otime=FOO' or similar case to do the right thing and affect exactly one column. This is consistent with GNU ps(1) in BSD mode, and POLA.
2003-01-19 00:31:16 +00:00
static VAR *findvar(char *, int, char **header);
o __P has been reoved o Old-style K&R declarations have been converted to new C89 style o register has been removed o prototype for main() has been removed (gcc3 makes it an error) o int main(int argc, char *argv[]) is the preferred main definition. o Attempt to not break style(9) conformance for declarations more than they already are.
2002-02-02 06:48:10 +00:00
static int vcmp(const void *, const void *);
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
/* Compute offset in common structures. */
Change the proc information returned from the kernel so that it no longer contains kernel specific data structures, but rather only scalar values and structures that are already part of the kernel/user interface, specifically rusage and rtprio. It no longer contains proc, session, pcred, ucred, procsig, vmspace, pstats, mtx, sigiolst, klist, callout, pasleep, or mdproc. If any of these changed in size, ps, w, fstat, gcore, systat, and top would all stop working. The new structure has over 200 bytes of unassigned space for future values to be added, yet is nearly 100 bytes smaller per entry than the structure that it replaced.
2000-12-12 07:25:57 +00:00
#define KOFF(x) offsetof(struct kinfo_proc, x)
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
#define ROFF(x) offsetof(struct rusage, x)
Add new output-format keywords of LWP and NLWP, which show the thread-id and number-of-threads tied to a process. Result can be seen by typing, e.g.: ps -HO lwp,nlwp These new options are not documented yet. More options will be coming, and I will update the man page after I get farther along. PR: bin/65803 (though adjusted to fit our present source) Submitted by: Cyrille Lefevre
2004-06-20 22:22:49 +00:00
#define LWPFMT "d"
#define NLWPFMT "d"
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
#define UIDFMT "u"
#define PIDFMT "d"
Fix slight disorder that broke sorting. Put in bold warning about the fact that in this case order matters. Submitted by: Peter Edwards <pmedwards@eircom.net>
2003-02-05 19:22:39 +00:00
/* PLEASE KEEP THE TABLE BELOW SORTED ALPHABETICALLY!!! */
WARNS=4 fixes (incomplete, so set NO_WERROR), and lots of extra cleanup courtesy of automatic checking (lint).
2002-02-03 14:43:04 +00:00
static VAR var[] = {
Convert to use libxo. Document use of libxo as well. Obtained from: Phil Shafer <phil@juniper.net> Sponsored by: Juniper Networks, Inc.
2015-05-22 23:07:55 +00:00
{"%cpu", "%CPU", NULL, "percent-cpu", 0, pcpu, 0, CHAR, NULL, 0},
{"%mem", "%MEM", NULL, "percent-memory", 0, pmem, 0, CHAR, NULL, 0},
{"acflag", "ACFLG", NULL, "accounting-flag", 0, kvar, KOFF(ki_acflag),
USHORT, "x", 0},
{"acflg", "", "acflag", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"args", "COMMAND", NULL, "arguments", COMM|LJUST|USER, arguments, 0,
CHAR, NULL, 0},
{"blocked", "", "sigmask", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"caught", "", "sigcatch", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"class", "CLASS", NULL, "login-class", LJUST, loginclass, 0, CHAR,
NULL, 0},
{"comm", "COMMAND", NULL, "command", LJUST, ucomm, 0, CHAR, NULL, 0},
{"command", "COMMAND", NULL, "command", COMM|LJUST|USER, command, 0,
CHAR, NULL, 0},
{"cow", "COW", NULL, "copy-on-write-faults", 0, kvar, KOFF(ki_cow),
UINT, "u", 0},
{"cpu", "CPU", NULL, "cpu-usage", 0, kvar, KOFF(ki_estcpu), UINT, "d",
0},
{"cputime", "", "time", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"dsiz", "DSIZ", NULL, "data-size", 0, kvar, KOFF(ki_dsize), PGTOK,
"ld", 0},
{"egid", "", "gid", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"egroup", "", "group", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"emul", "EMUL", NULL, "emulation-envirnment", LJUST, emulname, 0,
CHAR, NULL, 0},
{"etime", "ELAPSED", NULL, "elapsed-time", USER, elapsed, 0, CHAR,
NULL, 0},
{"etimes", "ELAPSED", NULL, "elapsed-times", USER, elapseds, 0, CHAR,
NULL, 0},
{"euid", "", "uid", NULL, 0, NULL, 0, CHAR, NULL, 0},
ps(1): Expand variables to match expanded fields ki_flag and ki_tdflag have been 'long', not 'int', since 2000 and 2005, respectively. Submitted by: Shawn Wills <swills at isilon dot com> Sponsored by: EMC / Isilon Storage Division
2016-06-01 19:54:05 +00:00
{"f", "F", NULL, "flags", 0, kvar, KOFF(ki_flag), LONG, "lx", 0},
Convert to use libxo. Document use of libxo as well. Obtained from: Phil Shafer <phil@juniper.net> Sponsored by: Juniper Networks, Inc.
2015-05-22 23:07:55 +00:00
{"f2", "F2", NULL, "flags2", 0, kvar, KOFF(ki_flag2), INT, "08x", 0},
{"fib", "FIB", NULL, "fib", 0, kvar, KOFF(ki_fibnum), INT, "d", 0},
{"flags", "", "f", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"flags2", "", "f2", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"gid", "GID", NULL, "gid", 0, kvar, KOFF(ki_groups), UINT, UIDFMT, 0},
{"group", "GROUP", NULL, "group", LJUST, egroupname, 0, CHAR, NULL, 0},
{"ignored", "", "sigignore", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"inblk", "INBLK", NULL, "read-blocks", USER, rvar, ROFF(ru_inblock),
LONG, "ld", 0},
{"inblock", "", "inblk", NULL, 0, NULL, 0, CHAR, NULL, 0},
Add a "jail" keyword to list the name of a jail rather than its ID. Inspired by: mwlucas Reviewed by: jamie MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D14683
2018-03-13 18:30:26 +00:00
{"jail", "JAIL", NULL, "jail-name", LJUST, jailname, 0, CHAR, NULL, 0},
Convert to use libxo. Document use of libxo as well. Obtained from: Phil Shafer <phil@juniper.net> Sponsored by: Juniper Networks, Inc.
2015-05-22 23:07:55 +00:00
{"jid", "JID", NULL, "jail-id", 0, kvar, KOFF(ki_jid), INT, "d", 0},
{"jobc", "JOBC", NULL, "job-control-count", 0, kvar, KOFF(ki_jobc),
SHORT, "d", 0},
{"ktrace", "KTRACE", NULL, "ktrace", 0, kvar, KOFF(ki_traceflag), INT,
"x", 0},
{"label", "LABEL", NULL, "label", LJUST, label, 0, CHAR, NULL, 0},
{"lim", "LIM", NULL, "memory-limit", 0, maxrss, 0, CHAR, NULL, 0},
{"lockname", "LOCK", NULL, "lock-name", LJUST, lockname, 0, CHAR, NULL,
0},
{"login", "LOGIN", NULL, "login-name", LJUST, logname, 0, CHAR, NULL,
0},
{"logname", "", "login", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"lstart", "STARTED", NULL, "start-time", LJUST|USER, lstarted, 0,
CHAR, NULL, 0},
Remove some KSE references from ps(1). - Simplify the description of -H to assume 1:1 threading. - Drop 'process' from description of 'lwp' field and the corresponding XO field name. - Do add an expansion of LWP in the description of 'lwp' and 'nlwps'. - Add 'tid' as an alias for the 'lwp' field. Reviewed by: imp, kib (older version) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D14021
2018-01-23 22:48:06 +00:00
{"lwp", "LWP", NULL, "thread-id", 0, kvar, KOFF(ki_tid), UINT,
Convert to use libxo. Document use of libxo as well. Obtained from: Phil Shafer <phil@juniper.net> Sponsored by: Juniper Networks, Inc.
2015-05-22 23:07:55 +00:00
LWPFMT, 0},
{"majflt", "MAJFLT", NULL, "major-faults", USER, rvar, ROFF(ru_majflt),
LONG, "ld", 0},
{"minflt", "MINFLT", NULL, "minor-faults", USER, rvar, ROFF(ru_minflt),
LONG, "ld", 0},
{"msgrcv", "MSGRCV", NULL, "received-messages", USER, rvar,
ROFF(ru_msgrcv), LONG, "ld", 0},
{"msgsnd", "MSGSND", NULL, "sent-messages", USER, rvar,
ROFF(ru_msgsnd), LONG, "ld", 0},
{"mwchan", "MWCHAN", NULL, "wait-channel", LJUST, mwchan, 0, CHAR,
NULL, 0},
{"ni", "", "nice", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"nice", "NI", NULL, "nice", 0, kvar, KOFF(ki_nice), CHAR, "d", 0},
{"nivcsw", "NIVCSW", NULL, "involuntary-context-switches", USER, rvar,
ROFF(ru_nivcsw), LONG, "ld", 0},
{"nlwp", "NLWP", NULL, "threads", 0, kvar, KOFF(ki_numthreads), UINT,
NLWPFMT, 0},
{"nsignals", "", "nsigs", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"nsigs", "NSIGS", NULL, "signals-taken", USER, rvar,
ROFF(ru_nsignals), LONG, "ld", 0},
{"nswap", "NSWAP", NULL, "swaps", USER, rvar, ROFF(ru_nswap), LONG,
"ld", 0},
{"nvcsw", "NVCSW", NULL, "voluntary-context-switches", USER, rvar,
ROFF(ru_nvcsw), LONG, "ld", 0},
{"nwchan", "NWCHAN", NULL, "wait-channel-address", LJUST, nwchan, 0,
CHAR, NULL, 0},
{"oublk", "OUBLK", NULL, "written-blocks", USER, rvar,
ROFF(ru_oublock), LONG, "ld", 0},
{"oublock", "", "oublk", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"paddr", "PADDR", NULL, "process-address", 0, kvar, KOFF(ki_paddr),
KPTR, "lx", 0},
{"pagein", "PAGEIN", NULL, "pageins", USER, pagein, 0, CHAR, NULL, 0},
{"pcpu", "", "%cpu", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"pending", "", "sig", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"pgid", "PGID", NULL, "process-group", 0, kvar, KOFF(ki_pgid), UINT,
PIDFMT, 0},
{"pid", "PID", NULL, "pid", 0, kvar, KOFF(ki_pid), UINT, PIDFMT, 0},
{"pmem", "", "%mem", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"ppid", "PPID", NULL, "ppid", 0, kvar, KOFF(ki_ppid), UINT, PIDFMT, 0},
{"pri", "PRI", NULL, "priority", 0, pri, 0, CHAR, NULL, 0},
{"re", "RE", NULL, "residency-time", INF127, kvar, KOFF(ki_swtime),
UINT, "d", 0},
{"rgid", "RGID", NULL, "real-gid", 0, kvar, KOFF(ki_rgid), UINT,
UIDFMT, 0},
{"rgroup", "RGROUP", NULL, "real-group", LJUST, rgroupname, 0, CHAR,
NULL, 0},
{"rss", "RSS", NULL, "rss", 0, kvar, KOFF(ki_rssize), PGTOK, "ld", 0},
{"rtprio", "RTPRIO", NULL, "realtime-priority", 0, priorityr,
KOFF(ki_pri), CHAR, NULL, 0},
{"ruid", "RUID", NULL, "real-uid", 0, kvar, KOFF(ki_ruid), UINT,
UIDFMT, 0},
{"ruser", "RUSER", NULL, "real-user", LJUST, runame, 0, CHAR, NULL, 0},
{"sid", "SID", NULL, "sid", 0, kvar, KOFF(ki_sid), UINT, PIDFMT, 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},
Undocument "tdnam" (leaving it as an alias), and rename the column to TDNAME. Suggested by: bde MFC after: 2 weeks Sponsored by: DARPA, AFRL
2017-10-09 13:53:41 +00:00
{"tdnam", "", "tdname", NULL, 0, NULL, 0, CHAR, NULL, 0},
{"tdname", "TDNAME", NULL, "thread-name", LJUST, tdnam, 0, CHAR,
Convert to use libxo. Document use of libxo as well. Obtained from: Phil Shafer <phil@juniper.net> Sponsored by: Juniper Networks, Inc.
2015-05-22 23:07:55 +00:00
NULL, 0},
Remove some KSE references from ps(1). - Simplify the description of -H to assume 1:1 threading. - Drop 'process' from description of 'lwp' field and the corresponding XO field name. - Do add an expansion of LWP in the description of 'lwp' and 'nlwps'. - Add 'tid' as an alias for the 'lwp' field. Reviewed by: imp, kib (older version) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D14021
2018-01-23 22:48:06 +00:00
{"tid", "", "lwp", NULL, 0, NULL, 0, CHAR, NULL, 0},
Convert to use libxo. Document use of libxo as well. Obtained from: Phil Shafer <phil@juniper.net> Sponsored by: Juniper Networks, Inc.
2015-05-22 23:07:55 +00:00
{"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},
Add "vmaddr" ps(1) keyword. Obtained from: CheriBSD MFC after: 2 weeks Sponsored by: DARPA, AFRL
2017-12-01 11:32:05 +00:00
{"vmaddr", "VMADDR", NULL, "vmspace-address", 0, kvar, KOFF(ki_vmspace),
KPTR, "lx", 0},
Convert to use libxo. Document use of libxo as well. Obtained from: Phil Shafer <phil@juniper.net> Sponsored by: Juniper Networks, Inc.
2015-05-22 23:07:55 +00:00
{"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},
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
};
void
o __P has been reoved o Old-style K&R declarations have been converted to new C89 style o register has been removed o prototype for main() has been removed (gcc3 makes it an error) o int main(int argc, char *argv[]) is the preferred main definition. o Attempt to not break style(9) conformance for declarations more than they already are.
2002-02-02 06:48:10 +00:00
showkey(void)
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
{
VAR *v;
int i;
WARNS=4 fixes (incomplete, so set NO_WERROR), and lots of extra cleanup courtesy of automatic checking (lint).
2002-02-03 14:43:04 +00:00
const char *p, *sep;
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
i = 0;
sep = "";
Convert to use libxo. Document use of libxo as well. Obtained from: Phil Shafer <phil@juniper.net> Sponsored by: Juniper Networks, Inc.
2015-05-22 23:07:55 +00:00
xo_open_list("key");
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
for (v = var; *(p = v->name); ++v) {
int len = strlen(p);
if (termwidth && (i += len + 1) > termwidth) {
i = len;
sep = "\n";
}
Convert to use libxo. Document use of libxo as well. Obtained from: Phil Shafer <phil@juniper.net> Sponsored by: Juniper Networks, Inc.
2015-05-22 23:07:55 +00:00
xo_emit("{P:/%s}{l:key/%s}", sep, p);
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
sep = " ";
}
Convert to use libxo. Document use of libxo as well. Obtained from: Phil Shafer <phil@juniper.net> Sponsored by: Juniper Networks, Inc.
2015-05-22 23:07:55 +00:00
xo_emit("\n");
xo_close_list("key");
xo_finish();
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
}
void
When inserting a non-user-specified (e.g. not via -o or -O) format, don't dupe one that is already there. This is consistent with GNU ps(1)'s BSD mode, and POLA. Reported by: Andy Farkas <andyf@speednet.com.au> Tested by: Andy Farkas <andyf@speednet.com.au>
2003-01-19 00:22:34 +00:00
parsefmt(const char *p, int user)
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
{
WARNS=4 fixes (incomplete, so set NO_WERROR), and lots of extra cleanup courtesy of automatic checking (lint).
2002-02-03 14:43:04 +00:00
char *tempstr, *tempstr1;
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
Allow whitespace to act as a delimiter in the keywords list given to the -o, again, but also allow it in the user-specified header, too. This is far more backwards compatible and SUSv3-happy than allowing only comma to seperate the keywords list. Submitted by: tjr
2002-06-08 18:11:52 +00:00
#define FMTSEP " \t,\n"
WARNS=4 fixes (incomplete, so set NO_WERROR), and lots of extra cleanup courtesy of automatic checking (lint).
2002-02-03 14:43:04 +00:00
tempstr1 = tempstr = strdup(p);
while (tempstr && *tempstr) {
Per-variable\ entry headers, to allow the 'ps -otime -otime=FOO' or similar case to do the right thing and affect exactly one column. This is consistent with GNU ps(1) in BSD mode, and POLA.
2003-01-19 00:31:16 +00:00
char *cp, *hp;
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
VAR *v;
struct varent *vent;
As per behaviour on SVR4 systems, to allow any desirable type of header in the override, seperate by comma (',') only, rather than any type of whitespace (the literal space character (' ') had already been removed from this list). This allows things like: miamivice# ps -opid='Process > Identifier' Process Identifier 1350 1445 1450 To work.
2002-06-06 18:04:46 +00:00
/*
Allow whitespace to act as a delimiter in the keywords list given to the -o, again, but also allow it in the user-specified header, too. This is far more backwards compatible and SUSv3-happy than allowing only comma to seperate the keywords list. Submitted by: tjr
2002-06-08 18:11:52 +00:00
* If an item contains an equals sign, it specifies a column
* header, may contain embedded separator characters and
* is always the last item.
As per behaviour on SVR4 systems, to allow any desirable type of header in the override, seperate by comma (',') only, rather than any type of whitespace (the literal space character (' ') had already been removed from this list). This allows things like: miamivice# ps -opid='Process > Identifier' Process Identifier 1350 1445 1450 To work.
2002-06-06 18:04:46 +00:00
*/
Allow whitespace to act as a delimiter in the keywords list given to the -o, again, but also allow it in the user-specified header, too. This is far more backwards compatible and SUSv3-happy than allowing only comma to seperate the keywords list. Submitted by: tjr
2002-06-08 18:11:52 +00:00
if (tempstr[strcspn(tempstr, "="FMTSEP)] != '=')
while ((cp = strsep(&tempstr, FMTSEP)) != NULL &&
*cp == '\0')
/* void */;
else {
cp = tempstr;
tempstr = NULL;
}
Per-variable\ entry headers, to allow the 'ps -otime -otime=FOO' or similar case to do the right thing and affect exactly one column. This is consistent with GNU ps(1) in BSD mode, and POLA.
2003-01-19 00:31:16 +00:00
if (cp == NULL || !(v = findvar(cp, user, &hp)))
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
continue;
When inserting a non-user-specified (e.g. not via -o or -O) format, don't dupe one that is already there. This is consistent with GNU ps(1)'s BSD mode, and POLA. Reported by: Andy Farkas <andyf@speednet.com.au> Tested by: Andy Farkas <andyf@speednet.com.au>
2003-01-19 00:22:34 +00:00
if (!user) {
/*
* If the user is NOT adding this field manually,
* get on with our lives if this VAR is already
* represented in the list.
*/
vent = find_varentry(v);
if (vent != NULL)
continue;
}
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
if ((vent = malloc(sizeof(struct varent))) == NULL)
Widen the scope of fmt.c::1.19 and consistently use errx(3) if malloc(3) [or realloc(3)] happens to fail, everywhere in ps(1). Discussed with: bde, charnier (a while ago) fmt_argv() can no longer return NULL, so don't bother checking. Submitted by: bde
2002-06-05 18:11:25 +00:00
errx(1, "malloc failed");
Per-variable\ entry headers, to allow the 'ps -otime -otime=FOO' or similar case to do the right thing and affect exactly one column. This is consistent with GNU ps(1) in BSD mode, and POLA.
2003-01-19 00:31:16 +00:00
vent->header = v->header;
if (hp) {
hp = strdup(hp);
if (hp)
vent->header = hp;
}
To comply with SUSv3, duplicate the variable contents for each given format, so that multiple -ovar=header lines do not overwrite eachother. This means that ps -ouser=USERNAME -ouser=WHO would now possibly print: USERNAME WHO juli juli Whereas before it would be: WHO WHO juli juli
2002-06-05 01:58:36 +00:00
vent->var = malloc(sizeof(*vent->var));
if (vent->var == NULL)
Widen the scope of fmt.c::1.19 and consistently use errx(3) if malloc(3) [or realloc(3)] happens to fail, everywhere in ps(1). Discussed with: bde, charnier (a while ago) fmt_argv() can no longer return NULL, so don't bother checking. Submitted by: bde
2002-06-05 18:11:25 +00:00
errx(1, "malloc failed");
To comply with SUSv3, duplicate the variable contents for each given format, so that multiple -ovar=header lines do not overwrite eachother. This means that ps -ouser=USERNAME -ouser=WHO would now possibly print: USERNAME WHO juli juli Whereas before it would be: WHO WHO juli juli
2002-06-05 01:58:36 +00:00
memcpy(vent->var, v, sizeof(*vent->var));
Change "struct varent" to use the standard queue(8) macros, instead of using it's own version of the same basic algorithm. Submitted by: part by Cyrille Lefevre, part of it done by me
2004-06-23 23:48:09 +00:00
STAILQ_INSERT_TAIL(&varlist, vent, next_ve);
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
}
WARNS=4 fixes (incomplete, so set NO_WERROR), and lots of extra cleanup courtesy of automatic checking (lint).
2002-02-03 14:43:04 +00:00
free(tempstr1);
Change "struct varent" to use the standard queue(8) macros, instead of using it's own version of the same basic algorithm. Submitted by: part by Cyrille Lefevre, part of it done by me
2004-06-23 23:48:09 +00:00
if (STAILQ_EMPTY(&varlist)) {
List valid keywords, ala kill(1), rather than the csh builtin kill, which tells people to type kill -l, when no valid ones are specified. Sponsored by: Bright Path Solutions MFC after: 4 days
2002-09-27 01:44:30 +00:00
warnx("no valid keywords; valid keywords:");
showkey();
exit(1);
}
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
}
static VAR *
Per-variable\ entry headers, to allow the 'ps -otime -otime=FOO' or similar case to do the right thing and affect exactly one column. This is consistent with GNU ps(1) in BSD mode, and POLA.
2003-01-19 00:31:16 +00:00
findvar(char *p, int user, char **header)
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
{
Fix the case where the user specifies an alternate heading for some output-format keyword, and the keyword they picked is an alias to some other keyword. E.g.: ps -o stat=Zustand $$ ('stat' is defined as an alias for 'state') PR: bin/57833 MFC after: 3 weeks
2006-03-08 08:58:44 +00:00
size_t rflen;
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
VAR *v, key;
Fix the case where the user specifies an alternate heading for some output-format keyword, and the keyword they picked is an alias to some other keyword. E.g.: ps -o stat=Zustand $$ ('stat' is defined as an alias for 'state') PR: bin/57833 MFC after: 3 weeks
2006-03-08 08:58:44 +00:00
char *hp, *realfmt;
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
hp = strchr(p, '=');
if (hp)
*hp++ = '\0';
key.name = p;
v = bsearch(&key, var, sizeof(var)/sizeof(VAR) - 1, sizeof(VAR), vcmp);
if (v && v->alias) {
Fix the case where the user specifies an alternate heading for some output-format keyword, and the keyword they picked is an alias to some other keyword. E.g.: ps -o stat=Zustand $$ ('stat' is defined as an alias for 'state') PR: bin/57833 MFC after: 3 weeks
2006-03-08 08:58:44 +00:00
/*
Re-correct commit 1.73, but this time in a way that does not cause all column-headers to print in lowercase by default. I was in too much of a rush in committing 1.75, and didn't notice that the case had changed. This time I did considerably more testing, and used 'diff' instead of just quickly eyeballing the results... Apologies. I expect this means the dunce cap is mine for awhile. If this doesn't work, I'll just drop back to 1.72 and hide under my desk for awhile.
2006-04-06 03:24:31 +00:00
* If the user specified an alternate-header for this
* (aliased) format-name, then we need to copy that
* alternate-header when making the recursive call to
* process the alias.
Fix the case where the user specifies an alternate heading for some output-format keyword, and the keyword they picked is an alias to some other keyword. E.g.: ps -o stat=Zustand $$ ('stat' is defined as an alias for 'state') PR: bin/57833 MFC after: 3 weeks
2006-03-08 08:58:44 +00:00
*/
Re-correct commit 1.73, but this time in a way that does not cause all column-headers to print in lowercase by default. I was in too much of a rush in committing 1.75, and didn't notice that the case had changed. This time I did considerably more testing, and used 'diff' instead of just quickly eyeballing the results... Apologies. I expect this means the dunce cap is mine for awhile. If this doesn't work, I'll just drop back to 1.72 and hide under my desk for awhile.
2006-04-06 03:24:31 +00:00
if (hp == NULL)
parsefmt(v->alias, user);
else {
/*
* XXX - This processing will not be correct for
* any alias which expands into a list of format
* keywords. Presently there are no aliases
* which do that.
*/
rflen = strlen(v->alias) + strlen(hp) + 2;
realfmt = malloc(rflen);
[1] When showing threads, the thread name just appears if the comm label is choosen as last printout (ucomm suffers of this such bug too). That bug is caused by the fact that the fixed size of printout doesn't leave enough space for them to be printed out. Implement ucomm and comm commands with a dynamic size lenght for buffers. [2] On AMD64 architecture pointers don't have enough chars space to be shown (8 chars while they need 16). Fix them by providing a variadic space so that it fits well on both 64 and 32 bits architectures. [3] Check a return value of malloc() that wasn't checked before. PR: bin/128841, bin/128842 Reviewed by: jhb, emaste Sponsored by: Sandvine Incorporated
2009-02-26 18:01:07 +00:00
if (realfmt == NULL)
errx(1, "malloc failed");
Re-correct commit 1.73, but this time in a way that does not cause all column-headers to print in lowercase by default. I was in too much of a rush in committing 1.75, and didn't notice that the case had changed. This time I did considerably more testing, and used 'diff' instead of just quickly eyeballing the results... Apologies. I expect this means the dunce cap is mine for awhile. If this doesn't work, I'll just drop back to 1.72 and hide under my desk for awhile.
2006-04-06 03:24:31 +00:00
snprintf(realfmt, rflen, "%s=%s", v->alias, hp);
parsefmt(realfmt, user);
Fix small resource leak (memory). Reviewed by: gad MFC after: 1 week
2009-11-17 07:29:35 +00:00
free(realfmt);
Re-correct commit 1.73, but this time in a way that does not cause all column-headers to print in lowercase by default. I was in too much of a rush in committing 1.75, and didn't notice that the case had changed. This time I did considerably more testing, and used 'diff' instead of just quickly eyeballing the results... Apologies. I expect this means the dunce cap is mine for awhile. If this doesn't work, I'll just drop back to 1.72 and hide under my desk for awhile.
2006-04-06 03:24:31 +00:00
}
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
return ((VAR *)NULL);
}
if (!v) {
warnx("%s: keyword not found", p);
eval = 1;
Per-variable\ entry headers, to allow the 'ps -otime -otime=FOO' or similar case to do the right thing and affect exactly one column. This is consistent with GNU ps(1) in BSD mode, and POLA.
2003-01-19 00:31:16 +00:00
}
if (header)
*header = hp;
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
return (v);
}
static int
o __P has been reoved o Old-style K&R declarations have been converted to new C89 style o register has been removed o prototype for main() has been removed (gcc3 makes it an error) o int main(int argc, char *argv[]) is the preferred main definition. o Attempt to not break style(9) conformance for declarations more than they already are.
2002-02-02 06:48:10 +00:00
vcmp(const void *a, const void *b)
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
{
WARNS=4 fixes (incomplete, so set NO_WERROR), and lots of extra cleanup courtesy of automatic checking (lint).
2002-02-03 14:43:04 +00:00
return (strcmp(((const VAR *)a)->name, ((const VAR *)b)->name));
BSD 4.4 Lite bin Sources
1994-05-26 06:18:55 +00:00
}
Reference in New Issue Copy Permalink