From 9b7167182d1f6fef32c264587bbc00c7f9bd21f2 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 31 Dec 2021 14:34:07 -0700 Subject: [PATCH] Add puts_unfiltered method to ui_file When the pager is rewritten as a ui_file, gdb will still need a way to bypass the filtering. After examining a few approaches, I chose this patch, which adds a puts_unfiltered method to ui_file. For most implementations of ui_file, this will just delegate to puts. This patch also switches printf_unfiltered to use the new method. --- gdb/ui-file.h | 14 ++++++++++++++ gdb/utils.c | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/gdb/ui-file.h b/gdb/ui-file.h index 8d41f6f8300..7ae3937e41a 100644 --- a/gdb/ui-file.h +++ b/gdb/ui-file.h @@ -124,6 +124,14 @@ public: used to force out output from the wrap_buffer. */ void wrap_here (int indent); + /* Print STR, bypassing any paging that might be done by this + ui_file. Note that nearly no code should call this -- it's + intended for use by printf_filtered, but nothing else. */ + virtual void puts_unfiltered (const char *str) + { + this->puts (str); + } + private: /* Helper function for putstr and putstrn. Print the character C on @@ -342,6 +350,12 @@ public: return m_one->can_page () || m_two->can_page (); } + void puts_unfiltered (const char *str) override + { + m_one->puts_unfiltered (str); + m_two->puts_unfiltered (str); + } + private: /* The two underlying ui_files. */ ui_file *m_one; diff --git a/gdb/utils.c b/gdb/utils.c index a0717213f0f..8f479c487d3 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -2025,7 +2025,9 @@ printf_unfiltered (const char *format, ...) va_list args; va_start (args, format); - vfprintf_unfiltered (gdb_stdout, format, args); + string_file file (gdb_stdout->can_emit_style_escape ()); + file.vprintf (format, args); + gdb_stdout->puts_unfiltered (file.string ().c_str ()); va_end (args); } -- 2.30.2