Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Don't let gdb_stdlog use pager

Browse Source 
When using the "set logging" commands, cli_interp_base::set_logging
will send gdb_stdlog output (among others) to the tee it makes for
gdb_stdout.  However, this has the side effect of also causing logging
to use the pager.  This is PR gdb/29787.

This patch fixes the problem by keeping stderr and stdlog separate
from stdout, preserving the rule that only gdb_stdout should page.

Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29787
This commit is contained in:
Tom Tromey
2022-11-17 10:24:38 -07:00
parent 2b141965f2
commit 1dd889362b
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gdb/cli/cli-interp.c
View File

@@ -389,24 +389,28 @@ cli_interp_base::set_logging (ui_file_up logfile, bool logging_redirect,
ui_file *logfile_p = logfile.get ();
m_saved_output->file_to_delete = std::move (logfile);
/* If something is not being redirected, then a tee containing both the
logfile and stdout. */
ui_file *tee = nullptr;
if (!logging_redirect || !debug_redirect)
/* The new stdout and stderr only depend on whether logging
redirection is being done. */
ui_file *new_stdout = logfile_p;
ui_file *new_stderr = logfile_p;
if (!logging_redirect)
{
m_saved_output->tee_to_delete.reset
(new tee_file (gdb_stdout, logfile_p));
tee = m_saved_output->tee_to_delete.get ();
new_stdout = m_saved_output->tee_to_delete.get ();
m_saved_output->stderr_to_delete.reset
(new tee_file (gdb_stderr, logfile_p));
new_stderr = m_saved_output->stderr_to_delete.get ();
}
m_saved_output->log_to_delete.reset
(new timestamped_file (debug_redirect ? logfile_p : tee));
(new timestamped_file (debug_redirect ? logfile_p : new_stderr));
gdb_stdout = logging_redirect ? logfile_p : tee;
gdb_stdout = new_stdout;
gdb_stdlog = m_saved_output->log_to_delete.get ();
gdb_stderr = logging_redirect ? logfile_p : tee;
gdb_stdtarg = logging_redirect ? logfile_p : tee;
gdb_stdtargerr = logging_redirect ? logfile_p : tee;
gdb_stderr = new_stderr;
gdb_stdtarg = new_stderr;
gdb_stdtargerr = new_stderr;
}
else
{

1
gdb/cli/cli-interp.h
View File

@@ -42,6 +42,7 @@ private:
ui_file *targ;
ui_file *targerr;
ui_file_up tee_to_delete;
ui_file_up stderr_to_delete;
ui_file_up file_to_delete;
ui_file_up log_to_delete;
};