darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* nlmconv.c (main), objcopy.c (copy_file): Print matching formats

Browse source 
if ambiguous match.
	* nm.c (display_file), size.c (display_bfd): Eliminate gotos.
	Print matching formats if there is an ambiguous match.  Use
	bfd_nonfatal instead of hardcoded error message if nothing matches.

	* arsup.c, ar.c, objdump.c: Use bfd_get_filename instead of
	abfd->filename.

	* nm.c (display_archive): New function, from code in display_file.
	(display_rel_file): Renamed from do_one_rel_file.

	* size.c: Indent.
	(display_archive): New function from code in display_file.
	(display_file): Check bfd_close error return.

	* strings.c (strings_object_file): Check bfd_check_format
	error return.

	* strings.c, objdump.c, size.c: Use bfd_nonfatal instead of bfd_perror.

	* bucomm.c: Delete references to exit_handler.  It wasn't set
	anywhere, and now that we're using the libiberty xmalloc, it
	wouldn't always get called before exiting.
	(list_matching_formats): Function moved from objdump.c.
	* bucomm.h: Declare it.

	* objdump.c (disassemble_data): Move some variable decls closer to
	their use.  Add some comments.  Replace a nested block with a
	return.
This commit is contained in:
David MacKenzie 1994-02-03 00:25:30 +00:00
parent b4bd2c92c5
commit cef35d4882
8 changed files with 1141 additions and 561 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
binutils/ChangeLog
View file

@ -1,3 +1,36 @@
Wed Feb 2 13:42:23 1994 David J. Mackenzie (djm@thepub.cygnus.com)
* nlmconv.c (main), objcopy.c (copy_file): Print matching formats
if ambiguous match.
* nm.c (display_file), size.c (display_bfd): Eliminate gotos.
Print matching formats if there is an ambiguous match. Use
bfd_nonfatal instead of hardcoded error message if nothing matches.
* arsup.c, ar.c, objdump.c: Use bfd_get_filename instead of
abfd->filename.
* nm.c (display_archive): New function, from code in display_file.
(display_rel_file): Renamed from do_one_rel_file.
* size.c: Indent.
(display_archive): New function from code in display_file.
(display_file): Check bfd_close error return.
* strings.c (strings_object_file): Check bfd_check_format
error return.
* strings.c, objdump.c, size.c: Use bfd_nonfatal instead of bfd_perror.
* bucomm.c: Delete references to exit_handler. It wasn't set
anywhere, and now that we're using the libiberty xmalloc, it
wouldn't always get called before exiting.
(list_matching_formats): Function moved from objdump.c.
* bucomm.h: Declare it.
* objdump.c (disassemble_data): Move some variable decls closer to
their use. Add some comments. Replace a nested block with a
return.
Mon Jan 31 18:50:41 1994 Stan Shebs (shebs@andros.cygnus.com)
* objdump.c (display_target_list, display_info_table): Check that

24
binutils/ar.c
View file

@ -502,10 +502,10 @@ print_contents(abfd)
struct stat buf;
long size;
if (bfd_stat_arch_elt(abfd, &buf) != 0)
fatal("internal stat error on %s", abfd->filename);
fatal("internal stat error on %s", bfd_get_filename (abfd));
if (verbose)
printf("\n<member %s>\n\n", abfd->filename);
printf("\n<member %s>\n\n", bfd_get_filename (abfd));
bfd_seek(abfd, 0, SEEK_SET);
@ -552,20 +552,20 @@ extract_file(abfd)
long size;
struct stat buf;
if (bfd_stat_arch_elt(abfd, &buf) != 0)
fatal("internal stat error on %s", abfd->filename);
fatal("internal stat error on %s", bfd_get_filename (abfd));
size = buf.st_size;
if (verbose)
printf("x - %s\n", abfd->filename);
printf("x - %s\n", bfd_get_filename (abfd));
bfd_seek(abfd, 0, SEEK_SET);
ostream = 0;
if (size == 0) {
/* Seems like an abstraction violation, eh? Well it's OK! */
ostream = fopen(abfd->filename, FOPEN_WB);
ostream = fopen(bfd_get_filename (abfd), FOPEN_WB);
if (!ostream) {
perror(abfd->filename);
perror(bfd_get_filename (abfd));
exit(1);
}
} else
@ -581,9 +581,9 @@ extract_file(abfd)
/* See comment above; this saves disk arm motion */
if (!ostream) {
/* Seems like an abstraction violation, eh? Well it's OK! */
ostream = fopen(abfd->filename, FOPEN_WB);
ostream = fopen(bfd_get_filename (abfd), FOPEN_WB);
if (!ostream) {
perror(abfd->filename);
perror(bfd_get_filename (abfd));
exit(1);
}
}
@ -592,27 +592,27 @@ extract_file(abfd)
}
fclose(ostream);
chmod(abfd->filename, buf.st_mode);
chmod(bfd_get_filename (abfd), buf.st_mode);
if (preserve_dates) {
#ifdef POSIX_UTIME
struct utimbuf tb;
tb.actime = buf.st_mtime;
tb.modtime = buf.st_mtime;
utime(abfd->filename, &tb); /* FIXME check result */
utime(bfd_get_filename (abfd), &tb); /* FIXME check result */
#else /* ! POSIX_UTIME */
#ifdef USE_UTIME
long tb[2];
tb[0] = buf.st_mtime;
tb[1] = buf.st_mtime;
utime(abfd->filename, tb); /* FIXME check result */
utime(bfd_get_filename (abfd), tb); /* FIXME check result */
#else /* ! USE_UTIME */
struct timeval tv[2];
tv[0].tv_sec = buf.st_mtime;
tv[0].tv_usec = 0;
tv[1].tv_sec = buf.st_mtime;
tv[1].tv_usec = 0;
utimes(abfd->filename, tv); /* FIXME check result */
utimes(bfd_get_filename (abfd), tv); /* FIXME check result */
#endif /* ! USE_UTIME */
#endif /* ! POSIX_UTIME */
}

