diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2022-01-05 04:10:37 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2022-01-05 04:10:37 +0000 |
| commit | 012aa1dc47e5ebf4c38456a995f2c093db0de9ca (patch) | |
| tree | f9715fc975b717f62b7e5db446c4ee87c130e72f /bin | |
| parent | 8e3d3b9c98f587837563e9caa0bf7ed4bc76432f (diff) | |
Delete 'emul' keyword: it's been just returned 'native' for a long time
ok jsg@ deraadt@
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/ps/extern.h | 3 | ||||
| -rw-r--r-- | bin/ps/keyword.c | 3 | ||||
| -rw-r--r-- | bin/ps/print.c | 12 | ||||
| -rw-r--r-- | bin/ps/ps.1 | 6 |
4 files changed, 5 insertions, 19 deletions
diff --git a/bin/ps/extern.h b/bin/ps/extern.h index 2b27c814705..385229fcc00 100644 --- a/bin/ps/extern.h +++ b/bin/ps/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.22 2021/08/28 20:54:54 chrisz Exp $ */ +/* $OpenBSD: extern.h,v 1.23 2022/01/05 04:10:36 guenther Exp $ */ /* $NetBSD: extern.h,v 1.10 1995/05/21 13:38:27 mycroft Exp $ */ /*- @@ -47,7 +47,6 @@ __BEGIN_DECLS void command(const struct kinfo_proc *, VARENT *); void cputime(const struct kinfo_proc *, VARENT *); int donlist(void); -void emulname(const struct kinfo_proc *, VARENT *); void elapsed(const struct kinfo_proc *, VARENT *); double getpcpu(const struct kinfo_proc *); double getpmem(const struct kinfo_proc *); diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index 2600dd0b8f9..7bef5fbcf87 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -1,4 +1,4 @@ -/* $OpenBSD: keyword.c,v 1.48 2021/08/28 20:54:54 chrisz Exp $ */ +/* $OpenBSD: keyword.c,v 1.49 2022/01/05 04:10:36 guenther Exp $ */ /* $NetBSD: keyword.c,v 1.12.6.1 1996/05/30 21:25:13 cgd Exp $ */ /*- @@ -99,7 +99,6 @@ VAR var[] = { {"cputime", "", "time"}, {"cwd", "CWD", NULL, LJUST, curwd, CWDLEN}, {"dsiz", "DSIZ", NULL, 0, dsize, 4}, - {"emul", "EMUL", NULL, LJUST, emulname, KI_EMULNAMELEN - 1}, {"etime", "ELAPSED", NULL, USER, elapsed, 12}, {"f", "F", NULL, 0, pvar, 7, 0, POFF(p_flag), INT32, "x"}, {"flags", "", "f"}, diff --git a/bin/ps/print.c b/bin/ps/print.c index 29ae2ec06cb..40e0622420f 100644 --- a/bin/ps/print.c +++ b/bin/ps/print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print.c,v 1.78 2021/12/01 18:21:23 deraadt Exp $ */ +/* $OpenBSD: print.c,v 1.79 2022/01/05 04:10:36 guenther Exp $ */ /* $NetBSD: print.c,v 1.27 1995/09/29 21:58:12 cgd Exp $ */ /*- @@ -786,13 +786,3 @@ pvar(const struct kinfo_proc *kp, VARENT *ve) else printval((char *)kp + v->off, v); } - -void -emulname(const struct kinfo_proc *kp, VARENT *ve) -{ - VAR *v; - - v = ve->var; - - (void)printf("%-*s", (int)v->width, kp->p_emul); -} diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index 4415a340a84..f66148333d0 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ps.1,v 1.118 2021/08/28 20:54:54 chrisz Exp $ +.\" $OpenBSD: ps.1,v 1.119 2022/01/05 04:10:36 guenther Exp $ .\" $NetBSD: ps.1,v 1.16 1996/03/21 01:36:28 jtc Exp $ .\" .\" Copyright (c) 1980, 1990, 1991, 1993, 1994 @@ -30,7 +30,7 @@ .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" -.Dd $Mdocdate: August 28 2021 $ +.Dd $Mdocdate: January 5 2022 $ .Dt PS 1 .Os .Sh NAME @@ -209,8 +209,6 @@ CPU ID (zero on single processor systems). Current working directory. .It Cm dsiz Data size, in Kilobytes. -.It Cm emul -Name of system call emulation environment. .It Cm etime Elapsed time since the process was started. .It Cm flags |