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.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 550111b3ae33cbe8e2aab724698153eceeb2e32c..062cec4eed45ea4a7f6a447c3b78909a78a1eff2 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,5 +1,9 @@
 2015-03-10  Nick Clifton  <nickc@redhat.com>
 
+       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 d0b66aedf443579d4161e76f7d3984a805a831db..771d29dbce600b8a1a312732aed138f8bc8224b2 100644 (file)
--- 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);