15
binutils/nlmconv.c
View file

@ -171,6 +171,7 @@ main (argc, argv)
Nlm_Internal_Fixed_Header sharedhdr;
int len;
char *modname;
char **matching;
program_name = argv[0];
@ -296,8 +297,16 @@ main (argc, argv)
if (inbfd == NULL)
bfd_fatal (input_file);
if (! bfd_check_format (inbfd, bfd_object))
bfd_fatal (input_file);
if (! bfd_check_format_matches (inbfd, bfd_object, &matching))
{
bfd_nonfatal (input_file);
if (bfd_error == file_ambiguously_recognized)
{
list_matching_formats (matching);
free (matching);
}
exit (1);
}
if (output_format == NULL)
output_format = select_output_format (bfd_get_arch (inbfd),
@ -493,7 +502,7 @@ main (argc, argv)
{
newsymalloc += 10;
newsyms = ((asymbol **)
xrealloc (newsyms,
xrealloc ((PTR) newsyms,
(newsymalloc
* sizeof (asymbol *))));
}

893
binutils/nm.c
View file

File diff suppressed because it is too large Load diff

31
binutils/objcopy.c
View file

@ -390,6 +390,7 @@ copy_file (input_filename, output_filename, input_target, output_target)
char *output_target;
{
bfd *ibfd;
char **matching;
/* To allow us to do "strip *" without dying on the first
non-object file, failures are nonfatal. */
@ -400,7 +401,16 @@ copy_file (input_filename, output_filename, input_target, output_target)
nonfatal (input_filename);
}
if (bfd_check_format (ibfd, bfd_object))
if (bfd_check_format (ibfd, bfd_archive))
{
bfd *obfd = bfd_openw (output_filename, output_target);
if (obfd == NULL)
{
nonfatal (output_filename);
}
copy_archive (ibfd, obfd, output_target);
}
else if (bfd_check_format_matches (ibfd, bfd_object, &matching))
{
bfd *obfd = bfd_openw (output_filename, output_target);
if (obfd == NULL)
@ -420,20 +430,15 @@ copy_file (input_filename, output_filename, input_target, output_target)
nonfatal (input_filename);
}
}
else if (bfd_check_format (ibfd, bfd_archive))
{
bfd *obfd = bfd_openw (output_filename, output_target);
if (obfd == NULL)
{
nonfatal (output_filename);
}
copy_archive (ibfd, obfd, output_target);
}
else
{
/* Get the right error message. */
bfd_check_format (ibfd, bfd_object);
nonfatal (input_filename);
bfd_nonfatal (input_filename);
if (bfd_error == file_ambiguously_recognized)
{
list_matching_formats (matching);
free (matching);
}
status = 1;
}
}

210
binutils/objdump.c
View file

