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

2012-01-10 Tristan Gingold <gingold@adacore.com>

Browse source 
* objdump.c (display_object_bfd): Renamed from ...
	(display_bfd): ... this.
	(display_any_bfd): New function.
	(display_file): Split.  Handle nested archives.
This commit is contained in:
Tristan Gingold 2012-01-10 11:52:27 +00:00
parent 660722b0e2
commit 1598539f98
2 changed files with 53 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
binutils/ChangeLog
View file

@ -1,3 +1,10 @@
2012-01-10 Tristan Gingold <gingold@adacore.com>
* objdump.c (display_object_bfd): Renamed from ...
(display_bfd): ... this.
(display_any_bfd): New function.
(display_file): Split. Handle nested archives.
2012-01-09 Roland McGrath <mcgrathr@google.com> 2012-01-09 Roland McGrath <mcgrathr@google.com>
* configure.in: Use AM_ZLIB. * configure.in: Use AM_ZLIB.

82
binutils/objdump.c
View file

@ -3257,7 +3257,7 @@ dump_bfd (bfd *abfd)
} }
static void static void
display_bfd (bfd *abfd) display_object_bfd (bfd *abfd)
{ {
char **matching; char **matching;
@ -3296,11 +3296,54 @@ display_bfd (bfd *abfd)
} }
} }
static void
display_any_bfd (bfd *file, int level)
{
/* Decompress sections unless dumping the section contents. */
if (!dump_section_contents)
file->flags |= BFD_DECOMPRESS;
/* If the file is an archive, process all of its elements. */
if (bfd_check_format (file, bfd_archive))
{
bfd *arfile = NULL;
bfd *last_arfile = NULL;
if (level == 0)
printf (_("In archive %s:\n"), bfd_get_filename (file));
else
printf (_("In nested archive %s:\n"), bfd_get_filename (file));
for (;;)
{
bfd_set_error (bfd_error_no_error);
arfile = bfd_openr_next_archived_file (file, arfile);
if (arfile == NULL)
{
if (bfd_get_error () != bfd_error_no_more_archived_files)
nonfatal (bfd_get_filename (file));
break;
}
display_any_bfd (arfile, level + 1);
if (last_arfile != NULL)
bfd_close (last_arfile);
last_arfile = arfile;
}
if (last_arfile != NULL)
bfd_close (last_arfile);
}
else
display_object_bfd (file);
}
static void static void
display_file (char *filename, char *target) display_file (char *filename, char *target)
{ {
bfd *file; bfd *file;
bfd *arfile = NULL;
if (get_file_size (filename) < 1) if (get_file_size (filename) < 1)
{ {
@ -3315,40 +3358,7 @@ display_file (char *filename, char *target)
return; return;
} }
/* Decompress sections unless dumping the section contents. */ display_any_bfd (file, 0);
if (!dump_section_contents)
file->flags |= BFD_DECOMPRESS;
/* If the file is an archive, process all of its elements. */
if (bfd_check_format (file, bfd_archive))
{
bfd *last_arfile = NULL;
printf (_("In archive %s:\n"), bfd_get_filename (file));
for (;;)
{
bfd_set_error (bfd_error_no_error);
arfile = bfd_openr_next_archived_file (file, arfile);
if (arfile == NULL)
{
if (bfd_get_error () != bfd_error_no_more_archived_files)
nonfatal (bfd_get_filename (file));
break;
}
display_bfd (arfile);
if (last_arfile != NULL)
bfd_close (last_arfile);
last_arfile = arfile;
}
if (last_arfile != NULL)
bfd_close (last_arfile);
}
else
display_bfd (file);
bfd_close (file); bfd_close (file);
} }