From: Sami Kerola <kerolasa@iki.fi>
Date: Sun, 28 Sep 2014 19:51:36 +0000 (+0100)
Subject: hexdump: remove deprecation message
X-Git-Tag: v2.26-rc1~427
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf60e9f12d9bcf7d87581c69cbc103c18f7d001a;p=thirdparty%2Futil-linux.git

hexdump: remove deprecation message

Message 'calling hexdump as od has been deprecated in favor of GNU
coreutils od' has informed the hexdump not to be used like that for three
and half years, and five releases.  It is time to get rid of notice.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/text-utils/hexdump.c b/text-utils/hexdump.c
index 50b593eb6e..afae334722 100644
--- a/text-utils/hexdump.c
+++ b/text-utils/hexdump.c
@@ -179,7 +179,6 @@ int main(int argc, char **argv)
 	struct list_head *p;
 	struct hexdump_fs *tfs;
 	int ret;
-	char *c;
 
 	struct hexdump *hex = xcalloc(1, sizeof (struct hexdump));
 	hex->length = -1;
@@ -190,11 +189,7 @@ int main(int argc, char **argv)
 	textdomain(PACKAGE);
 	atexit(close_stdout);
 
-	if (!(c = strrchr(argv[0], 'o')) || strcmp(c, "od")) {
-		argv += parse_args(argc, argv, hex);
-	} else
-		errx(EXIT_FAILURE, _("calling hexdump as od has been deprecated "
-				     "in favor of GNU coreutils od"));
+	argv += parse_args(argc, argv, hex);
 
 	/* figure out the data block size */
 	hex->blocksize = 0;