@ -52,12 +52,13 @@ boolean disassemble; /* -d */
boolean formats_info; /* -i */
char *only; /* -j secname */
/* Extra info to pass to the disassembler address printing function. */
struct objdump_disasm_info {
bfd *abfd;
asection *sec;
};
/* Architecture to disassemble for. */
/* Architecture to disassemble for, or default if NULL. */
char *machine = (char *) NULL;
/* The symbol table. */
@ -414,13 +415,9 @@ void
disassemble_data (abfd)
bfd *abfd;
{
bfd_byte *data = NULL;
bfd_arch_info_type *info;
bfd_size_type datasize = 0;
bfd_size_type i;
unsigned int (*print) ()= 0; /* Old style */
unsigned int (*print) () = 0; /* Old style */
disassembler_ftype disassemble = 0; /* New style */
enum bfd_architecture a;
struct disassemble_info disasm_info;
struct objdump_disasm_info aux;
@ -429,14 +426,9 @@ disassemble_data (abfd)
asection *section;
/* Replace symbol section relative values with abs values */
boolean done_dot = false;
INIT_DISASSEMBLE_INFO(disasm_info, stdout);
disasm_info.application_data = (PTR) &aux;
aux.abfd = abfd;
disasm_info.print_address_func = objdump_print_address;
/* Replace symbol section relative values with abs values. */
for (i = 0; i < symcount; i++)
{
syms[i]->value += syms[i]->section->vma;
@ -447,10 +439,15 @@ disassemble_data (abfd)
/* Sort the symbols into section and symbol order */
qsort (syms, symcount, sizeof (asymbol *), compare_symbols);
INIT_DISASSEMBLE_INFO(disasm_info, stdout);
disasm_info.application_data = (PTR) &aux;
aux.abfd = abfd;
disasm_info.print_address_func = objdump_print_address;
if (machine != (char *) NULL)
{
info = bfd_scan_arch (machine);
if (info == 0)
bfd_arch_info_type *info = bfd_scan_arch (machine);
if (info == NULL)
{
fprintf (stderr, "%s: Can't use supplied machine %s\n",
program_name,
@ -460,7 +457,7 @@ disassemble_data (abfd)
abfd->arch_info = info;
}
/* See if we can disassemble using bfd */
/* See if we can disassemble using bfd. */
if (abfd->arch_info->disassemble)
{
@ -468,7 +465,7 @@ disassemble_data (abfd)
}
else
{
a = bfd_get_arch (abfd);
enum bfd_architecture a = bfd_get_arch (abfd);
switch (a)
{
/* If you add a case to this table, also add it to the
@ -556,7 +553,7 @@ disassemble_data (abfd)
default:
fprintf (stderr, "%s: Can't disassemble for architecture %s\n",
program_name,
bfd_printable_arch_mach (bfd_get_arch (abfd), 0));
bfd_printable_arch_mach (a, 0));
exit (1);
}
@ -566,91 +563,92 @@ disassemble_data (abfd)
section != (asection *) NULL;
section = section->next)
{
bfd_byte *data = NULL;
bfd_size_type datasize = 0;
if (!(section->flags & SEC_LOAD))
continue;
if (only != (char *) NULL && strcmp (only, section->name) != 0)
continue;
printf ("Disassembly of section %s:\n", section->name);
datasize = bfd_get_section_size_before_reloc (section);
if (datasize == 0)
continue;
data = (bfd_byte *) xmalloc ((size_t) datasize);
bfd_get_section_contents (abfd, section, data, 0, datasize);
aux.sec = section;
if ((section->flags & SEC_LOAD)
&& (only == (char *) NULL || strcmp (only, section->name) == 0))
disasm_info.buffer = data;
disasm_info.buffer_vma = section->vma;
disasm_info.buffer_length = datasize;
i = 0;
while (i < disasm_info.buffer_length)
{
printf ("Disassembly of section %s:\n", section->name);
if (bfd_get_section_size_before_reloc (section) == 0)
continue;
data = (bfd_byte *) xmalloc ((size_t) bfd_get_section_size_before_reloc (section));
datasize = bfd_get_section_size_before_reloc (section);
bfd_get_section_contents (abfd, section, data, 0, bfd_get_section_size_before_reloc (section));
disasm_info.buffer = data;
disasm_info.buffer_vma = section->vma;
disasm_info.buffer_length =
bfd_get_section_size_before_reloc (section);
i = 0;
while (i < disasm_info.buffer_length)
if (data[i] == 0 && data[i + 1] == 0 && data[i + 2] == 0 &&
data[i + 3] == 0)
{
if (data[i] == 0 && data[i + 1] == 0 && data[i + 2] == 0 &&
data[i + 3] == 0)
if (done_dot == false)
{
if (done_dot == false)
{
printf ("...\n");
done_dot = true;
}
i += 4;
printf ("...\n");
done_dot = true;
}
else
i += 4;
}
else
{
done_dot = false;
if (with_line_numbers)
{
done_dot = false;
if (with_line_numbers)
{
CONST char *filename;
CONST char *functionname;
unsigned int line;
CONST char *filename;
CONST char *functionname;
unsigned int line;
if (bfd_find_nearest_line (abfd,
section,
syms,
section->vma + i,
&filename,
&functionname,
&line))
if (bfd_find_nearest_line (abfd,
section,
syms,
section->vma + i,
&filename,
&functionname,
&line))
{
if (functionname && *functionname
&& strcmp(functionname, prev_function))
{
if (functionname && *functionname
&& strcmp(functionname, prev_function))
{
printf ("%s():\n", functionname);
prev_function = functionname;
}
if (!filename)
filename = "???";
if (line && line != prevline)
{
printf ("%s:%u\n", filename, line);
prevline = line;
}
printf ("%s():\n", functionname);
prev_function = functionname;
}
if (!filename)
filename = "???";
if (line && line != prevline)
{
printf ("%s:%u\n", filename, line);
prevline = line;
}
}
objdump_print_address (section->vma + i, &disasm_info);
printf (" ");
if (disassemble) /* New style */
{
int bytes = (*disassemble)(section->vma + i,
&disasm_info);
if (bytes < 0)
break;
i += bytes;
}
else /* Old style */
i += print (section->vma + i,
data + i,
stdout);
putchar ('\n');
}
objdump_print_address (section->vma + i, &disasm_info);
putchar (' ');
if (disassemble) /* New style */
{
int bytes = (*disassemble)(section->vma + i,
&disasm_info);
if (bytes < 0)
break;
i += bytes;
}
else /* Old style */
i += print (section->vma + i,
data + i,
stdout);
putchar ('\n');
}
free (data);
}
free (data);
}
}
@ -745,7 +743,7 @@ dump_stabs_1 (abfd, name1, name2)
if (is_elf ? (0 == stabstr_hdr) : (0 == stabstrsect))
{
fprintf (stderr, "%s: %s has no %s section\n", program_name,
abfd->filename, name2);
bfd_get_filename (abfd), name2);
return;
}
@ -763,7 +761,7 @@ dump_stabs_1 (abfd, name1, name2)
{
fprintf (stderr, "%s: Reading %s section of %s failed\n",
program_name, name1,
abfd->filename);
bfd_get_filename (abfd));
return;
}
}
@ -779,7 +777,7 @@ dump_stabs_1 (abfd, name1, name2)
{
fprintf (stderr, "%s: Reading %s section of %s failed\n",
program_name, name2,
abfd->filename);
bfd_get_filename (abfd));
return;
}
}
@ -872,16 +870,6 @@ dump_bfd_header (abfd)
printf_vma (abfd->start_address);
}
static void
list_matching_formats (p)
char **p;
{
fprintf(stderr, "%s: Matching formats:", program_name);
while (*p)
fprintf(stderr, " %s", *p++);
fprintf(stderr, "\n");
}
static void
display_bfd (abfd)
bfd *abfd;
@ -890,8 +878,7 @@ display_bfd (abfd)
if (!bfd_check_format_matches (abfd, bfd_object, &matching))
{
fprintf (stderr, "%s: %s: %s\n", program_name, abfd->filename,
bfd_errmsg (bfd_error));
bfd_nonfatal (bfd_get_filename (abfd));
if (bfd_error == file_ambiguously_recognized)
{
list_matching_formats (matching);
@ -900,7 +887,8 @@ display_bfd (abfd)
return;
}
printf ("\n%s: file format %s\n", abfd->filename, abfd->xvec->name);
printf ("\n%s: file format %s\n", bfd_get_filename (abfd),
abfd->xvec->name);
if (dump_ar_hdrs)
print_arelt_descr (stdout, abfd, true);
if (dump_file_header)
@ -936,8 +924,7 @@ display_file (filename, target)
file = bfd_openr (filename, target);
if (file == NULL)
{
fprintf (stderr, "%s: ", program_name);
bfd_perror (filename);
bfd_nonfatal (filename);
return;
}
@ -953,8 +940,7 @@ display_file (filename, target)
{
if (bfd_error != no_more_archived_files)
{
fprintf (stderr, "%s: ", program_name);
bfd_perror (bfd_get_filename (file));
bfd_nonfatal (bfd_get_filename (file));
}
return;
}
@ -1197,8 +1183,7 @@ display_target_list ()
tragic consequences that would otherwise ensue. */
if (abfd == NULL)
{
fprintf (stderr, "%s: ", program_name);
bfd_perror (_DUMMY_NAME_);
bfd_nonfatal (_DUMMY_NAME_);
return;
}
bfd_set_format (abfd, bfd_object);
@ -1242,8 +1227,7 @@ display_info_table (first, last)
/* Just in case the open failed somehow. */
if (abfd == NULL)
{
fprintf (stderr, "%s: ", program_name);
bfd_perror (_DUMMY_NAME_);
bfd_nonfatal (_DUMMY_NAME_);
return;
}
bfd_set_format (abfd, bfd_object);

420
binutils/size.c
View file

@ -1,5 +1,5 @@
/* size.c -- report size of various sections of an executable file.
Copyright 1991, 1992 Free Software Foundation, Inc.
Copyright 1991, 92, 93, 94 Free Software Foundation, Inc.
This file is part of GNU Binutils.
@ -16,8 +16,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Extensions/incompatibilities:
o - BSD output has filenames at the end.
o - BSD output can appear in different radicies.
@ -26,62 +25,66 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
o - We also handle core files.
o - We also handle archives.
If you write shell scripts which manipulate this info then you may be
out of luck; there's no --predantic option.
out of luck; there's no --compatibility or --pedantic option.
*/
#include "bfd.h"
#include "sysdep.h"
#include "getopt.h"
#include "bucomm.h"
#ifndef BSD_DEFAULT
#define BSD_DEFAULT 1
#endif
/* Various program options */
/* Program options. */
enum {decimal, octal, hex} radix = decimal;
int berkeley_format = BSD_DEFAULT; /* 0 means use AT&T-style output */
enum
{
decimal, octal, hex
} radix = decimal;
int berkeley_format = BSD_DEFAULT; /* 0 means use AT&T-style output. */
int show_version = 0;
int show_help = 0;
/* Program exit status. */
int return_code = 0;
/* IMPORTS */
extern char *program_version;
extern char *program_name;
extern char *target;
/* Forward declarations */
static void
display_file PARAMS ((char *filename));
static void display_file PARAMS ((char *filename));
static void
print_sizes PARAMS ((bfd *file));
static void print_sizes PARAMS ((bfd * file));
static void berkeley_sum PARAMS ((bfd *, sec_ptr, PTR));
/** main and like trivia */
void
usage ()
usage (stream, status)
FILE *stream;
int status;
{
fprintf (stderr, "size %s\n\
fprintf (stream, "\
Usage: %s [-ABdoxV] [--format=berkeley|sysv] [--radix=8|10|16]\n\
[--target=bfdname] [--version] [--help] [file...]\n",
program_version, program_name);
[--target=bfdname] [--version] [--help] [file...]\n", program_name);
#if BSD_DEFAULT
fputs (" (default is --format=berkeley)\n", stderr);
fputs ("default is --format=berkeley\n", stream);
#else
fputs (" (default is --format=sysv)\n", stderr);
fputs ("default is --format=sysv\n", stream);
#endif
exit (1);
exit (status);
}
struct option long_options[] = {
{"format", required_argument, 0, 200},
{"radix", required_argument, 0, 201},
{"target", required_argument, 0, 202},
struct option long_options[] =
{
{"format", required_argument, 0, 200},
{"radix", required_argument, 0, 201},
{"target", required_argument, 0, 202},
{"version", no_argument, &show_version, 1},
{"help", no_argument, &show_help, 1},
{"help", no_argument, &show_help, 1},
{0, no_argument, 0, 0}
};
@ -91,55 +94,91 @@ main (argc, argv)
char **argv;
{
int temp;
int c; /* sez which option char */
extern int optind; /* steps thru options */
int c;
program_name = *argv;
bfd_init();
bfd_init ();
while ((c = getopt_long(argc, argv, "ABVdox", long_options,
(int *) 0)) != EOF)
switch(c) {
case 200: /* --format */
switch(*optarg) {
case 'B': case 'b': berkeley_format = 1; break;
case 'S': case 's': berkeley_format = 0; break;
default: fprintf(stderr, "invalid argument to --format: %s\n", optarg);
usage();
}
while ((c = getopt_long (argc, argv, "ABVdox", long_options,
(int *) 0)) != EOF)
switch (c)
{
case 200: /* --format */
switch (*optarg)
{
case 'B':
case 'b':
berkeley_format = 1;
break;
case 'S':
case 's':
berkeley_format = 0;
break;
default:
fprintf (stderr, "invalid argument to --format: %s\n", optarg);
usage (stderr, 1);
}
break;
case 202: /* --target */
case 202: /* --target */
target = optarg;
break;
case 201: /* --radix */
case 201: /* --radix */
#ifdef ANSI_LIBRARIES
temp = strtol(optarg, NULL, 10);
temp = strtol (optarg, NULL, 10);
#else
temp = atol(optarg);
temp = atol (optarg);
#endif
switch(temp) {
case 10: radix = decimal; break;
case 8: radix = octal; break;
case 16: radix = hex; break;
default: printf("Unknown radix: %s\n", optarg);
usage();
}
switch (temp)
{
case 10:
radix = decimal;
break;
case 8:
radix = octal;
break;
case 16:
radix = hex;
break;
default:
printf ("Invalid radix: %s\n", optarg);
usage (stderr, 1);
}
break;
case 'A': berkeley_format = 0; break;
case 'B': berkeley_format = 1; break;
case 'V': show_version = 1; break;
case 'd': radix = decimal; break;
case 'x': radix = hex; break;
case 'o': radix = octal; break;
case '?': usage();
}
case 'A':
berkeley_format = 0;
break;
case 'B':
berkeley_format = 1;
break;
case 'V':
show_version = 1;
break;
case 'd':
radix = decimal;
break;
case 'x':
radix = hex;
break;
case 'o':
radix = octal;
break;
case 0:
break;
case '?':
usage (stderr, 1);
}
if (show_version) printf("%s version %s\n", program_name, program_version);
if (show_help) usage();
if (show_version)
{
printf ("GNU %s version %s\n", program_name, program_version);
exit (0);
}
if (show_help)
usage (stdout, 0);
if (optind == argc)
display_file ("a.out");
@ -150,82 +189,113 @@ main (argc, argv)
return return_code;
}
/** Display a file's stats */
/* Display stats on file or archive member ABFD. */
void
display_bfd (abfd)
bfd *abfd;
{
CONST char *core_cmd;
char **matching;
if (bfd_check_format(abfd, bfd_archive)) return;
if (bfd_check_format (abfd, bfd_archive))
/* An archive within an archive. */
return;
if (bfd_check_format(abfd, bfd_object)) {
print_sizes(abfd);
goto done;
}
if (bfd_check_format_matches (abfd, bfd_object, &matching))
{
print_sizes (abfd);
printf ("\n");
return;
}
if (bfd_check_format(abfd, bfd_core)) {
print_sizes(abfd);
fputs(" (core file", stdout);
if (bfd_error == file_ambiguously_recognized)
{
bfd_nonfatal (bfd_get_filename (abfd));
list_matching_formats (matching);
free (matching);
return_code = 3;
return;
}
core_cmd = bfd_core_file_failing_command(abfd);
if (core_cmd) printf(" invoked as %s", core_cmd);
if (bfd_check_format_matches (abfd, bfd_core, &matching))
{
CONST char *core_cmd;
puts(")");
goto done;
}
print_sizes (abfd);
fputs (" (core file", stdout);
core_cmd = bfd_core_file_failing_command (abfd);
if (core_cmd)
printf (" invoked as %s", core_cmd);
puts (")\n");
return;
}
bfd_nonfatal (bfd_get_filename (abfd));
if (bfd_error == file_ambiguously_recognized)
{
list_matching_formats (matching);
free (matching);
}
printf("Unknown file format: %s.", bfd_get_filename(abfd));
return_code = 3;
done:
printf("\n");
return;
}
static void
display_file(filename)
char *filename;
display_archive (file)
bfd *file;
{
bfd *file, *arfile = (bfd *) NULL;
file = bfd_openr (filename, target);
if (file == NULL) {
fprintf (stderr, "%s: ", program_name);
bfd_perror (filename);
return_code = 1;
return;
}
if (bfd_check_format(file, bfd_archive) == true) {
for(;;) {
bfd *arfile = (bfd *) NULL;
for (;;)
{
bfd_error = no_error;
arfile = bfd_openr_next_archived_file (file, arfile);
if (arfile == NULL) {
if (bfd_error != no_more_archived_files) {
fprintf (stderr, "%s: ", program_name);
bfd_perror (bfd_get_filename (file));
return_code = 2;
}
return;
}
arfile = bfd_openr_next_archived_file (file, arfile);
if (arfile == NULL)
{
if (bfd_error != no_more_archived_files)
{
bfd_nonfatal (bfd_get_filename (file));
return_code = 2;
}
break;
}
display_bfd (arfile);
/* Don't close the archive elements; we need them for next_archive */
}
}
}
static void
display_file (filename)
char *filename;
{
bfd *file = bfd_openr (filename, target);
if (file == NULL)
{
bfd_nonfatal (filename);
return_code = 1;
return;
}
if (bfd_check_format (file, bfd_archive) == true)
display_archive (file);
else
display_bfd (file);
bfd_close (file);
if (bfd_close (file) == false)
{
bfd_nonfatal (filename);
return_code = 1;
return;
}
}
/* This is what lexical functions are for */
/* This is what lexical functions are for. */
void
lprint_number (width, num)
int width;
@ -233,66 +303,61 @@ lprint_number (width, num)
{
printf ((radix == decimal ? "%-*lu\t" :
((radix == octal) ? "%-*lo\t" : "%-*lx\t")),
width, (unsigned long)num);
width, (unsigned long) num);
}
void
rprint_number(width, num)
rprint_number (width, num)
int width;
bfd_size_type num;
{
printf ((radix == decimal ? "%*lu\t" :
((radix == octal) ? "%*lo\t" : "%*lx\t")),
width, (unsigned long)num);
width, (unsigned long) num);
}
static char *bss_section_name = ".bss";
static char *data_section_name = ".data";
static char *stack_section_name = ".stack";
static char *text_section_name = ".text";
static bfd_size_type bsssize;
static bfd_size_type datasize;
static bfd_size_type textsize;
void print_berkeley_format(abfd)
bfd *abfd;
static void
berkeley_sum (abfd, sec, ignore)
bfd *abfd;
sec_ptr sec;
PTR ignore;
{
bfd_size_type size;
size = bfd_get_section_size_before_reloc (sec);
if (bfd_get_section_flags (abfd, sec) & SEC_CODE)
textsize += size;
else if (bfd_get_section_flags (abfd, sec) & SEC_DATA)
datasize += size;
else if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC)
bsssize += size;
}
void
print_berkeley_format (abfd)
bfd *abfd;
{
static int files_seen = 0;
sec_ptr bsssection = NULL;
sec_ptr datasection = NULL;
sec_ptr textsection = NULL;
bfd_size_type bsssize = 0;
bfd_size_type datasize = 0;
bfd_size_type textsize = 0;
bfd_size_type total = 0;
bfd_size_type total;
bsssize = 0;
datasize = 0;
textsize = 0;
if ((textsection = bfd_get_section_by_name (abfd, text_section_name))
!= NULL) {
textsize = bfd_get_section_size_before_reloc (textsection);
}
if ((datasection = bfd_get_section_by_name (abfd, data_section_name))
!= NULL) {
datasize = bfd_get_section_size_before_reloc ( datasection);
}
if (bfd_get_format (abfd) == bfd_object) {
if ((bsssection = bfd_get_section_by_name (abfd, bss_section_name))
!= NULL) {
bsssize = bfd_section_size(abfd, bsssection);
}
} else {
if ((bsssection = bfd_get_section_by_name (abfd, stack_section_name))
!= NULL) {
bsssize = bfd_section_size(abfd, bsssection);
}
}
bfd_map_over_sections (abfd, berkeley_sum, (PTR) NULL);
if (files_seen++ == 0)
#if 0 /* intel doesn't like bss/stk b/c they don't gave core files */
puts((radix == octal) ? "text\tdata\tbss/stk\toct\thex\tfilename" :
"text\tdata\tbss/stk\tdec\thex\tfilename");
#if 0
/* Intel doesn't like bss/stk because they don't have core files. */
puts ((radix == octal) ? "text\tdata\tbss/stk\toct\thex\tfilename" :
"text\tdata\tbss/stk\tdec\thex\tfilename");
#else
puts((radix == octal) ? "text\tdata\tbss\toct\thex\tfilename" :
"text\tdata\tbss\tdec\thex\tfilename");
puts ((radix == octal) ? "text\tdata\tbss\toct\thex\tfilename" :
"text\tdata\tbss\tdec\thex\tfilename");
#endif
total = textsize + datasize + bsssize;
@ -301,60 +366,61 @@ bfd *abfd;
lprint_number (7, datasize);
lprint_number (7, bsssize);
printf (((radix == octal) ? "%-7lo\t%-7lx\t" : "%-7lu\t%-7lx\t"),
(unsigned long)total, (unsigned long)total);
(unsigned long) total, (unsigned long) total);
fputs(bfd_get_filename(abfd), stdout);
if (abfd->my_archive) printf (" (ex %s)", abfd->my_archive->filename);
fputs (bfd_get_filename (abfd), stdout);
if (abfd->my_archive)
printf (" (ex %s)", abfd->my_archive->filename);
}
/* I REALLY miss lexical functions! */
bfd_size_type svi_total = 0;
void
sysv_internal_printer(file, sec, ignore)
sysv_internal_printer (file, sec, ignore)
bfd *file;
sec_ptr sec;
PTR ignore;
{
bfd_size_type size = bfd_section_size (file, sec);
if (sec!= &bfd_abs_section
&& ! bfd_is_com_section (sec)
&& sec!=&bfd_und_section)
{
svi_total += size;
printf ("%-12s", bfd_section_name(file, sec));
rprint_number (8, size);
printf(" ");
rprint_number (8, bfd_section_vma(file, sec));
printf ("\n");
}
if (sec != &bfd_abs_section
&& !bfd_is_com_section (sec)
&& sec != &bfd_und_section)
{
svi_total += size;
printf ("%-12s", bfd_section_name (file, sec));
rprint_number (8, size);
printf (" ");
rprint_number (8, bfd_section_vma (file, sec));
printf ("\n");
}
}
void
print_sysv_format(file)
print_sysv_format (file)
bfd *file;
{
svi_total = 0;
printf ("%s ", bfd_get_filename (file));
if (file->my_archive) printf (" (ex %s)", file->my_archive->filename);
if (file->my_archive)
printf (" (ex %s)", file->my_archive->filename);
puts(":\nsection\t\tsize\t addr");
bfd_map_over_sections (file, sysv_internal_printer, (PTR)NULL);
puts (":\nsection\t\tsize\t addr");
bfd_map_over_sections (file, sysv_internal_printer, (PTR) NULL);
printf("Total ");
rprint_number(8, svi_total);
printf("\n"); printf("\n");
printf ("Total ");
rprint_number (8, svi_total);
printf ("\n\n");
}
static void
print_sizes(file)
print_sizes (file)
bfd *file;
{
if (berkeley_format)
print_berkeley_format(file);
else print_sysv_format(file);
print_berkeley_format (file);
else
print_sysv_format (file);
}

