From 59bbaa1950af91de0a6ce6127d1622cd9211daa8 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 22 Jun 1998 22:28:49 +0000 Subject: [PATCH] * readelf.c: Include bfd.h and bucomm.h before system header files. (parse_args): Change type of c from char to int. --- binutils/ChangeLog | 10 ++++++++++ binutils/readelf.c | 51 ++++++++++++++++++++++++++++----------------------- 2 files changed, 38 insertions(+), 23 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 6413b9b..29224c4 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,13 @@ +Mon Jun 22 18:28:19 1998 Ian Lance Taylor + + * readelf.c: Include bfd.h and bucomm.h before system header + files. + (parse_args): Change type of c from char to int. + +Sun Jun 14 14:26:28 1998 Nick Clifton + + * readelf.c (usage): Write to stdout, not stderr. + Fri Jun 12 13:33:51 1998 Tom Tromey * po/Make-in (all-yes): Depend on .pot file if maintainer mode diff --git a/binutils/readelf.c b/binutils/readelf.c index 450675a..c0e16ae 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -20,14 +20,15 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + +#include "bfd.h" +#include "bucomm.h" #include #include #include #include "readelf.h" -#include "bucomm.h" #include "getopt.h" #ifdef ANSI_PROTOTYPES @@ -1015,26 +1016,27 @@ struct option options [] = static void usage () { - fprintf (stderr, _("Usage: readelf {options} elf-file(s)\n")); - fprintf (stderr, _(" Options are:\n")); - fprintf (stderr, _(" -a or --all Display all the information\n")); - fprintf (stderr, _(" -h or --file-header Display the ELF file header\n")); - fprintf (stderr, _(" -l or --program-headers or --segments\n")); - fprintf (stderr, _(" Display the program headers\n")); - fprintf (stderr, _(" -S or --sections Display the sections' headers\n")); - fprintf (stderr, _(" -s or --symbols Display the symbol table\n")); - fprintf (stderr, _(" -r or --relocs Display the relocations (if present)\n")); - fprintf (stderr, _(" -d or --dynamic Display the dynamic section (if present)\n")); - fprintf (stderr, _(" -V or --version-info Display the version sections (if present)\n")); - fprintf (stderr, _(" -D or --use-dynamic Use the dynamic section info when displaying symbols\n")); - fprintf (stderr, _(" -x or --hex-dump=\n")); - fprintf (stderr, _(" Dump the contents of section \n")); + fprintf (stdout, _("Usage: readelf {options} elf-file(s)\n")); + fprintf (stdout, _(" Options are:\n")); + fprintf (stdout, _(" -a or --all Display all the information\n")); + fprintf (stdout, _(" -h or --file-header Display the ELF file header\n")); + fprintf (stdout, _(" -l or --program-headers or --segments\n")); + fprintf (stdout, _(" Display the program headers\n")); + fprintf (stdout, _(" -S or --sections Display the sections' headers\n")); + fprintf (stdout, _(" -s or --symbols Display the symbol table\n")); + fprintf (stdout, _(" -r or --relocs Display the relocations (if present)\n")); + fprintf (stdout, _(" -d or --dynamic Display the dynamic section (if present)\n")); + fprintf (stdout, _(" -V or --version-info Display the version sections (if present)\n")); + fprintf (stdout, _(" -D or --use-dynamic Use the dynamic section info when displaying symbols\n")); + fprintf (stdout, _(" -x or --hex-dump=\n")); + fprintf (stdout, _(" Dump the contents of section \n")); #ifdef SUPPORT_DISASSEMBLY - fprintf (stderr, _(" -i or --instruction-dump=\n")); - fprintf (stderr, _(" Disassemble the contents of section \n")); + fprintf (stdout, _(" -i or --instruction-dump=\n")); + fprintf (stdout, _(" Disassemble the contents of section \n")); #endif - fprintf (stderr, _(" -v or --version Display the version number of readelf\n")); - fprintf (stderr, _(" -H or --help Display this information\n")); + fprintf (stdout, _(" -v or --version Display the version number of readelf\n")); + fprintf (stdout, _(" -H or --help Display this information\n")); + fprintf (stdout, _("Report bugs to bug-gnu-utils@gnu.org\n")); exit (0); } @@ -1044,8 +1046,8 @@ parse_args (argc, argv) int argc; char ** argv; { - char c; - + int c; + if (argc < 2) usage (); @@ -1131,7 +1133,10 @@ parse_args (argc, argv) && !do_load && !do_header && !do_dump && !do_version) usage (); else if (argc < 3) - warn (_("Nothing to do.\n")); + { + warn (_("Nothing to do.\n")); + usage(); + } } static int -- 2.7.4