/* Command-line output logging for GDB, the GNU debugger.
- Copyright (C) 2003-2017 Free Software Foundation, Inc.
+ Copyright (C) 2003-2019 Free Software Foundation, Inc.
This file is part of GDB.
#include "gdbcmd.h"
#include "ui-out.h"
#include "interps.h"
+#include "cli/cli-style.h"
static char *saved_filename;
show_logging_filename (struct ui_file *file, int from_tty,
struct cmd_list_element *c, const char *value)
{
- fprintf_filtered (file, _("The current logfile is \"%s\".\n"),
- value);
+ fprintf_filtered (file, _("The current logfile is \"%ps\".\n"),
+ styled_string (file_name_style.style (), value));
}
-static int logging_overwrite;
+static bool logging_overwrite;
static void
maybe_warn_already_logging ()
}
static void
-set_logging_overwrite (char *args, int from_tty, struct cmd_list_element *c)
+set_logging_overwrite (const char *args,
+ int from_tty, struct cmd_list_element *c)
{
maybe_warn_already_logging ();
}
}
/* Value as configured by the user. */
-static int logging_redirect;
+static bool logging_redirect;
+static bool debug_redirect;
static void
-set_logging_redirect (char *args, int from_tty, struct cmd_list_element *c)
+set_logging_redirect (const char *args,
+ int from_tty, struct cmd_list_element *c)
{
maybe_warn_already_logging ();
}
static void
pop_output_files (void)
{
- current_interp_set_logging (NULL, false);
+ current_interp_set_logging (NULL, false, false);
/* Stay consistent with handle_redirections. */
if (!current_uiout->is_mi_like_p ())
current_uiout->redirect (NULL);
}
-/* See cli-interp.h. */
-
-ui_file *
-make_logging_output (ui_file *curr_output, ui_file_up logfile,
- bool logging_redirect)
-{
- if (logging_redirect)
- return logfile.release ();
- else
- {
- /* Note that the "tee" takes ownership of the log file. */
- ui_file *out = new tee_file (curr_output, false,
- logfile.get (), true);
- logfile.release ();
- return out;
- }
-}
-
/* This is a helper for the `set logging' command. */
static void
handle_redirections (int from_tty)
return;
}
- stdio_file_up log (new stdio_file ());
+ stdio_file_up log (new no_terminal_escape_file ());
if (!log->open (logging_filename, logging_overwrite ? "w" : "a"))
perror_with_name (_("set logging"));
else
fprintf_unfiltered (gdb_stdout, "Redirecting output to %s.\n",
logging_filename);
+
+ if (!debug_redirect)
+ fprintf_unfiltered (gdb_stdout, "Copying debug output to %s.\n",
+ logging_filename);
+ else
+ fprintf_unfiltered (gdb_stdout, "Redirecting debug output to %s.\n",
+ logging_filename);
}
saved_filename = xstrdup (logging_filename);
/* Let the interpreter do anything it needs. */
- current_interp_set_logging (std::move (log), logging_redirect);
+ current_interp_set_logging (std::move (log), logging_redirect,
+ debug_redirect);
/* Redirect the current ui-out object's output to the log. Use
gdb_stdout, not log, since the interpreter may have created a tee
}
static void
-set_logging_command (char *args, int from_tty)
+set_logging_command (const char *args, int from_tty)
{
printf_unfiltered (_("\"set logging\" lets you log output to a file.\n"
"Usage: set logging on [FILENAME]\n"
}
static void
-show_logging_command (char *args, int from_tty)
+show_logging_command (const char *args, int from_tty)
{
if (saved_filename)
printf_unfiltered (_("Currently logging to \"%s\".\n"), saved_filename);
printf_unfiltered (_("Output will be sent only to the log file.\n"));
else
printf_unfiltered (_("Output will be logged and displayed.\n"));
+
+ if (debug_redirect)
+ printf_unfiltered (_("Debug output will be sent only to the log file.\n"));
+ else
+ printf_unfiltered (_("Debug output will be logged and displayed.\n"));
}
void
static struct cmd_list_element *set_logging_cmdlist, *show_logging_cmdlist;
add_prefix_cmd ("logging", class_support, set_logging_command,
- _("Set logging options"), &set_logging_cmdlist,
+ _("Set logging options."), &set_logging_cmdlist,
"set logging ", 0, &setlist);
add_prefix_cmd ("logging", class_support, show_logging_command,
- _("Show logging options"), &show_logging_cmdlist,
+ _("Show logging options."), &show_logging_cmdlist,
"show logging ", 0, &showlist);
add_setshow_boolean_cmd ("overwrite", class_support, &logging_overwrite, _("\
Set whether logging overwrites or appends to the log file."), _("\
set_logging_redirect,
show_logging_redirect,
&set_logging_cmdlist, &show_logging_cmdlist);
+ add_setshow_boolean_cmd ("debugredirect", class_support,
+ &debug_redirect, _("\
+Set the logging debug output mode."), _("\
+Show the logging debug output mode."), _("\
+If debug redirect is off, debug will go to both the screen and the log file.\n\
+If debug redirect is on, debug will go only to the log file."),
+ set_logging_redirect,
+ show_logging_redirect,
+ &set_logging_cmdlist, &show_logging_cmdlist);
add_setshow_filename_cmd ("file", class_support, &logging_filename, _("\
Set the current logfile."), _("\
Show the current logfile."), _("\