diff options
| author | Tristan Gingold <gingold@adacore.com> | 2012-01-10 11:51:08 +0000 |
|---|---|---|
| committer | Tristan Gingold <gingold@adacore.com> | 2012-01-10 11:51:08 +0000 |
| commit | 820fa842eb511073bd54fb735d185296a0b15a0b (patch) | |
| tree | a2717262048a4076134c091b45531070bad9df17 /bfd/bfdio.c | |
| parent | 1188b0aacf3b411444bcdf5992fcb1cc23cf8709 (diff) | |
| download | binutils-redhat-820fa842eb511073bd54fb735d185296a0b15a0b.tar.gz | |
2012-01-10 Tristan Gingold <gingold@adacore.com>
* bfdio.c (bfd_tell): Handle nested archives.
(bfd_seek): Ditto.
* cache.c (bfd_cache_lookup_worker): Ditto.
* archive.c (_bfd_get_elt_at_filepos): Remove code dealing with
nested archives.
(bfd_generic_openr_next_archived_file): Likewise.
Diffstat (limited to 'bfd/bfdio.c')
| -rw-r--r-- | bfd/bfdio.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/bfd/bfdio.c b/bfd/bfdio.c index f8c9f3e4c4..c142c179cb 100644 --- a/bfd/bfdio.c +++ b/bfd/bfdio.c @@ -233,10 +233,14 @@ bfd_tell (bfd *abfd) if (abfd->iovec) { + bfd *parent_bfd = abfd; ptr = abfd->iovec->btell (abfd); - if (abfd->my_archive) - ptr -= abfd->origin; + while (parent_bfd->my_archive != NULL) + { + ptr -= parent_bfd->origin; + parent_bfd = parent_bfd->my_archive; + } } else ptr = 0; @@ -308,8 +312,16 @@ bfd_seek (bfd *abfd, file_ptr position, int direction) } file_position = position; - if (direction == SEEK_SET && abfd->my_archive != NULL) - file_position += abfd->origin; + if (direction == SEEK_SET) + { + bfd *parent_bfd = abfd; + + while (parent_bfd->my_archive != NULL) + { + file_position += parent_bfd->origin; + parent_bfd = parent_bfd->my_archive; + } + } if (abfd->iovec) result = abfd->iovec->bseek (abfd, file_position, direction); |