From 14309bb6bfe31e5ad26035cd41a46bdbaec154b0 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 4 Jun 2019 20:00:40 -0600 Subject: [PATCH] Style "pwd" output This changes the "pwd" command to style its output. gdb/ChangeLog 2019-10-01 Tom Tromey * cli/cli-cmds.c (pwd_command): Style output. gdb/testsuite/ChangeLog 2019-10-01 Tom Tromey * gdb.base/style.exp: Test "pwd". --- gdb/ChangeLog | 4 ++++ gdb/cli/cli-cmds.c | 11 ++++++++--- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.base/style.exp | 2 ++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 980aa60571f..514a8bd99ac 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2019-10-01 Tom Tromey + + * cli/cli-cmds.c (pwd_command): Style output. + 2019-10-01 Pedro Alves Tom Tromey diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 59c71f67561..9f7b052d8e0 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -49,6 +49,7 @@ #include "cli/cli-script.h" #include "cli/cli-setshow.h" #include "cli/cli-cmds.h" +#include "cli/cli-style.h" #include "cli/cli-utils.h" #include "extension.h" @@ -451,10 +452,14 @@ pwd_command (const char *args, int from_tty) safe_strerror (errno)); if (strcmp (cwd.get (), current_directory) != 0) - printf_unfiltered (_("Working directory %s\n (canonically %s).\n"), - current_directory, cwd.get ()); + printf_unfiltered (_("Working directory %ps\n (canonically %ps).\n"), + styled_string (file_name_style.style (), + current_directory), + styled_string (file_name_style.style (), cwd.get ())); else - printf_unfiltered (_("Working directory %s.\n"), current_directory); + printf_unfiltered (_("Working directory %ps.\n"), + styled_string (file_name_style.style (), + current_directory)); } void diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index b9a320c9811..88cec5dfb37 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2019-10-01 Tom Tromey + + * gdb.base/style.exp: Test "pwd". + 2019-10-01 Tom Tromey * gdb.base/style.exp: Update tests. diff --git a/gdb/testsuite/gdb.base/style.exp b/gdb/testsuite/gdb.base/style.exp index d2c3105bb9f..fb0dfed0061 100644 --- a/gdb/testsuite/gdb.base/style.exp +++ b/gdb/testsuite/gdb.base/style.exp @@ -131,4 +131,6 @@ save_vars { env(TERM) } { gdb_test "file $binfile" \ "Reading symbols from [style $quoted file]..." \ "filename is styled when loading symbol file" + + gdb_test "pwd" "Working directory [style .*? file].*" } -- 2.30.2