Put GDB's terminal settings into effect when paginating

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

diff --git a/gdb/inferior.c b/gdb/inferior.c
index ed6b6260b33a1743b79e97f892ee3f5b11f49378..23da0c7fe4d95a03d8366bfc2d2a9aa977d8d5f0 100644 (file)
--- a/gdb/inferior.c
+++ b/gdb/inferior.c
@@ -1,6 +1,6 @@
 /* Multi-process control for GDB, the GNU debugger.
 
-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -27,7 +27,6 @@
 #include "gdbthread.h"
 #include "ui-out.h"
 #include "observer.h"
-#include "gdbthread.h"
 #include "gdbcore.h"
 #include "symfile.h"
 #include "environ.h"
@@ -35,6 +34,7 @@
 #include "continuations.h"
 #include "arch-utils.h"
 #include "target-descriptions.h"
+#include "readline/tilde.h"
 
 void _initialize_inferiors (void);
 
@@ -475,8 +475,8 @@ have_live_inferiors (void)
   return inf != NULL;
 }
 
-/* Prune away automatically added program spaces that aren't required
-   anymore.  */
+/* Prune away any unused inferiors, and then prune away no longer used
+   program spaces.  */
 
 void
 prune_inferiors (void)
@@ -587,9 +587,8 @@ print_inferior (struct ui_out *uiout, char *requested_inferiors)
       ui_out_field_string (uiout, "target-id",
                           inferior_pid_to_str (inf->pid));
 
-      if (inf->pspace->ebfd)
-       ui_out_field_string (uiout, "exec",
-                            bfd_get_filename (inf->pspace->ebfd));
+      if (inf->pspace->pspace_exec_filename != NULL)
+       ui_out_field_string (uiout, "exec", inf->pspace->pspace_exec_filename);
       else
        ui_out_field_skip (uiout, "exec");
 
@@ -703,8 +702,8 @@ inferior_command (char *args, int from_tty)
   printf_filtered (_("[Switching to inferior %d [%s] (%s)]\n"),
                   inf->num,
                   inferior_pid_to_str (inf->pid),
-                  (inf->pspace->ebfd
-                   ? bfd_get_filename (inf->pspace->ebfd)
+                  (inf->pspace->pspace_exec_filename != NULL
+                   ? inf->pspace->pspace_exec_filename
                    : _("<noexec>")));
 
   if (inf->pid != 0)
@@ -739,7 +738,7 @@ inferior_command (char *args, int from_tty)
   else if (inf->pid != 0)
     {
       ui_out_text (current_uiout, "\n");
-      print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC);
+      print_stack_frame (get_selected_frame (NULL), 1, SRC_AND_LOC, 1);
     }
 }
 
@@ -789,6 +788,8 @@ remove_inferior_command (char *args, int from_tty)
 
       delete_inferior_1 (inf, 1);
     }
+
+  prune_program_spaces ();
 }
 
 struct inferior *
@@ -850,7 +851,8 @@ add_inferior_command (char *args, int from_tty)
                  ++argv;
                  if (!*argv)
                    error (_("No argument to -exec"));
-                 exec = *argv;
+                 exec = tilde_expand (*argv);
+                 make_cleanup (xfree, exec);
                }
            }
          else