Merge GDB 7.5.1

bfd/bfdio.c

 /* Low-level I/O routines for BFDs.
 
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
    1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011
    Free Software Foundation, Inc.
 
    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ skipping 69 matching lines @@
         fcntl (fd, F_SETFD, old | FD_CLOEXEC);
     }
 #endif
   return file;
 }
 
 FILE *
 real_fopen (const char *filename, const char *modes)
 {
 #ifdef VMS
-  char vms_modes[4];
   char *vms_attr;
 
   /* On VMS, fopen allows file attributes as optionnal arguments.
      We need to use them but we'd better to use the common prototype.
      In fopen-vms.h, they are separated from the mode with a comma.
      Split here.  */
   vms_attr = strchr (modes, ',');
   if (vms_attr == NULL)
     {
       /* No attributes.  */
@@ skipping 77 matching lines @@
 
 bfd_size_type
 bfd_bread (void *ptr, bfd_size_type size, bfd *abfd)
 {
   size_t nread;
 
   /* If this is an archive element, don't read past the end of
      this element.  */
   if (abfd->arelt_data != NULL)
     {
-      size_t maxbytes = ((struct areltdata *) abfd->arelt_data)->parsed_size;
+      bfd_size_type maxbytes = arelt_size (abfd);
+
       if (abfd->where + size > maxbytes)
         {
           if (abfd->where >= maxbytes)
             return 0;
           size = maxbytes - abfd->where;
         }
     }
 
   if (abfd->iovec)
     nread = abfd->iovec->bread (abfd, ptr, size);
@@ skipping 27 matching lines @@
   return nwrote;
 }
 
 file_ptr
 bfd_tell (bfd *abfd)
 {
   file_ptr ptr;
 
   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;
 
   abfd->where = ptr;
   return ptr;
 }
 
 int
 bfd_flush (bfd *abfd)
@@ skipping 51 matching lines @@
          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.  */
     }
 
   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);
   else
     result = -1;
 
   if (result != 0)
     {
       int hold_errno = errno;
 
@@ skipping 279 matching lines @@
               bfd_size_type *map_len ATTRIBUTE_UNUSED)
 {
   return (void *)-1;
 }
 
 const struct bfd_iovec _bfd_memory_iovec =
 {
   &memory_bread, &memory_bwrite, &memory_btell, &memory_bseek,
   &memory_bclose, &memory_bflush, &memory_bstat, &memory_bmmap
 };