Add more filename styling

I found a few spots where filename styling ought to be applied, but is
not.
This commit is contained in:
Tom Tromey 2022-02-28 08:21:55 -07:00
parent 29928b8e3b
commit 972f7a4b97
7 changed files with 21 additions and 9 deletions

View file

@ -476,15 +476,18 @@ file_is_auto_load_safe (const char *filename)
printf_filtered (_("\ printf_filtered (_("\
To enable execution of this file add\n\ To enable execution of this file add\n\
\tadd-auto-load-safe-path %s\n\ \tadd-auto-load-safe-path %s\n\
line to your configuration file \"%s\".\n\ line to your configuration file \"%ps\".\n\
To completely disable this security protection add\n\ To completely disable this security protection add\n\
\tset auto-load safe-path /\n\ \tset auto-load safe-path /\n\
line to your configuration file \"%s\".\n\ line to your configuration file \"%ps\".\n\
For more information about this security protection see the\n\ For more information about this security protection see the\n\
\"Auto-loading safe path\" section in the GDB manual. E.g., run from the shell:\n\ \"Auto-loading safe path\" section in the GDB manual. E.g., run from the shell:\n\
\tinfo \"(gdb)Auto-loading safe path\"\n"), \tinfo \"(gdb)Auto-loading safe path\"\n"),
filename_real.get (), filename_real.get (),
home_config.c_str (), home_config.c_str ()); styled_string (file_name_style.style (),
home_config.c_str ()),
styled_string (file_name_style.style (),
home_config.c_str ()));
advice_printed = true; advice_printed = true;
} }

View file

@ -32,6 +32,7 @@
#include "target.h" #include "target.h"
#include "gdb/fileio.h" #include "gdb/fileio.h"
#include "inferior.h" #include "inferior.h"
#include "cli/cli-style.h"
/* An object of this type is stored in the section's user data when /* An object of this type is stored in the section's user data when
mapping a section. */ mapping a section. */
@ -1101,7 +1102,8 @@ print_one_bfd (void **slot, void *data)
ui_out_emit_tuple tuple_emitter (uiout, NULL); ui_out_emit_tuple tuple_emitter (uiout, NULL);
uiout->field_signed ("refcount", gdata->refc); uiout->field_signed ("refcount", gdata->refc);
uiout->field_string ("addr", host_address_to_string (abfd)); uiout->field_string ("addr", host_address_to_string (abfd));
uiout->field_string ("filename", bfd_get_filename (abfd)); uiout->field_string ("filename", bfd_get_filename (abfd),
file_name_style.style ());
uiout->text ("\n"); uiout->text ("\n");
return 1; return 1;

View file

@ -438,7 +438,8 @@ run_command_1 (const char *args, int from_tty, enum run_how run_how)
uiout->field_string (NULL, "Starting program"); uiout->field_string (NULL, "Starting program");
uiout->text (": "); uiout->text (": ");
if (exec_file) if (exec_file)
uiout->field_string ("execfile", exec_file); uiout->field_string ("execfile", exec_file,
file_name_style.style ());
uiout->spaces (1); uiout->spaces (1);
uiout->field_string ("infargs", current_inferior ()->args ()); uiout->field_string ("infargs", current_inferior ()->args ());
uiout->text ("\n"); uiout->text ("\n");

View file

@ -36,6 +36,7 @@
#include "readline/tilde.h" #include "readline/tilde.h"
#include "progspace-and-thread.h" #include "progspace-and-thread.h"
#include "gdbsupport/buildargv.h" #include "gdbsupport/buildargv.h"
#include "cli/cli-style.h"
/* Keep a registry of per-inferior data-pointers required by other GDB /* Keep a registry of per-inferior data-pointers required by other GDB
modules. */ modules. */
@ -521,7 +522,8 @@ print_inferior (struct ui_out *uiout, const char *requested_inferiors)
uiout->field_string ("connection-id", conn); uiout->field_string ("connection-id", conn);
if (inf->pspace->exec_filename != nullptr) if (inf->pspace->exec_filename != nullptr)
uiout->field_string ("exec", inf->pspace->exec_filename.get ()); uiout->field_string ("exec", inf->pspace->exec_filename.get (),
file_name_style.style ());
else else
uiout->field_skip ("exec"); uiout->field_skip ("exec");

View file

@ -1944,7 +1944,8 @@ info_auto_load_libthread_db (const char *args, int from_tty)
ui_out_emit_tuple tuple_emitter (uiout, NULL); ui_out_emit_tuple tuple_emitter (uiout, NULL);
info = array[i]; info = array[i];
uiout->field_string ("filename", info->filename); uiout->field_string ("filename", info->filename,
file_name_style.style ());
std::string pids; std::string pids;
while (i < array.size () && strcmp (info->filename, while (i < array.size () && strcmp (info->filename,

View file

@ -27,6 +27,7 @@
#include "gdbthread.h" #include "gdbthread.h"
#include "inferior.h" #include "inferior.h"
#include <algorithm> #include <algorithm>
#include "cli/cli-style.h"
/* The last program space number assigned. */ /* The last program space number assigned. */
static int last_program_space_num = 0; static int last_program_space_num = 0;
@ -321,7 +322,8 @@ print_program_space (struct ui_out *uiout, int requested)
uiout->field_signed ("id", pspace->num); uiout->field_signed ("id", pspace->num);
if (pspace->exec_filename != nullptr) if (pspace->exec_filename != nullptr)
uiout->field_string ("exec", pspace->exec_filename.get ()); uiout->field_string ("exec", pspace->exec_filename.get (),
file_name_style.style ());
else else
uiout->field_skip ("exec"); uiout->field_skip ("exec");

View file

@ -4508,7 +4508,8 @@ info_sources_worker (struct ui_out *uiout,
if (group_by_objfile) if (group_by_objfile)
{ {
output_tuple.emplace (uiout, nullptr); output_tuple.emplace (uiout, nullptr);
uiout->field_string ("filename", objfile_name (objfile)); uiout->field_string ("filename", objfile_name (objfile),
file_name_style.style ());
uiout->text (":\n"); uiout->text (":\n");
bool debug_fully_readin = !objfile->has_unexpanded_symtabs (); bool debug_fully_readin = !objfile->has_unexpanded_symtabs ();
if (uiout->is_mi_like_p ()) if (uiout->is_mi_like_p ())