pretty usage and sort options. started by Andrey Matveev

2 files changed, 11 insertions, 11 deletions

diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1
index 68060674279..e0cc233ab38 100644
--- a/usr.bin/nfsstat/nfsstat.1
+++ b/usr.bin/nfsstat/nfsstat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: nfsstat.1,v 1.11 2003/10/20 21:10:19 jmc Exp $
+.\"	$OpenBSD: nfsstat.1,v 1.12 2004/03/02 20:49:41 tedu Exp $
 .\"	$NetBSD: nfsstat.1,v 1.8 1996/03/03 17:21:28 thorpej Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -40,11 +40,10 @@
 statistics
 .Sh SYNOPSIS
 .Nm nfsstat
+.Op Fl cs
 .Op Fl M Ar core
 .Op Fl N Ar system
 .Op Fl w Ar wait
-.Op Fl s
-.Op Fl c
 .Sh DESCRIPTION
 .Nm
 displays statistics kept about
@@ -63,6 +62,8 @@ data by means of
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
+.It Fl c
+Display client statistics only.
 .It Fl M Ar core
 Extract values associated with the name list from the specified core
 instead of the default
@@ -70,16 +71,14 @@ instead of the default
 .It Fl N Ar system
 Extract the name list from the specified system instead of the default
 .Pa /bsd .
+.It Fl s
+Display server statistics only.
 .It Fl w Ar wait
 Display a shorter summary of
 .Tn NFS
 activity for both the client and server at
 .Ar wait
 second intervals.
-.It Fl s
-Display server statistics only.
-.It Fl c
-Display client statistics only.
 .El
 .Sh FILES
 .Bl -tag -width /dev/kmem -compact
diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c
index 24de2bfc461..43329b78988 100644
--- a/usr.bin/nfsstat/nfsstat.c
+++ b/usr.bin/nfsstat/nfsstat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfsstat.c,v 1.21 2003/07/07 21:36:52 deraadt Exp $	*/
+/*	$OpenBSD: nfsstat.c,v 1.22 2004/03/02 20:49:41 tedu Exp $	*/
 /*	$NetBSD: nfsstat.c,v 1.7 1996/03/03 17:21:30 thorpej Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 static char sccsid[] = "from: @(#)nfsstat.c	8.1 (Berkeley) 6/6/93";
 static char *rcsid = "$NetBSD: nfsstat.c,v 1.7 1996/03/03 17:21:30 thorpej Exp $";
 #else
-static char *rcsid = "$OpenBSD: nfsstat.c,v 1.21 2003/07/07 21:36:52 deraadt Exp $";
+static char *rcsid = "$OpenBSD: nfsstat.c,v 1.22 2004/03/02 20:49:41 tedu Exp $";
 #endif
 #endif /* not lint */
 
@@ -101,7 +101,7 @@ main(int argc, char *argv[])
 
 	interval = 0;
 	memf = nlistf = NULL;
-	while ((ch = getopt(argc, argv, "M:N:w:sc")) != -1)
+	while ((ch = getopt(argc, argv, "cM:N:sw:")) != -1)
 		switch(ch) {
 		case 'M':
 			memf = optarg;
@@ -418,8 +418,9 @@ void
 usage(void)
 {
 	extern char *__progname;
+
 	fprintf(stderr,
-	    "usage: %s [-M core] [-N system] [-s] [-c] [-w interval]\n",
+	    "usage: %s [-cs] [-M core] [-N system] [-w interval]\n",
 	    __progname);
 	exit(1);
 }