* objdump.c (display_object_bfd): Renamed from ...
(display_bfd): ... this.
(display_any_bfd): New function.
(display_file): Split. Handle nested archives.
+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>
* configure.in: Use AM_ZLIB.
2012-01-09 Roland McGrath <mcgrathr@google.com>
* configure.in: Use AM_ZLIB.
+display_object_bfd (bfd *abfd)
-display_file (char *filename, char *target)
+display_any_bfd (bfd *file, int level)
- bfd *file;
- bfd *arfile = NULL;
-
- if (get_file_size (filename) < 1)
- {
- exit_status = 1;
- return;
- }
-
- file = bfd_openr (filename, target);
- if (file == NULL)
- {
- nonfatal (filename);
- return;
- }
-
/* Decompress sections unless dumping the section contents. */
if (!dump_section_contents)
file->flags |= BFD_DECOMPRESS;
/* 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))
{
/* If the file is an archive, process all of its elements. */
if (bfd_check_format (file, bfd_archive))
{
- printf (_("In archive %s:\n"), bfd_get_filename (file));
+ 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);
for (;;)
{
bfd_set_error (bfd_error_no_error);
+ display_any_bfd (arfile, level + 1);
if (last_arfile != NULL)
bfd_close (last_arfile);
if (last_arfile != NULL)
bfd_close (last_arfile);
bfd_close (last_arfile);
}
else
bfd_close (last_arfile);
}
else
+ display_object_bfd (file);
+}
+
+static void
+display_file (char *filename, char *target)
+{
+ bfd *file;
+
+ if (get_file_size (filename) < 1)
+ {
+ exit_status = 1;
+ return;
+ }
+
+ file = bfd_openr (filename, target);
+ if (file == NULL)
+ {
+ nonfatal (filename);
+ return;
+ }
+
+ display_any_bfd (file, 0);