68
binutils/strings.c
View file

@ -1,5 +1,5 @@
/* strings -- print the strings of printable characters in files
Copyright (C) 1993 Free Software Foundation, Inc.
Copyright (C) 1993, 94 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -37,6 +37,9 @@
-o Like -to. (Some other implementations have -o like -to,
others like -td. We chose one arbitrarily.)
--target=BFDNAME
Specify a non-default object file format.
--help
-h Print the usage message on the standard output.
@ -84,12 +87,8 @@ static boolean datasection_only;
/* true if we found an initialized data section in the current file. */
static boolean got_a_section;
/* Opened to /dev/null for reading from a BFD.
This is a kludge to avoid rewriting print_strings;
the way we call print_strings now, it actually only needs
to read from either a memory buffer or a stream, never both
for a given file. */
static FILE *devnull;
/* The BFD object file format. */
static char *target;
extern char *program_version;
@ -99,6 +98,7 @@ static struct option long_options[] =
{"print-file-name", no_argument, NULL, 'f'},
{"bytes", required_argument, NULL, 'n'},
{"radix", required_argument, NULL, 't'},
{"target", required_argument, NULL, 'T'},
{"help", no_argument, NULL, 'h'},
{"version", no_argument, NULL, 'v'},
{NULL, 0, NULL, 0}
@ -125,6 +125,7 @@ main (argc, argv)
print_addresses = false;
print_filenames = false;
datasection_only = true;
target = NULL;
while ((optc = getopt_long (argc, argv, "afn:ot:v0123456789",
long_options, (int *) 0)) != EOF)
@ -180,6 +181,10 @@ main (argc, argv)
}
break;
case 'T':
target = optarg;
break;
case 'v':
printf ("GNU %s version %s\n", program_name, program_version);
exit (0);
@ -200,13 +205,6 @@ main (argc, argv)
string_min = 4;
bfd_init ();
devnull = fopen ("/dev/null", "r");
if (devnull == NULL)
{
fprintf (stderr, "%s: ", program_name);
perror ("/dev/null");
exit (1);
}
for (; optind < argc; ++optind)
{
@ -242,7 +240,7 @@ strings_a_section (abfd, sect, file)
if (bfd_get_section_contents (abfd, sect, mem, (file_ptr) 0, sz))
{
got_a_section = true;
print_strings (file, devnull, sect->filepos, 0, sz, mem);
print_strings (file, (FILE *) NULL, sect->filepos, 0, sz, mem);
}
free (mem);
}
@ -250,6 +248,7 @@ strings_a_section (abfd, sect, file)
/* Scan all of the sections in FILE, and print the strings
in the initialized data section(s).
Return true if successful,
false if not (such as if FILE is not an object file). */
@ -257,31 +256,29 @@ static boolean
strings_object_file (file)
char *file;
{
bfd *abfd = bfd_openr (file, NULL);
bfd *abfd = bfd_openr (file, target);
if (abfd == NULL)
{
if (bfd_error != system_call_error)
{
/* Out of memory, or an invalid target is specified by the
GNUTARGET environment variable. */
fprintf (stderr, "%s: ", program_name);
bfd_perror (file);
}
/* Treat the file as a non-object file. */
return false;
}
/* For some reason, without this call, the BFD has no sections.
This call is only for the side effect of reading in the sections. */
bfd_check_format (abfd, bfd_object);
/* This call is mainly for its side effect of reading in the sections.
We follow the traditional behavior of `strings' in that we don't
complain if we don't recognize a file to be an object file. */
if (bfd_check_format (abfd, bfd_object) == false)
{
bfd_close (abfd);
return false;
}
got_a_section = false;
bfd_map_over_sections (abfd, strings_a_section, file);
if (!bfd_close (abfd))
{
fprintf (stderr, "%s: ", program_name);
bfd_perror (file);
bfd_nonfatal (file);
return false;
}
@ -328,7 +325,8 @@ strings_file (file)
is at address ADDRESS in the file.
Stop reading at address STOP_POINT in the file, if nonzero.
Optionally the caller can supply a buffer of characters
If STREAM is NULL, do not read from it.
The caller can supply a buffer of characters
to be processed before the data in STREAM.
MAGIC is the address of the buffer and
MAGICCOUNT is how many characters are in it.
@ -364,6 +362,8 @@ print_strings (filename, stream, address, stop_point, magiccount, magic)
}
else
{
if (stream == NULL)
return;
c = getc (stream);
if (c < 0)
return;
@ -391,6 +391,8 @@ print_strings (filename, stream, address, stop_point, magiccount, magic)
}
else
{
if (stream == NULL)
return;
c = getc (stream);
if (c < 0)
return;
@ -412,15 +414,15 @@ print_strings (filename, stream, address, stop_point, magiccount, magic)
switch (address_radix)
{
case 8:
printf ("%7lo ", address - i - 1);
printf ("%7lo ", (unsigned long) (address - i - 1));
break;
case 10:
printf ("%7ld ", address - i - 1);
printf ("%7ld ", (long) (address - i - 1));
break;
case 16:
printf ("%7lx ", address - i - 1);
printf ("%7lx ", (unsigned long) (address - i - 1));
break;
}
@ -505,7 +507,7 @@ usage (stream, status)
fprintf (stream, "\
Usage: %s [-afov] [-n min-len] [-min-len] [-t {o,x,d}] [-]\n\
[--all] [--print-file-name] [--bytes=min-len] [--radix={o,x,d}]\n\
[--help] [--version] file...\n",
[--target=bfdname] [--help] [--version] file...\n",
program_name);
exit (status);
}