From: Phil Ruffwind <rf@rufflewind.com>
Date: Sun, 6 Mar 2016 18:45:02 +0000 (-0500)
Subject: hexdump: certain long options should not accept arguments
X-Git-Tag: v2.28-rc1~52^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=925ced8353fe1225abb87b522f0fe14bf0aed589;p=thirdparty%2Futil-linux.git

hexdump: certain long options should not accept arguments

As documented in the manual and the usage info, the long options
--one-byte-char, --canonical, and --two-bytes-octal should not accept
any arguments.

Signed-off-by: Phil Ruffwind <rf@rufflewind.com>
---

diff --git a/text-utils/hexdump.c b/text-utils/hexdump.c
index cc1fdf1b8b..9d26c4e480 100644
--- a/text-utils/hexdump.c
+++ b/text-utils/hexdump.c
@@ -66,10 +66,10 @@ parse_args(int argc, char **argv, struct hexdump *hex)
 
 	static const struct option longopts[] = {
 		{"one-byte-octal", no_argument, NULL, 'b'},
-		{"one-byte-char", required_argument, NULL, 'c'},
-		{"canonical", required_argument, NULL, 'C'},
+		{"one-byte-char", no_argument, NULL, 'c'},
+		{"canonical", no_argument, NULL, 'C'},
 		{"two-bytes-decimal", no_argument, NULL, 'd'},
-		{"two-bytes-octal", required_argument, NULL, 'o'},
+		{"two-bytes-octal", no_argument, NULL, 'o'},
 		{"two-bytes-hex", no_argument, NULL, 'x'},
 		{"format", required_argument, NULL, 'e'},
 		{"format-file", required_argument, NULL, 'f'},