Merge remote-tracking branch 'origin/master' into amd-common

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

diff --git a/gdb/top.c b/gdb/top.c
index 7e9c40f11a71fd7309f8566506efbdbd0eb32147..a266bfa59256406b64624b1ee6547c1668b15293 100644 (file)
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -55,6 +55,7 @@
 #include "gdbsupport/scope-exit.h"
 #include "gdbarch.h"
 #include "gdbsupport/pathstuff.h"
+#include "cli/cli-style.h"
 
 /* readline include files.  */
 #include "readline/readline.h"
@@ -924,8 +925,8 @@ show_history_filename (struct ui_file *file, int from_tty,
                       struct cmd_list_element *c, const char *value)
 {
   fprintf_filtered (file, _("The filename in which to record "
-                           "the command history is \"%s\".\n"),
-                   value);
+                           "the command history is \"%ps\".\n"),
+                   styled_string (file_name_style.style (), value));
 }
 
 /* This is like readline(), but it has some gdb-specific behavior.
@@ -1192,8 +1193,10 @@ gdb_safe_append_history (void)
   saved_errno = errno;
   if (ret < 0 && saved_errno != ENOENT)
     {
-      warning (_("Could not rename %s to %s: %s"),
-              history_filename, local_history_filename.c_str (),
+      warning (_("Could not rename %ps to %ps: %s"),
+              styled_string (file_name_style.style (), history_filename),
+              styled_string (file_name_style.style (),
+                             local_history_filename.c_str ()),
               safe_strerror (saved_errno));
     }
   else
@@ -1737,13 +1740,17 @@ quit_force (int *exit_arg, int from_tty)
 
   /* Give all pushed targets a chance to do minimal cleanup, and pop
      them all out.  */
-  try
-    {
-      pop_all_targets ();
-    }
-  catch (const gdb_exception &ex)
+  for (inferior *inf : all_inferiors ())
     {
-      exception_print (gdb_stderr, ex);
+      switch_to_inferior_no_thread (inf);
+      try
+       {
+         pop_all_targets ();
+       }
+      catch (const gdb_exception &ex)
+       {
+         exception_print (gdb_stderr, ex);
+       }
     }
 
   /* Save the history information if it is appropriate to do so.  */
@@ -2094,8 +2101,9 @@ static void
 show_gdb_datadir (struct ui_file *file, int from_tty,
                  struct cmd_list_element *c, const char *value)
 {
-  fprintf_filtered (file, _("GDB's data directory is \"%s\".\n"),
-                   gdb_datadir.c_str ());
+  fprintf_filtered (file, _("GDB's data directory is \"%ps\".\n"),
+                   styled_string (file_name_style.style (),
+                                  gdb_datadir.c_str ()));
 }
 
 static void
@@ -2294,7 +2302,6 @@ gdb_init (char *argv0)
 #endif
 
   init_cmd_lists ();       /* This needs to be done first.  */
-  initialize_targets ();    /* Setup target_terminal macros for utils.c.  */
 
   init_page_info ();