summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Sobrado <sobrado@cvs.openbsd.org>2008-06-01 21:42:31 +0000
committerIgor Sobrado <sobrado@cvs.openbsd.org>2008-06-01 21:42:31 +0000
commita6ebaab2b2767a2887965914c7e0bb47ae4bf68b (patch)
tree56a4cadde58ab3e8894130f9fb0537e69fe15ad2
parent1d80ff81ec40458f379e535c87d66e735c1b537d (diff)
sort flags; synchronize synopsis and usage.
ok jmc@
-rw-r--r--usr.bin/strings/strings.114
-rw-r--r--usr.bin/strings/strings.c6
2 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/strings/strings.1 b/usr.bin/strings/strings.1
index 2a106de2869..65c10bb8a99 100644
--- a/usr.bin/strings/strings.1
+++ b/usr.bin/strings/strings.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: strings.1,v 1.11 2007/05/31 19:20:17 jmc Exp $
+.\" $OpenBSD: strings.1,v 1.12 2008/06/01 21:42:30 sobrado Exp $
.\" $NetBSD: strings.1,v 1.4 1994/12/10 11:54:28 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -30,7 +30,7 @@
.\"
.\" @(#)strings.1 8.1 (Berkeley) 6/6/93
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 1 2008 $
.Dt STRINGS 1
.Os
.Sh NAME
@@ -39,8 +39,8 @@
.Sh SYNOPSIS
.Nm strings
.Op Fl afo
-.Op Fl n Ar number
.Op Fl m Ar number
+.Op Fl n Ar number
.Op Fl t Ar radix
.Op Ar file ...
.Sh DESCRIPTION
@@ -64,14 +64,14 @@ to search the entire object file.
.It Fl f
Each string is preceded by the name of the file
in which it was found.
-.It Fl n Ar number
-Specifies the minimum number of characters in a sequence to be
-.Ar number ,
-instead of four.
.It Fl m Ar number
Specifies the maximum number of characters in a sequence to be
.Ar number ,
instead of unlimited.
+.It Fl n Ar number
+Specifies the minimum number of characters in a sequence to be
+.Ar number ,
+instead of four.
.It Fl o
Each string is preceded by its octal offset in the file.
.It Fl t Ar radix
diff --git a/usr.bin/strings/strings.c b/usr.bin/strings/strings.c
index 64070a8aa36..d76b5835b37 100644
--- a/usr.bin/strings/strings.c
+++ b/usr.bin/strings/strings.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strings.c,v 1.13 2008/04/23 01:02:19 ray Exp $ */
+/* $OpenBSD: strings.c,v 1.14 2008/06/01 21:42:30 sobrado Exp $ */
/* $NetBSD: strings.c,v 1.7 1995/02/15 15:49:19 jtc Exp $ */
/*
@@ -40,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)strings.c 8.2 (Berkeley) 1/28/94";
#endif
-static char rcsid[] = "$OpenBSD: strings.c,v 1.13 2008/04/23 01:02:19 ray Exp $";
+static char rcsid[] = "$OpenBSD: strings.c,v 1.14 2008/06/01 21:42:30 sobrado Exp $";
#endif /* not lint */
#include <sys/types.h>
@@ -262,6 +262,6 @@ static void
usage(void)
{
(void)fprintf(stderr,
- "usage: strings [-afo] [-n length] [-t {o,d,x}] [file ... ]\n");
+ "usage: strings [-afo] [-m number] [-n number] [-t radix] [file ...]\n");
exit(1);
}