Merge GDB 7.5.1

bfd/opncls.c

 /* opncls.c -- open and close a BFD.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
-   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012
    Free Software Foundation, Inc.
 
    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
@@ skipping 169 matching lines @@
         <<fdopen>>. 
 
         Calls <<bfd_find_target>>, so @var{target} is interpreted as by
         that function.
 
         The new BFD is marked as cacheable iff @var{fd} is -1.
 
         If <<NULL>> is returned then an error has occured.   Possible errors
         are <<bfd_error_no_memory>>, <<bfd_error_invalid_target>> or
         <<system_call>> error.
+
+        On error, @var{fd} is always closed.
 */
 
 bfd *
 bfd_fopen (const char *filename, const char *target, const char *mode, int fd)
 {
   bfd *nbfd;
   const bfd_target *target_vec;
 
   nbfd = _bfd_new_bfd ();
   if (nbfd == NULL)
-    return NULL;
+    {
+      if (fd != -1)
+        close (fd);
+      return NULL;
+    }
 
   target_vec = bfd_find_target (target, nbfd);
   if (target_vec == NULL)
     {
+      if (fd != -1)
+        close (fd);
       _bfd_delete_bfd (nbfd);
       return NULL;
     }
   
 #ifdef HAVE_FDOPEN
   if (fd != -1)
     nbfd->iostream = fdopen (fd, mode);
   else
 #endif
     nbfd->iostream = real_fopen (filename, mode);
@@ skipping 82 matching lines @@
         cached by BFD (opened as needed, closed as needed to free
         descriptors for other opens), with the supplied @var{fd} used as
         an initial file descriptor (but subject to closure at any time),
         call bfd_set_cacheable(bfd, 1) on the returned BFD.  The default
         is to assume no caching; the file descriptor will remain open
         until <<bfd_close>>, and will not be affected by BFD operations
         on other files.
 
         Possible errors are <<bfd_error_no_memory>>,
         <<bfd_error_invalid_target>> and <<bfd_error_system_call>>.
+
+        On error, @var{fd} is closed.
 */
 
 bfd *
 bfd_fdopenr (const char *filename, const char *target, int fd)
 {
   const char *mode;
 #if defined(HAVE_FCNTL) && defined(F_GETFL)
   int fdflags;
 #endif
 
 #if ! defined(HAVE_FCNTL) || ! defined(F_GETFL)
   mode = FOPEN_RUB; /* Assume full access.  */
 #else
   fdflags = fcntl (fd, F_GETFL, NULL);
   if (fdflags == -1)
     {
+      int save = errno;
+
+      close (fd);
+      errno = save;
       bfd_set_error (bfd_error_system_call);
       return NULL;
     }
 
   /* (O_ACCMODE) parens are to avoid Ultrix header file bug.  */
   switch (fdflags & (O_ACCMODE))
     {
     case O_RDONLY: mode = FOPEN_RB; break;
     case O_WRONLY: mode = FOPEN_RUB; break;
     case O_RDWR:   mode = FOPEN_RUB; break;
@@ skipping 1187 matching lines @@
 
   if (! bfd_set_section_contents (abfd, sect, contents, 0, debuglink_size))
     {
       /* XXX Should we delete the section from the bfd ?  */
       free (contents);
       return FALSE;
     }
 
   return TRUE;
 }