From b6370efb1efe39e62abd01e95c7957834c8bdf47 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 10 Mar 2015 13:44:51 +0000 Subject: [PATCH] Fixes "readelf -s --wide" not returning an error status or help message. PR binutils/18101 * readelf.c (parse_args): Enhance check for nothing to do by accounting for the --wide option. --- binutils/ChangeLog | 4 ++++ binutils/readelf.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 550111b3ae3..062cec4eed4 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,5 +1,9 @@ 2015-03-10 Nick Clifton + PR binutils/18101 + * readelf.c (parse_args): Enhance check for nothing to do by + accounting for the --wide option. + PR binutils/17636 * objcopy.c (copy_object): Avoid calling fatal as that does not allow the parent to clean up temporary files. diff --git a/binutils/readelf.c b/binutils/readelf.c index d0b66aedf44..771d29dbce6 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -4232,7 +4232,7 @@ parse_args (int argc, char ** argv) && !do_section_groups && !do_archive_index && !do_dyn_syms) usage (stderr); - else if (argc < 3) + else if (argc < 3 || (do_wide && argc < 4)) { warn (_("Nothing to do.\n")); usage (stderr); -- 2.30.2