/* Command-line output logging for GDB, the GNU debugger.
- Copyright 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2003-2017 Free Software Foundation, Inc.
This file is part of GDB.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
#include "gdbcmd.h"
#include "ui-out.h"
+#include "interps.h"
-#include "gdb_string.h"
-
-/* These hold the pushed copies of the gdb output files.
- If NULL then nothing has yet been pushed. */
-struct saved_output_files
-{
- struct ui_file *out;
- struct ui_file *err;
- struct ui_file *log;
- struct ui_file *targ;
-};
-static struct saved_output_files saved_output;
static char *saved_filename;
static char *logging_filename;
-int logging_overwrite, logging_redirect;
+static void
+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);
+}
+
+static int logging_overwrite;
+
+static void
+maybe_warn_already_logging ()
+{
+ if (saved_filename)
+ warning (_("Currently logging to %s. Turn the logging off and on to "
+ "make the new setting effective."), saved_filename);
+}
+
+static void
+set_logging_overwrite (char *args, int from_tty, struct cmd_list_element *c)
+{
+ maybe_warn_already_logging ();
+}
+
+static void
+show_logging_overwrite (struct ui_file *file, int from_tty,
+ struct cmd_list_element *c, const char *value)
+{
+ fprintf_filtered (file,
+ _("Whether logging overwrites or "
+ "appends to the log file is %s.\n"),
+ value);
+}
+
+/* Value as configured by the user. */
+static int logging_redirect;
+
+static void
+set_logging_redirect (char *args, int from_tty, struct cmd_list_element *c)
+{
+ maybe_warn_already_logging ();
+}
+
+static void
+show_logging_redirect (struct ui_file *file, int from_tty,
+ struct cmd_list_element *c, const char *value)
+{
+ fprintf_filtered (file, _("The logging output mode is %s.\n"), value);
+}
/* If we've pushed output files, close them and pop them. */
static void
pop_output_files (void)
{
- /* Only delete one of the files -- they are all set to the same
- value. */
- ui_file_delete (gdb_stdout);
- gdb_stdout = saved_output.out;
- gdb_stderr = saved_output.err;
- gdb_stdlog = saved_output.log;
- gdb_stdtarg = saved_output.targ;
- saved_output.out = NULL;
- saved_output.err = NULL;
- saved_output.log = NULL;
- saved_output.targ = NULL;
-
- ui_out_redirect (uiout, NULL);
+ current_interp_set_logging (NULL, 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)
{
- struct ui_file *output;
-
if (saved_filename != NULL)
{
fprintf_unfiltered (gdb_stdout, "Already logging to %s.\n",
return;
}
- output = gdb_fopen (logging_filename, logging_overwrite ? "w" : "a");
- if (output == NULL)
+ stdio_file_up log (new stdio_file ());
+ if (!log->open (logging_filename, logging_overwrite ? "w" : "a"))
perror_with_name (_("set logging"));
/* Redirects everything to gdb_stdout while this is running. */
- if (!logging_redirect)
+ if (from_tty)
{
- output = tee_file_new (gdb_stdout, 0, output, 1);
- if (output == NULL)
- perror_with_name (_("set logging"));
- if (from_tty)
+ if (!logging_redirect)
fprintf_unfiltered (gdb_stdout, "Copying output to %s.\n",
logging_filename);
+ else
+ fprintf_unfiltered (gdb_stdout, "Redirecting output to %s.\n",
+ logging_filename);
}
- else if (from_tty)
- fprintf_unfiltered (gdb_stdout, "Redirecting output to %s.\n",
- logging_filename);
saved_filename = xstrdup (logging_filename);
- saved_output.out = gdb_stdout;
- saved_output.err = gdb_stderr;
- saved_output.log = gdb_stdlog;
- saved_output.targ = gdb_stdtarg;
-
- gdb_stdout = output;
- gdb_stderr = output;
- gdb_stdlog = output;
- gdb_stdtarg = output;
-
- if (ui_out_redirect (uiout, gdb_stdout) < 0)
- warning (_("Current output protocol does not support redirection"));
+
+ /* Let the interpreter do anything it needs. */
+ current_interp_set_logging (std::move (log), logging_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
+ that wraps the log. Don't do the redirect for MI, it confuses
+ MI's ui-out scheme. Note that we may get here with MI as current
+ interpreter, but with the current ui_out as a CLI ui_out, with
+ '-interpreter-exec console "set logging on"'. */
+ if (!current_uiout->is_mi_like_p ())
+ current_uiout->redirect (gdb_stdout);
}
static void
set_logging_on (char *args, int from_tty)
{
char *rest = args;
+
if (rest && *rest)
{
xfree (logging_filename);
static void
set_logging_command (char *args, int from_tty)
{
- printf_unfiltered (_("\
-\"set logging\" lets you log output to a file.\n\
-Usage: set logging on [FILENAME]\n\
- set logging off\n\
- set logging file FILENAME\n\
- set logging overwrite [on|off]\n\
- set logging redirect [on|off]\n"));
+ printf_unfiltered (_("\"set logging\" lets you log output to a file.\n"
+ "Usage: set logging on [FILENAME]\n"
+ " set logging off\n"
+ " set logging file FILENAME\n"
+ " set logging overwrite [on|off]\n"
+ " set logging redirect [on|off]\n"));
}
-void
+static void
show_logging_command (char *args, int from_tty)
{
if (saved_filename)
printf_unfiltered (_("Output will be logged and displayed.\n"));
}
+/* Provide a prototype to silence -Wmissing-prototypes. */
+extern initialize_file_ftype _initialize_cli_logging;
+
void
_initialize_cli_logging (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."), _("\
Show whether logging overwrites or appends to the log file."), _("\
If set, logging overrides the log file."),
- NULL, /* FIXME: i18n: Whether logging overwrites or appends to the log file is %s. */
- NULL, NULL, &set_logging_cmdlist, &show_logging_cmdlist);
+ set_logging_overwrite,
+ show_logging_overwrite,
+ &set_logging_cmdlist, &show_logging_cmdlist);
add_setshow_boolean_cmd ("redirect", class_support, &logging_redirect, _("\
Set the logging output mode."), _("\
Show the logging output mode."), _("\
If redirect is off, output will go to both the screen and the log file.\n\
If redirect is on, output will go only to the log file."),
- NULL, /* FIXME: i18n: The logging output mode is %s. */
- NULL, NULL, &set_logging_cmdlist, &show_logging_cmdlist);
+ 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."), _("\
The logfile is used when directing GDB's output."),
- NULL, /* FIXME: i18n: The current logfile is %s. */
- NULL, NULL,
+ NULL,
+ show_logging_filename,
&set_logging_cmdlist, &show_logging_cmdlist);
add_cmd ("on", class_support, set_logging_on,
- "Enable logging.", &set_logging_cmdlist);
+ _("Enable logging."), &set_logging_cmdlist);
add_cmd ("off", class_support, set_logging_off,
- "Disable logging.", &set_logging_cmdlist);
+ _("Disable logging."), &set_logging_cmdlist);
logging_filename = xstrdup ("gdb.txt");
}
projects / deliverable / binutils-gdb.git / blobdiff