From b5604ef9ee8a6a6105445360d0d528266ca101e0 Mon Sep 17 00:00:00 2001
From: Jason McIntyre <jmc@cvs.openbsd.org>
Date: Thu, 8 Apr 2004 20:09:00 +0000
Subject: sort options and sync usage();

---
 usr.bin/locate/locate/locate.1 | 12 ++++++------
 usr.bin/locate/locate/locate.c | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index d3ce2615e88..fd1b4fd6146 100644
--- a/usr.bin/locate/locate/locate.1
+++ b/usr.bin/locate/locate/locate.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: locate.1,v 1.21 2003/09/25 18:06:23 jmc Exp $
+.\"	$OpenBSD: locate.1,v 1.22 2004/04/08 20:08:59 jmc Exp $
 .\"
 .\" Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
 .\" Copyright (c) 1990, 1993
@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)locate.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: locate.1,v 1.21 2003/09/25 18:06:23 jmc Exp $
+.\"	$Id: locate.1,v 1.22 2004/04/08 20:08:59 jmc Exp $
 .\"
 .Dd June 6, 1993
 .Dt LOCATE 1
@@ -39,9 +39,9 @@
 .Nd find filenames quickly
 .Sh SYNOPSIS
 .Nm locate
-.Op Fl Scims
-.Op Fl l Ar limit
+.Op Fl cimSs
 .Op Fl d Ar database
+.Op Fl l Ar limit
 .Ar pattern Op Ar ...
 .Sh DESCRIPTION
 The
@@ -90,8 +90,6 @@ Characters less than 32 or greater than 127 are stored as 2 bytes.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
-.It Fl S
-Print some statistics about the database and exit.
 .It Fl c
 Suppress normal output; instead print a count of matching file names.
 .It Fl d Ar database
@@ -169,6 +167,8 @@ instead of the
 library.
 This is the default behavior.
 Usually faster in most cases.
+.It Fl S
+Print some statistics about the database and exit.
 .It Fl s
 Use the
 .Xr stdio 3
diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c
index 21d1e047cac..d5ee402d082 100644
--- a/usr.bin/locate/locate/locate.c
+++ b/usr.bin/locate/locate/locate.c
@@ -1,5 +1,5 @@
 /*
- *	$OpenBSD: locate.c,v 1.17 2003/09/29 16:03:16 deraadt Exp $
+ *	$OpenBSD: locate.c,v 1.18 2004/04/08 20:08:59 jmc Exp $
  *
  * Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
  * Copyright (c) 1989, 1993
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: locate.c,v 1.17 2003/09/29 16:03:16 deraadt Exp $
+ *      $Id: locate.c,v 1.18 2004/04/08 20:08:59 jmc Exp $
  */
 
 #ifndef lint
@@ -46,7 +46,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)locate.c    8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: locate.c,v 1.17 2003/09/29 16:03:16 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: locate.c,v 1.18 2004/04/08 20:08:59 jmc Exp $";
 #endif
 #endif /* not lint */
 
@@ -332,8 +332,8 @@ cputime(void)
 void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: locate [-Scims] [-l limit] ");
-	(void)fprintf(stderr, "[-d database] pattern ...\n");
+	(void)fprintf(stderr, "usage: locate [-cimSs] [-d database] ");
+	(void)fprintf(stderr, "[-l limit] pattern ...\n");
 	(void)fprintf(stderr, "default database: `%s' or $LOCATE_PATH\n",
 	    _PATH_FCODES);
 	exit(1);
-- 
cgit v1.2.3