MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* bfdwin.c (bfd_get_file_window): Seek into file in place of

Browse Source 
using bfd_cache_lookup.
This commit is contained in:
Alan Modra 2005-10-27 04:06:35 +00:00
parent d00967c705
commit 182a009999
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bfd/ChangeLog
View File

@ -1,5 +1,8 @@
2005-10-27 Alan Modra <amodra@bigpond.net.au> 2005-10-27 Alan Modra <amodra@bigpond.net.au>
* bfdwin.c (bfd_get_file_window): Seek into file in place of
using bfd_cache_lookup.
* cache.c (BFD_CACHE_MAX_OPEN): Make private to this file. * cache.c (BFD_CACHE_MAX_OPEN): Make private to this file.
(bfd_last_cache, bfd_cache_lookup, bfd_cache_lookup_worker): Likewise. (bfd_last_cache, bfd_cache_lookup, bfd_cache_lookup_worker): Likewise.
* libbfd-in.h (bfd_cache_lookup_worker, bfd_last_cache): Delete. * libbfd-in.h (bfd_cache_lookup_worker, bfd_last_cache): Delete.

13
bfd/bfdwin.c
View File

@ -1,5 +1,6 @@
/* Support for memory-mapped windows into a BFD. /* Support for memory-mapped windows into a BFD.
Copyright 1995, 1996, 2001, 2002, 2003 Free Software Foundation, Inc. Copyright 1995, 1996, 2001, 2002, 2003, 2005
Free Software Foundation, Inc.
Written by Cygnus Support. Written by Cygnus Support.
This file is part of BFD, the Binary File Descriptor library. This file is part of BFD, the Binary File Descriptor library.
@ -144,7 +145,6 @@ bfd_get_file_window (bfd *abfd,
file_ptr file_offset, offset2; file_ptr file_offset, offset2;
size_t real_size; size_t real_size;
int fd; int fd;
FILE *f;
/* Find the real file and the real offset into it. */ /* Find the real file and the real offset into it. */
while (abfd->my_archive != NULL) while (abfd->my_archive != NULL)
@ -152,10 +152,13 @@ bfd_get_file_window (bfd *abfd,
offset += abfd->origin; offset += abfd->origin;
abfd = abfd->my_archive; abfd = abfd->my_archive;
} }
f = bfd_cache_lookup (abfd);
if (f == NULL) /* Seek into the file, to ensure it is open if cacheable. */
if (abfd->iostream == NULL
&& (abfd->iovec == NULL
|| abfd->iovec->bseek (abfd, offset, SEEK_SET) != 0))
return FALSE; return FALSE;
fd = fileno (f); fd = fileno ((FILE *) abfd->iostream);
/* Compute offsets and size for mmap and for the user's data. */ /* Compute offsets and size for mmap and for the user's data. */
offset2 = offset % pagesize; offset2 = offset % pagesize;