From 4ccf1137046d3f28bf2f2781a095ecd225294fd8 Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Sun, 8 Sep 2013 17:09:09 +0100 Subject: hexdump: revert global exitval variable change The change f2a037fb7b153954d5d34cca48182b6d8832fcfa had unfavorable effect of making hexdump to return non-zero exit value always. This happen because oversight when 'exitval' gets to be set. By clance, one might expect main() to call next() which will return value for 'exitval'. That assessment misses later call chain main() -> display() -> get() -> next(), which in reverse should return correct value for 'exitval'. It was mentioned in util-linux maillist that Ondrej Oprala is working on major renewal of the hexdump . That in mind it seems best to simply to revert the global 'exitval' and avoid conflict with Ondrej's work. Reference: http://markmail.org/message/sbnvuhkboreujj5p Reported-by: Dave Reisner CC: Ondrej Oprala Signed-off-by: Sami Kerola --- text-utils/hexdump.h | 1 + 1 file changed, 1 insertion(+) (limited to 'text-utils/hexdump.h') diff --git a/text-utils/hexdump.h b/text-utils/hexdump.h index b2ea1f152..fa8f632c1 100644 --- a/text-utils/hexdump.h +++ b/text-utils/hexdump.h @@ -73,6 +73,7 @@ typedef struct _fs { /* format strings */ extern FU *endfu; extern FS *fshead; /* head of format strings list */ extern ssize_t blocksize; /* data block size */ +extern int exitval; /* final exit value */ extern ssize_t length; /* max bytes to read */ extern off_t skip; /* bytes to skip */ -- cgit v1.2.3-55-g7522