* bfd-target.c (target_bfd_reopen): Update.

[deliverable/binutils-gdb.git] / gdb / exec.c

diff --git a/gdb/exec.c b/gdb/exec.c
index a2da9d5297c1e49e338878e995ca6493fbc54a86..dc9258a6544c966ac6934df544a00b76479eca6a 100644 (file)
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -1,8 +1,6 @@
 /* Work with executable files, for GDB. 
 
-   Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
-   1998, 1999, 2000, 2001, 2002, 2003, 2007, 2008, 2009, 2010, 2011
-   Free Software Foundation, Inc.
+   Copyright (C) 1988-2003, 2007-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -35,6 +33,7 @@
 #include "arch-utils.h"
 #include "gdbthread.h"
 #include "progspace.h"
+#include "gdb_bfd.h"
 
 #include <fcntl.h>
 #include "readline/readline.h"
@@ -100,10 +99,8 @@ exec_close (void)
   if (exec_bfd)
     {
       bfd *abfd = exec_bfd;
-      char *name = bfd_get_filename (abfd);
 
-      gdb_bfd_close_or_warn (abfd);
-      xfree (name);
+      gdb_bfd_unref (abfd);
 
       /* Removing target sections may close the exec_ops target.
         Clear exec_bfd before doing so to prevent recursion.  */
@@ -139,8 +136,7 @@ exec_close_1 (int quitting)
          need_symtab_cleanup = 1;
        }
       else if (vp->bfd != exec_bfd)
-       /* FIXME-leak: We should be freeing vp->name too, I think.  */
-       gdb_bfd_close_or_warn (vp->bfd);
+       gdb_bfd_unref (vp->bfd);
 
       xfree (vp);
     }
@@ -232,26 +228,22 @@ exec_file_attach (char *filename, int from_tty)
             &scratch_pathname);
        }
 #endif
+
+      cleanups = make_cleanup (xfree, scratch_pathname);
+
       if (scratch_chan < 0)
        perror_with_name (filename);
       exec_bfd = bfd_fopen (scratch_pathname, gnutarget,
                            write_files ? FOPEN_RUB : FOPEN_RB,
                            scratch_chan);
+      gdb_bfd_ref (exec_bfd);
 
       if (!exec_bfd)
        {
-         close (scratch_chan);
          error (_("\"%s\": could not open as an executable file: %s"),
                 scratch_pathname, bfd_errmsg (bfd_get_error ()));
        }
 
-      /* At this point, scratch_pathname and exec_bfd->name both point to the
-         same malloc'd string.  However exec_close() will attempt to free it
-         via the exec_bfd->name pointer, so we need to make another copy and
-         leave exec_bfd as the new owner of the original copy.  */
-      scratch_pathname = xstrdup (scratch_pathname);
-      cleanups = make_cleanup (xfree, scratch_pathname);
-
       if (!bfd_check_format_matches (exec_bfd, bfd_object, &matching))
        {
          /* Make sure to close exec_bfd, or else "run" might try to use
@@ -262,6 +254,8 @@ exec_file_attach (char *filename, int from_tty)
                 gdb_bfd_errmsg (bfd_get_error (), matching));
        }
 
+      gdb_bfd_stash_filename (exec_bfd);
+
       /* FIXME - This should only be run for RS6000, but the ifdef is a poor
          way to accomplish.  */
 #ifdef DEPRECATED_IBM6000_TARGET
@@ -669,7 +663,7 @@ section_table_xfer_memory_partial (gdb_byte *readbuf, const gdb_byte *writebuf,
   return 0;                    /* We can't help.  */
 }
 
-struct target_section_table *
+static struct target_section_table *
 exec_get_section_table (struct target_ops *ops)
 {
   return current_target_sections;
@@ -763,7 +757,10 @@ print_section_info (struct target_section_table *t, bfd *abfd)
 static void
 exec_files_info (struct target_ops *t)
 {
-  print_section_info (current_target_sections, exec_bfd);
+  if (exec_bfd)
+    print_section_info (current_target_sections, exec_bfd);
+  else
+    puts_filtered (_("\t<no file loaded>\n"));
 
   if (vmap)
     {
@@ -815,9 +812,9 @@ set_section_command (char *args, int from_tty)
   table = current_target_sections;
   for (p = table->sections; p < table->sections_end; p++)
     {
-      if (!strncmp (secname, bfd_section_name (exec_bfd,
+      if (!strncmp (secname, bfd_section_name (p->bfd,
                                               p->the_bfd_section), seclen)
-         && bfd_section_name (exec_bfd, p->the_bfd_section)[seclen] == '\0')
+         && bfd_section_name (p->bfd, p->the_bfd_section)[seclen] == '\0')
        {
          offset = secaddr - p->addr;
          p->addr += offset;