This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH] Style "pwd" output
- From: Tom Tromey <tom at tromey dot com>
- To: gdb-patches at sourceware dot org
- Cc: Tom Tromey <tom at tromey dot com>
- Date: Tue, 4 Jun 2019 20:01:16 -0600
- Subject: [PATCH] Style "pwd" output
This changes the "pwd" command to style its output.
Tested on x86-64 Fedora 29.
gdb/ChangeLog
2019-06-04 Tom Tromey <tom@tromey.com>
* cli/cli-cmds.c (pwd_command): Style output.
gdb/testsuite/ChangeLog
2019-06-04 Tom Tromey <tom@tromey.com>
* gdb.base/style.exp: Test "pwd".
---
gdb/ChangeLog | 4 ++++
gdb/cli/cli-cmds.c | 14 +++++++++-----
gdb/testsuite/ChangeLog | 4 ++++
gdb/testsuite/gdb.base/style.exp | 2 ++
4 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 09f932c2d21..658b08e49a6 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"
@@ -337,11 +338,14 @@ pwd_command (const char *args, int from_tty)
error (_("Error finding name of working directory: %s"),
safe_strerror (errno));
- if (strcmp (cwd.get (), current_directory) != 0)
- printf_unfiltered (_("Working directory %s\n (canonically %s).\n"),
- current_directory, cwd.get ());
- else
- printf_unfiltered (_("Working directory %s.\n"), current_directory);
+ fputs_filtered (_("Working directory "), gdb_stdout);
+ fputs_styled (current_directory, file_name_style.style (), gdb_stdout);
+ if (strcmp (cwd.get (), current_directory) == 0)
+ {
+ fputs_filtered (_("\n (canonically "), gdb_stdout);
+ fputs_styled (cwd.get (), file_name_style.style (), gdb_stdout);
+ }
+ fputs_filtered (".\n", gdb_stdout);
}
void
diff --git a/gdb/testsuite/gdb.base/style.exp b/gdb/testsuite/gdb.base/style.exp
index a17f2014865..0b2d52a9dea 100644
--- a/gdb/testsuite/gdb.base/style.exp
+++ b/gdb/testsuite/gdb.base/style.exp
@@ -127,4 +127,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.17.2