diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2013-10-24 06:21:48 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2013-10-24 06:21:48 +0000 |
| commit | c27fdb0652bc97d2fbc2ab9ede852b904193d154 (patch) | |
| tree | a7aaaad31da9628b37b12879915056e81f7a5b79 /bin/ps | |
| parent | aaa3c42577021756bda16f8d58a758947718c8f2 (diff) | |
Fix field header overriding on fields that are (internally) aliases for others.
Follow POSIX spec for the default headers for the comm, etime, and tty fields.
Problem noted by lotheac (at) iki.fi
ok deraadt@
Diffstat (limited to 'bin/ps')
| -rw-r--r-- | bin/ps/keyword.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index fadd0fc79c9..13eb919d29f 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -1,4 +1,4 @@ -/* $OpenBSD: keyword.c,v 1.38 2013/09/22 17:28:34 guenther Exp $ */ +/* $OpenBSD: keyword.c,v 1.39 2013/10/24 06:21:47 guenther Exp $ */ /* $NetBSD: keyword.c,v 1.12.6.1 1996/05/30 21:25:13 cgd Exp $ */ /*- @@ -93,7 +93,7 @@ VAR var[] = { {"args", "", "command"}, {"blocked", "", "sigmask"}, {"caught", "", "sigcatch"}, - {"comm", "", "ucomm"}, + {"comm", "COMMAND", "ucomm"}, {"command", "COMMAND", NULL, COMM|LJUST|USER, command, 16}, {"cpu", "CPU", NULL, 0, pvar, 3, 0, POFF(p_estcpu), UINT32, "d"}, {"cpuid", "CPUID", NULL, 0, pvar, 8, 0, POFF(p_cpuid), UINT64, "lld"}, @@ -101,7 +101,7 @@ VAR var[] = { {"cwd", "CWD", NULL, LJUST, curwd, CWDLEN}, {"dsiz", "DSIZ", NULL, 0, dsize, 4}, {"emul", "EMUL", NULL, LJUST, emulname, KI_EMULNAMELEN - 1}, - {"etime", "", "start"}, + {"etime", "ELAPSED", "start"}, {"f", "F", NULL, 0, pvar, 7, 0, POFF(p_flag), INT32, "x"}, {"flags", "", "f"}, GID("gid", "GID", pvar, POFF(p_gid)), @@ -258,16 +258,15 @@ findvar(char *p) if (hp) *hp++ = '\0'; +aliased: key.name = p; v = bsearch(&key, var, sizeof(var)/sizeof(VAR) - 1, sizeof(VAR), vcmp); if (v && v->alias) { - if (hp) { - warnx("%s: illegal keyword specification", p); - eval = 1; - } - parsefmt(v->alias); - return (NULL); + p = v->alias; + if (hp == NULL && v->header[0] != '\0') + hp = v->header; + goto aliased; } if (!v) { warnx("%s: keyword not found", p); |