diff options
| author | Christian Weisgerber <naddy@cvs.openbsd.org> | 2002-02-10 21:07:01 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@cvs.openbsd.org> | 2002-02-10 21:07:01 +0000 |
| commit | 320c977ad38556c7129cea13948e6dd65c73f02c (patch) | |
| tree | 40cc61900baaed8dd6c824721171dfb069cce7b1 /bin | |
| parent | 9d8e6c99a8654a2776a7d62d1e8a03dbaa000071 (diff) | |
remove pre-ansi, SCCS workaround cruft; ok deraadt@
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/ps/print.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/bin/ps/print.c b/bin/ps/print.c index 9dcc4f7d386..32e31296841 100644 --- a/bin/ps/print.c +++ b/bin/ps/print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print.c,v 1.23 2002/01/30 17:52:40 mickey Exp $ */ +/* $OpenBSD: print.c,v 1.24 2002/02/10 21:07:00 naddy Exp $ */ /* $NetBSD: print.c,v 1.27 1995/09/29 21:58:12 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94"; #else -static char rcsid[] = "$OpenBSD: print.c,v 1.23 2002/01/30 17:52:40 mickey Exp $"; +static char rcsid[] = "$OpenBSD: print.c,v 1.24 2002/02/10 21:07:00 naddy Exp $"; #endif #endif /* not lint */ @@ -399,13 +399,9 @@ started(k, ve) if (!now) (void)time(&now); if (now - k->ki_u.u_start.tv_sec < 24 * SECSPERHOUR) { - /* I *hate* SCCS... */ - static char fmt[] = __CONCAT("%l:%", "M%p"); - (void)strftime(buf, sizeof(buf) - 1, fmt, tp); + (void)strftime(buf, sizeof(buf) - 1, "%l:%M%p", tp); } else if (now - k->ki_u.u_start.tv_sec < 7 * SECSPERDAY) { - /* I *hate* SCCS... */ - static char fmt[] = __CONCAT("%a%", "I%p"); - (void)strftime(buf, sizeof(buf) - 1, fmt, tp); + (void)strftime(buf, sizeof(buf) - 1, "%a%I%p", tp); } else (void)strftime(buf, sizeof(buf) - 1, "%e%b%y", tp); (void)printf("%-*s", v->width, buf); |