diff options
Diffstat (limited to 'gdb/cli/cli-interp.c')
| -rw-r--r-- | gdb/cli/cli-interp.c | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c index 7876f91..a8cf617 100644 --- a/gdb/cli/cli-interp.c +++ b/gdb/cli/cli-interp.c @@ -395,13 +395,15 @@ struct saved_output_files ui_file *log; ui_file *targ; ui_file *targerr; + ui_file *file_to_delete; }; static saved_output_files saved_output; /* See cli-interp.h. */ void -cli_interp_base::set_logging (ui_file_up logfile, bool logging_redirect) +cli_interp_base::set_logging (ui_file_up logfile, bool logging_redirect, + bool debug_redirect) { if (logfile != nullptr) { @@ -411,28 +413,34 @@ cli_interp_base::set_logging (ui_file_up logfile, bool logging_redirect) saved_output.targ = gdb_stdtarg; saved_output.targerr = gdb_stdtargerr; - /* If logging is being redirected, then grab logfile. */ + /* If something is being redirected, then grab logfile. */ ui_file *logfile_p = nullptr; - if (logging_redirect) - logfile_p = logfile.release (); + if (logging_redirect || debug_redirect) + { + logfile_p = logfile.get (); + saved_output.file_to_delete = logfile_p; + } - /* If logging is not being redirected, then a tee containing both the + /* If something is not being redirected, then a tee containing both the logfile and stdout. */ ui_file *tee = nullptr; - if (!logging_redirect) - tee = new tee_file (gdb_stdout, std::move (logfile)); + if (!logging_redirect || !debug_redirect) + { + tee = new tee_file (gdb_stdout, std::move (logfile)); + saved_output.file_to_delete = tee; + } gdb_stdout = logging_redirect ? logfile_p : tee; - gdb_stdlog = logging_redirect ? logfile_p : tee; + gdb_stdlog = debug_redirect ? logfile_p : tee; gdb_stderr = logging_redirect ? logfile_p : tee; gdb_stdtarg = logging_redirect ? logfile_p : tee; gdb_stdtargerr = logging_redirect ? logfile_p : tee; } else { - /* Only delete one of the files -- they are all set to the same - value. */ - delete gdb_stdout; + /* Delete the correct file. If it's the tee then the logfile will also + be deleted. */ + delete saved_output.file_to_delete; gdb_stdout = saved_output.out; gdb_stderr = saved_output.err; @@ -445,6 +453,7 @@ cli_interp_base::set_logging (ui_file_up logfile, bool logging_redirect) saved_output.log = nullptr; saved_output.targ = nullptr; saved_output.targerr = nullptr; + saved_output.file_to_delete = nullptr; } } |