diff options
| author |   jaredy <jaredy@openbsd.org> | 2005-07-20 04:19:08 +0000 |
|---|---|---|
| committer | jaredy <jaredy@openbsd.org> | 2005-07-20 04:19:08 +0000 |
| commit | 305cdd40faf9a7938da21c173e22184982335fce (patch) | |
| tree | 3682dfb704dc3c024997926818f6057602f26a6e | |
| parent | Remove some more dead code and stale comments. (diff) | |
| download | wireguard-openbsd-305cdd40faf9a7938da21c173e22184982335fce.tar.xz wireguard-openbsd-305cdd40faf9a7938da21c173e22184982335fce.zip | |
remove the -M and -N flags to uptime, they do nothing.
w(1) is unaffected by this.
closes PR#4298
ok millert, deraadt
| -rw-r--r-- | usr.bin/w/uptime.1 | 16 | ||||
| -rw-r--r-- | usr.bin/w/w.c | 8 |
2 files changed, 5 insertions, 19 deletions
diff --git a/usr.bin/w/uptime.1 b/usr.bin/w/uptime.1 index c89d58ad5cf..1a84efa60d5 100644 --- a/usr.bin/w/uptime.1 +++ b/usr.bin/w/uptime.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: uptime.1,v 1.12 2003/06/03 02:56:22 millert Exp $ +.\" $OpenBSD: uptime.1,v 1.13 2005/07/20 04:19:08 jaredy Exp $ .\" .\" Copyright (c) 1980, 1990, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -37,8 +37,6 @@ .Nd show how long system has been running .Sh SYNOPSIS .Nm uptime -.Op Fl M Ar core -.Op Fl N Ar system .Sh DESCRIPTION The .Nm uptime @@ -50,18 +48,6 @@ This is the .Dq heading information from .Xr w 1 . -.Pp -The options are as follows: -.Bl -tag -width Ds -.It Fl M Ar core -Extract values associated with the name list from the specified -.Ar core -instead of the running kernel. -.It Fl N Ar system -Extract the name list from the specified -.Ar system -instead of the running kernel. -.El .Sh SEE ALSO .Xr w 1 .Sh HISTORY diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c index 817a97f62e1..4331b1121e4 100644 --- a/usr.bin/w/w.c +++ b/usr.bin/w/w.c @@ -1,4 +1,4 @@ -/* $OpenBSD: w.c,v 1.44 2005/04/11 07:04:47 deraadt Exp $ */ +/* $OpenBSD: w.c,v 1.45 2005/07/20 04:19:08 jaredy Exp $ */ /*- * Copyright (c) 1980, 1991, 1993, 1994 @@ -39,7 +39,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)w.c 8.4 (Berkeley) 4/16/94"; #else -static char *rcsid = "$OpenBSD: w.c,v 1.44 2005/04/11 07:04:47 deraadt Exp $"; +static char *rcsid = "$OpenBSD: w.c,v 1.45 2005/07/20 04:19:08 jaredy Exp $"; #endif #endif /* not lint */ @@ -137,7 +137,7 @@ main(int argc, char *argv[]) p = "hiflM:N:asuw"; } else if (!strcmp(p, "uptime")) { wcmd = 0; - p = "M:N:"; + p = ""; } else errx(1, "this program should be invoked only as \"w\" or \"uptime\""); @@ -468,6 +468,6 @@ usage(int wcmd) "usage: w [-ahi] [-M core] [-N system] [user]\n"); else (void)fprintf(stderr, - "usage: uptime [-M core] [-N system]\n"); + "usage: uptime\n"); exit (1); } |