summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2004-08-18 21:27:21 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2004-08-18 21:27:21 +0000
commit8a780aa35cf4f3d72fb1ddaeba1e0b79393b4b63 (patch)
tree6fc9059b3f3cb37f8184218958d9088ca43b12c4 /usr.bin
parentf3b03756281a9aa2eeea1d46ea58ee45394bb2b4 (diff)
- .Xr utmp 5
- sort options and sync usage()
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/w/w.111
-rw-r--r--usr.bin/w/w.c6
2 files changed, 9 insertions, 8 deletions
diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1
index 5fbe186ad55..0eb69e4a7ed 100644
--- a/usr.bin/w/w.1
+++ b/usr.bin/w/w.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: w.1,v 1.15 2003/06/10 09:12:12 jmc Exp $
+.\" $OpenBSD: w.1,v 1.16 2004/08/18 21:27:20 jmc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -37,7 +37,7 @@
.Nd "display users who are logged on and what they are doing"
.Sh SYNOPSIS
.Nm w
-.Op Fl hia
+.Op Fl ahi
.Op Fl M Ar core
.Op Fl N Ar system
.Op Ar user
@@ -59,6 +59,8 @@ and the name and arguments of the current process.
.Pp
The options are as follows:
.Bl -tag -width Ds
+.It Fl a
+Attempt to translate network addresses into names.
.It Fl h
Suppress the heading.
.It Fl i
@@ -71,8 +73,6 @@ instead of the running kernel.
Extract the name list from the specified
.Ar system
instead of the running kernel.
-.It Fl a
-Attempt to translate network addresses into names.
.El
.Pp
If a
@@ -87,7 +87,8 @@ list of users on the system
.Xr finger 1 ,
.Xr ps 1 ,
.Xr uptime 1 ,
-.Xr who 1
+.Xr who 1 ,
+.Xr utmp 5
.Sh STANDARDS
The
.Fl f ,
diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index f07bd6f3ce8..280604dcf47 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: w.c,v 1.41 2004/01/08 18:14:51 millert Exp $ */
+/* $OpenBSD: w.c,v 1.42 2004/08/18 21:27:20 jmc 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.41 2004/01/08 18:14:51 millert Exp $";
+static char *rcsid = "$OpenBSD: w.c,v 1.42 2004/08/18 21:27:20 jmc Exp $";
#endif
#endif /* not lint */
@@ -466,7 +466,7 @@ usage(int wcmd)
{
if (wcmd)
(void)fprintf(stderr,
- "usage: w [-hia] [-M core] [-N system] [user]\n");
+ "usage: w [-ahi] [-M core] [-N system] [user]\n");
else
(void)fprintf(stderr,
"usage: uptime [-M core] [-N system]\n");