Merge GDB 7.5.1

bfd/cache.c

 /* BFD library -- caching of file descriptors.
 
    Copyright 1990, 1991, 1992, 1993, 1994, 1996, 2000, 2001, 2002,
    2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
 
    Hacked by Steve Chamberlain of Cygnus Support (steve@cygnus.com).
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
@@ skipping 180 matching lines @@
    avoid running out of file descriptors.  It will return NULL
    if it is unable to (re)open the @var{abfd}.  */
 
 static FILE *
 bfd_cache_lookup_worker (bfd *abfd, enum cache_flag flag)
 {
   bfd *orig_bfd = abfd;
   if ((abfd->flags & BFD_IN_MEMORY) != 0)
     abort ();
 
-  if (abfd->my_archive)
+  while (abfd->my_archive)
     abfd = abfd->my_archive;
 
   if (abfd->iostream != NULL)
     {
       /* Move the file to the start of the cache.  */
       if (abfd != bfd_last_cache)
         {
           snip (abfd);
           insert (abfd);
         }
@@ skipping 344 matching lines @@
   if (open_files >= BFD_CACHE_MAX_OPEN)
     {
       if (! close_one ())
         return NULL;
     }
 
   switch (abfd->direction)
     {
     case read_direction:
     case no_direction:
-      abfd->iostream = (PTR) real_fopen (abfd->filename, FOPEN_RB);
+      abfd->iostream = real_fopen (abfd->filename, FOPEN_RB);
       break;
     case both_direction:
     case write_direction:
       if (abfd->opened_once)
         {
-          abfd->iostream = (PTR) real_fopen (abfd->filename, FOPEN_RUB);
+          abfd->iostream = real_fopen (abfd->filename, FOPEN_RUB);
           if (abfd->iostream == NULL)
-            abfd->iostream = (PTR) real_fopen (abfd->filename, FOPEN_WUB);
+            abfd->iostream = real_fopen (abfd->filename, FOPEN_WUB);
         }
       else
         {
           /* Create the file.
 
              Some operating systems won't let us overwrite a running
              binary.  For them, we want to unlink the file first.
 
              However, gcc 2.95 will create temporary files using
              O_EXCL and tight permissions to prevent other users from
              substituting other .o files during the compilation.  gcc
              will then tell the assembler to use the newly created
              file as an output file.  If we unlink the file here, we
              open a brief window when another user could still
              substitute a file.
 
              So we unlink the output file if and only if it has
              non-zero size.  */
 #ifndef __MSDOS__
           /* Don't do this for MSDOS: it doesn't care about overwriting
              a running binary, but if this file is already open by
              another BFD, we will be in deep trouble if we delete an
              open file.  In fact, objdump does just that if invoked with
              the --info option.  */
           struct stat s;
 
           if (stat (abfd->filename, &s) == 0 && s.st_size != 0)
             unlink_if_ordinary (abfd->filename);
 #endif
-          abfd->iostream = (PTR) real_fopen (abfd->filename, FOPEN_WUB);
+          abfd->iostream = real_fopen (abfd->filename, FOPEN_WUB);
           abfd->opened_once = TRUE;
         }
       break;
     }
 
   if (abfd->iostream == NULL)
     bfd_set_error (bfd_error_system_call);
   else
     {
       if (! bfd_cache_init (abfd))
         return NULL;
     }
 
   return (FILE *) abfd->iostream;
 }