bfd_size_type
bfd_bread (void *ptr, bfd_size_type size, bfd *abfd)
{
- size_t nread;
+ file_ptr nread;
+ bfd *element_bfd = abfd;
+ ufile_ptr offset = 0;
+
+ while (abfd->my_archive != NULL
+ && !bfd_is_thin_archive (abfd->my_archive))
+ {
+ offset += abfd->origin;
+ abfd = abfd->my_archive;
+ }
/* If this is an archive element, don't read past the end of
this element. */
- if (abfd->arelt_data != NULL)
+ if (element_bfd->arelt_data != NULL)
{
- bfd_size_type maxbytes = arelt_size (abfd);
+ bfd_size_type maxbytes = arelt_size (element_bfd);
- if (abfd->where + size > maxbytes)
+ if (abfd->where < offset || abfd->where - offset >= maxbytes)
{
- if (abfd->where >= maxbytes)
- return 0;
- size = maxbytes - abfd->where;
+ bfd_set_error (bfd_error_invalid_operation);
+ return -1;
}
+ if (abfd->where - offset + size > maxbytes)
+ size = maxbytes - (abfd->where - offset);
}
- if (abfd->iovec)
- nread = abfd->iovec->bread (abfd, ptr, size);
- else
- nread = 0;
- if (nread != (size_t) -1)
+ if (abfd->iovec == NULL)
+ {
+ bfd_set_error (bfd_error_invalid_operation);
+ return -1;
+ }
+
+ nread = abfd->iovec->bread (abfd, ptr, size);
+ if (nread != -1)
abfd->where += nread;
return nread;
bfd_size_type
bfd_bwrite (const void *ptr, bfd_size_type size, bfd *abfd)
{
- size_t nwrote;
+ file_ptr nwrote;
- if (abfd->iovec)
- nwrote = abfd->iovec->bwrite (abfd, ptr, size);
- else
- nwrote = 0;
+ while (abfd->my_archive != NULL
+ && !bfd_is_thin_archive (abfd->my_archive))
+ abfd = abfd->my_archive;
+
+ if (abfd->iovec == NULL)
+ {
+ bfd_set_error (bfd_error_invalid_operation);
+ return -1;
+ }
- if (nwrote != (size_t) -1)
+ nwrote = abfd->iovec->bwrite (abfd, ptr, size);
+ if (nwrote != -1)
abfd->where += nwrote;
- if (nwrote != size)
+ if ((bfd_size_type) nwrote != size)
{
#ifdef ENOSPC
errno = ENOSPC;
file_ptr
bfd_tell (bfd *abfd)
{
+ ufile_ptr offset = 0;
file_ptr ptr;
- if (abfd->iovec)
+ while (abfd->my_archive != NULL
+ && !bfd_is_thin_archive (abfd->my_archive))
{
- bfd *parent_bfd = abfd;
- ptr = abfd->iovec->btell (abfd);
-
- while (parent_bfd->my_archive != NULL
- && !bfd_is_thin_archive (parent_bfd->my_archive))
- {
- ptr -= parent_bfd->origin;
- parent_bfd = parent_bfd->my_archive;
- }
+ offset += abfd->origin;
+ abfd = abfd->my_archive;
}
- else
- ptr = 0;
+ if (abfd->iovec == NULL)
+ return 0;
+
+ ptr = abfd->iovec->btell (abfd);
abfd->where = ptr;
- return ptr;
+ return ptr - offset;
}
int
bfd_flush (bfd *abfd)
{
- if (abfd->iovec)
- return abfd->iovec->bflush (abfd);
- return 0;
+ while (abfd->my_archive != NULL
+ && !bfd_is_thin_archive (abfd->my_archive))
+ abfd = abfd->my_archive;
+
+ if (abfd->iovec == NULL)
+ return 0;
+
+ return abfd->iovec->bflush (abfd);
}
/* Returns 0 for success, negative value for failure (in which case
{
int result;
- if (abfd->iovec)
- result = abfd->iovec->bstat (abfd, statbuf);
- else
- result = -1;
+ while (abfd->my_archive != NULL
+ && !bfd_is_thin_archive (abfd->my_archive))
+ abfd = abfd->my_archive;
+ if (abfd->iovec == NULL)
+ {
+ bfd_set_error (bfd_error_invalid_operation);
+ return -1;
+ }
+
+ result = abfd->iovec->bstat (abfd, statbuf);
if (result < 0)
bfd_set_error (bfd_error_system_call);
return result;
bfd_seek (bfd *abfd, file_ptr position, int direction)
{
int result;
- file_ptr file_position;
- /* For the time being, a BFD may not seek to it's end. The problem
- is that we don't easily have a way to recognize the end of an
- element in an archive. */
-
- BFD_ASSERT (direction == SEEK_SET || direction == SEEK_CUR);
+ ufile_ptr offset = 0;
- if (direction == SEEK_CUR && position == 0)
- return 0;
-
- if (abfd->my_archive == NULL || bfd_is_thin_archive (abfd->my_archive))
- {
- if (direction == SEEK_SET && (bfd_vma) position == abfd->where)
- return 0;
- }
- else
+ while (abfd->my_archive != NULL
+ && !bfd_is_thin_archive (abfd->my_archive))
{
- /* We need something smarter to optimize access to archives.
- Currently, anything inside an archive is read via the file
- handle for the archive. Which means that a bfd_seek on one
- component affects the `current position' in the archive, as
- well as in any other component.
-
- It might be sufficient to put a spike through the cache
- abstraction, and look to the archive for the file position,
- but I think we should try for something cleaner.
-
- In the meantime, no optimization for archives. */
+ offset += abfd->origin;
+ abfd = abfd->my_archive;
}
- file_position = position;
- if (direction == SEEK_SET)
+ if (abfd->iovec == NULL)
{
- bfd *parent_bfd = abfd;
-
- while (parent_bfd->my_archive != NULL
- && !bfd_is_thin_archive (parent_bfd->my_archive))
- {
- file_position += parent_bfd->origin;
- parent_bfd = parent_bfd->my_archive;
- }
+ bfd_set_error (bfd_error_invalid_operation);
+ return -1;
}
- if (abfd->iovec)
- result = abfd->iovec->bseek (abfd, file_position, direction);
- else
- result = -1;
+ /* For the time being, a BFD may not seek to it's end. The problem
+ is that we don't easily have a way to recognize the end of an
+ element in an archive. */
+ BFD_ASSERT (direction == SEEK_SET || direction == SEEK_CUR);
+
+ if (direction != SEEK_CUR)
+ position += offset;
+ result = abfd->iovec->bseek (abfd, position, direction);
if (result != 0)
{
- int hold_errno = errno;
-
- /* Force redetermination of `where' field. */
- bfd_tell (abfd);
-
/* An EINVAL error probably means that the file offset was
absurd. */
- if (hold_errno == EINVAL)
+ if (errno == EINVAL)
bfd_set_error (bfd_error_file_truncated);
else
- {
- bfd_set_error (bfd_error_system_call);
- errno = hold_errno;
- }
+ bfd_set_error (bfd_error_system_call);
}
else
{
/* Adjust `where' field. */
- if (direction == SEEK_SET)
- abfd->where = position;
- else
+ if (direction == SEEK_CUR)
abfd->where += position;
+ else
+ abfd->where = position;
}
+
return result;
}
if (abfd->mtime_set)
return abfd->mtime;
- if (abfd->iovec == NULL)
- return 0;
-
- if (abfd->iovec->bstat (abfd, &buf) != 0)
+ if (bfd_stat (abfd, &buf) != 0)
return 0;
abfd->mtime = buf.st_mtime; /* Save value in case anyone wants it */
{
struct stat buf;
- if (abfd->iovec == NULL)
- return 0;
-
- if (abfd->iovec->bstat (abfd, &buf) != 0)
+ if (bfd_stat (abfd, &buf) != 0)
return 0;
return buf.st_size;
int prot, int flags, file_ptr offset,
void **map_addr, bfd_size_type *map_len)
{
- void *ret = (void *)-1;
+ while (abfd->my_archive != NULL
+ && !bfd_is_thin_archive (abfd->my_archive))
+ {
+ offset += abfd->origin;
+ abfd = abfd->my_archive;
+ }
if (abfd->iovec == NULL)
- return ret;
+ {
+ bfd_set_error (bfd_error_invalid_operation);
+ return (void *) -1;
+ }
return abfd->iovec->bmmap (abfd, addr, len, prot, flags, offset,
map_addr, map_len);
static FILE *
bfd_cache_lookup_worker (bfd *abfd, enum cache_flag flag)
{
- bfd *orig_bfd = abfd;
if ((abfd->flags & BFD_IN_MEMORY) != 0)
abort ();
- while (abfd->my_archive != NULL
- && !bfd_is_thin_archive (abfd->my_archive))
- abfd = abfd->my_archive;
+ if (abfd->my_archive != NULL
+ && !bfd_is_thin_archive (abfd->my_archive))
+ abort ();
if (abfd->iostream != NULL)
{
/* xgettext:c-format */
_bfd_error_handler (_("reopening %pB: %s\n"),
- orig_bfd, bfd_errmsg (bfd_get_error ()));
+ abfd, bfd_errmsg (bfd_get_error ()));
return NULL;
}
first octet in the file, NOT the beginning of the archive header. */
static file_ptr
-cache_bread_1 (struct bfd *abfd, void *buf, file_ptr nbytes)
+cache_bread_1 (FILE *f, void *buf, file_ptr nbytes)
{
- FILE *f;
file_ptr nread;
- /* FIXME - this looks like an optimization, but it's really to cover
- up for a feature of some OSs (not solaris - sigh) that
- ld/pe-dll.c takes advantage of (apparently) when it creates BFDs
- internally and tries to link against them. BFD seems to be smart
- enough to realize there are no symbol records in the "file" that
- doesn't exist but attempts to read them anyway. On Solaris,
- attempting to read zero bytes from a NULL file results in a core
- dump, but on other platforms it just returns zero bytes read.
- This makes it to something reasonable. - DJ */
- if (nbytes == 0)
- return 0;
-
- f = bfd_cache_lookup (abfd, CACHE_NORMAL);
- if (f == NULL)
- return 0;
#if defined (__VAX) && defined (VMS)
/* Apparently fread on Vax VMS does not keep the record length
cache_bread (struct bfd *abfd, void *buf, file_ptr nbytes)
{
file_ptr nread = 0;
+ FILE *f;
+
+ f = bfd_cache_lookup (abfd, CACHE_NORMAL);
+ if (f == NULL)
+ return -1;
/* Some filesystems are unable to handle reads that are too large
(for instance, NetApp shares with oplocks turned off). To avoid
if (chunk_size > max_chunk_size)
chunk_size = max_chunk_size;
- chunk_nread = cache_bread_1 (abfd, (char *) buf + nread, chunk_size);
+ chunk_nread = cache_bread_1 (f, (char *) buf + nread, chunk_size);
/* Update the nread count.
}
static file_ptr
-cache_bwrite (struct bfd *abfd, const void *where, file_ptr nbytes)
+cache_bwrite (struct bfd *abfd, const void *from, file_ptr nbytes)
{
file_ptr nwrite;
FILE *f = bfd_cache_lookup (abfd, CACHE_NORMAL);
if (f == NULL)
return 0;
- nwrite = fwrite (where, 1, nbytes, f);
+ nwrite = fwrite (from, 1, nbytes, f);
if (nwrite < nbytes && ferror (f))
{
bfd_set_error (bfd_error_system_call);
if (pagesize_m1 == 0)
pagesize_m1 = getpagesize () - 1;
- /* Handle archive members. */
- if (abfd->my_archive != NULL
- && !bfd_is_thin_archive (abfd->my_archive))
- offset += abfd->origin;
-
/* Align. */
pg_offset = offset & ~pagesize_m1;
pg_len = (len + (offset - pg_offset) + pagesize_m1) & ~pagesize_m1;
projects / binutils-gdb.git / commitdiff