add a description for this filter similar to what POSIX and FreeBSD use;

do not mark od(1) as deprecated, and remove language that says it is really
just hexdump(1); do not mention options supported by the old 4.3BSD od(1)
that we no longer provide.

ok jmc@, millert@

2 files changed, 7 insertions, 33 deletions

diff --git a/usr.bin/hexdump/od.1 b/usr.bin/hexdump/od.1
index 93b9ec362e2..7b0b339bac1 100644
--- a/usr.bin/hexdump/od.1
+++ b/usr.bin/hexdump/od.1
@@ -1,4 +1,4 @@
-.\"  $OpenBSD: od.1,v 1.25 2011/05/06 19:26:22 jmc Exp $
+.\"  $OpenBSD: od.1,v 1.26 2014/04/14 22:51:20 sobrado Exp $
 .\"  $NetBSD: od.1,v 1.16 2001/12/07 01:23:42 bjh21 Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"/
-.Dd $Mdocdate: May 6 2011 $
+.Dd $Mdocdate: April 14 2014 $
 .Dt OD 1
 .Os
 .Sh NAME
@@ -53,25 +53,10 @@
 .Op Ar
 .Ek
 .Sh DESCRIPTION
+The
 .Nm
-has been deprecated in favor of
-.Xr hexdump 1 .
-.Pp
-.Xr hexdump 1 ,
-if called as
-.Nm od ,
-provides compatibility for the options described below.
-It does not provide compatibility for the
-.Fl s
-option (see
-.Xr strings 1 )
-or the
-.Fl P ,
-.Fl p ,
-or
-.Fl w
-options, nor is compatibility provided for the ``label'' component
-of the offset syntax.
+utility is a filter which displays the specified files, or standard
+input if no files are specified, in a user specified format.
 .Pp
 The options are as follows:
 .Bl -tag -width Fl
diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c
index 7fb9cefa929..60e9c2020d0 100644
--- a/usr.bin/hexdump/odsyntax.c
+++ b/usr.bin/hexdump/odsyntax.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: odsyntax.c,v 1.22 2013/11/20 21:21:50 deraadt Exp $	*/
+/*	$OpenBSD: odsyntax.c,v 1.23 2014/04/14 22:51:20 sobrado Exp $	*/
 /*	$NetBSD: odsyntax.c,v 1.15 2001/12/07 15:14:29 bjh21 Exp $	*/
 
 /*-
@@ -90,7 +90,7 @@ oldsyntax(int argc, char ***argvp)
 	deprecated = 1;
 	argv = *argvp;
 	while ((ch = getopt(argc, argv,
-	    "A:aBbcDdeFfHhIij:LlN:OoPpst:wvXx")) != -1)
+	    "A:aBbcDdeFfHhIij:LlN:Oot:vXx")) != -1)
 		switch (ch) {
 		case 'A':
 			switch (*optarg) {
@@ -177,18 +177,7 @@ oldsyntax(int argc, char ***argvp)
 		case 'v':
 			vflag = ALL;
 			break;
-		case 'P':
-		case 'p':
-		case 's':
-		case 'w':
-		case '?':
 		default:
-			warnx("od(1) has been deprecated for hexdump(1).");
-			if (ch != '?')
-				warnx(
-				    "hexdump(1) compatibility doesn't"
-				    " support the -%c option%s",
-				    ch, ch == 's' ? "; see strings(1)." : ".");
 			oldusage();
 		}