simplify synopsis and usage(); from Igor Sobrado

2 files changed, 8 insertions, 17 deletions

diff --git a/sbin/quotacheck/quotacheck.8 b/sbin/quotacheck/quotacheck.8
index 7d0dd8f0172..641bc91e3cc 100644
--- a/sbin/quotacheck/quotacheck.8
+++ b/sbin/quotacheck/quotacheck.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: quotacheck.8,v 1.12 2003/06/02 20:06:16 millert Exp $
+.\"	$OpenBSD: quotacheck.8,v 1.13 2007/02/21 06:22:25 jmc Exp $
 .\"	$NetBSD: quotacheck.8,v 1.4 1995/03/18 14:59:20 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1991, 1993
@@ -41,18 +41,9 @@
 .Nd filesystem quota consistency checker
 .Sh SYNOPSIS
 .Nm quotacheck
-.Op Fl d
-.Op Fl g
-.Op Fl u
-.Op Fl v
-.Ar filesystem Op Ar ...
-.Nm quotacheck
-.Op Fl d
-.Op Fl g
+.Op Fl adguv
 .Op Fl l Ar maxparallel
-.Op Fl u
-.Op Fl v
-.Fl a
+.Ar filesystem Ar ...
 .Sh DESCRIPTION
 .Nm
 examines each filesystem,
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index 634ecdb40d6..7e9feadbd78 100644
--- a/sbin/quotacheck/quotacheck.c
+++ b/sbin/quotacheck/quotacheck.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: quotacheck.c,v 1.20 2005/04/05 00:13:49 deraadt Exp $	*/
+/*	$OpenBSD: quotacheck.c,v 1.21 2007/02/21 06:22:25 jmc Exp $	*/
 /*	$NetBSD: quotacheck.c,v 1.12 1996/03/30 22:34:25 mark Exp $	*/
 
 /*
@@ -43,7 +43,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)quotacheck.c	8.3 (Berkeley) 1/29/94";
 #else
-static char rcsid[] = "$OpenBSD: quotacheck.c,v 1.20 2005/04/05 00:13:49 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: quotacheck.c,v 1.21 2007/02/21 06:22:25 jmc Exp $";
 #endif
 #endif /* not lint */
 
@@ -207,9 +207,9 @@ main(int argc, char *argv[])
 void
 usage(void)
 {
-	(void)fprintf(stderr, "usage:\t%s\n\t%s\n",
-	    "quotacheck -a [-dguv] [-l <maxparallel>]",
-	    "quotacheck [-dguv] filesys ...");
+	extern char *__progname;
+	(void)fprintf(stderr, "usage: %s [-adguv] [-l maxparallel] "
+	    "filesystem ...\n", __progname);
 	exit(1);
 }