summaryrefslogtreecommitdiff
path: root/usr.bin/hexdump/odsyntax.c
diff options
context:
space:
mode:
authorIgor Sobrado <sobrado@cvs.openbsd.org>2014-04-14 22:51:21 +0000
committerIgor Sobrado <sobrado@cvs.openbsd.org>2014-04-14 22:51:21 +0000
commitf6c98e4c7c6f0d5c03d8c62b30a0719d2d094a1b (patch)
tree9bbaf9617d9f74438e1f41364e0dcf7cbd45e188 /usr.bin/hexdump/odsyntax.c
parent5fb10959da9ac9e7a924e997f4c2c3924a334902 (diff)
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@
Diffstat (limited to 'usr.bin/hexdump/odsyntax.c')
-rw-r--r--usr.bin/hexdump/odsyntax.c15
1 files changed, 2 insertions, 13 deletions
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();
}