mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-02-11 13:02:10 +08:00
With this patch, the help docs now respect 2 invariants: * The first line of a command help is terminated by a '.' character. * The last character of a command help is not a newline character. Note that the changes for the last invariant were done by Tom, as part of : [PATCH] Remove trailing newlines from help text https://sourceware.org/ml/gdb-patches/2019-06/msg00050.html but some occurrences have been re-introduced since then. Some help docs had to be rephrased/restructured to respect the above invariants. Before this patch, print_doc_line was printing the first line of a command help documentation, but stopping at the first '.' or ',' character. This was giving inconsistent results : * The first line of command helps was sometimes '.' terminated, sometimes not. * The first line of command helps was not always designed to be readable/understandable/unambiguous when stopping at the first '.' or ',' character. This e.g. created the following inconsistencies/problems: < catch exception -- Catch Ada exceptions < catch handlers -- Catch Ada exceptions < catch syscall -- Catch system calls by their names < down-silently -- Same as the `down' command while the new help is: > catch exception -- Catch Ada exceptions, when raised. > catch handlers -- Catch Ada exceptions, when handled. > catch syscall -- Catch system calls by their names, groups and/or numbers. > down-silently -- Same as the `down' command, but does not print anything. Also, the command help doc should not be terminated by a newline character, but this was not respected by all commands. The cli-option -OPT framework re-introduced some occurences. So, the -OPT build help framework was changed to not output newlines at the end of %OPTIONS% replacement. This patch changes the help documentations to ensure the 2 invariants given above. It implied to slightly rephrase or restructure some help docs. Based on the above invariants, print_doc_line (called by 'apropos' and 'help' commands to print the first line of a command help) now outputs the full first line of a command help. This all results in a lot of small changes in the produced help docs. There are less code changes than changes in the help docs, as a lot of docs are produced by some code (e.g. the remote packet usage settings). gdb/ChangeLog 2019-08-07 Philippe Waroquiers <philippe.waroquiers@skynet.be> * cli/cli-decode.h (print_doc_line): Add for_value_prefix argument. * cli/cli-decode.c (print_doc_line): Likewise. It now prints the full first line, except when FOR_VALUE_PREFIX. In this case, the trailing '.' is not output, and the first character is uppercased. (print_help_for_command): Update call to print_doc_line. (print_doc_of_command): Likewise. * cli/cli-setshow.c (deprecated_show_value_hack): Likewise. * cli/cli-option.c (append_indented_doc): Do not append newline. (build_help_option): Append newline after first appended_indented_doc only if a second call is done. (build_help): Append 2 new lines before each option, except the first one. * compile/compile.c (_initialize_compile): Add new lines after %OPTIONS%, when not at the end of the help. Change help doc or code producing the help doc to respect the invariants. * maint-test-options.c (_initialize_maint_test_options): Likewise. Also removed the new line after 'Options:', as all other commands do not put an empty line between 'Options:' and the first option. * printcmd.c (_initialize_printcmd): Likewise. * stack.c (_initialize_stack): Likewise. * interps.c (interpreter_exec_cmd): Fix "Usage:" line that was incorrectly telling COMMAND is optional. * ada-lang.c (_initialize_ada_language): Change help doc or code producing the help doc to respect the invariants. * ada-tasks.c (_initialize_ada_tasks): Likewise. * breakpoint.c (_initialize_breakpoint): Likewise. * cli/cli-cmds.c (_initialize_cli_cmds): Likewise. * cli/cli-logging.c (_initialize_cli_logging): Likewise. * cli/cli-setshow.c (_initialize_cli_setshow): Likewise. * cli/cli-style.c (cli_style_option::add_setshow_commands, _initialize_cli_style): Likewise. * corelow.c (core_target_info): Likewise. * dwarf-index-cache.c (_initialize_index_cache): Likewise. * dwarf2read.c (_initialize_dwarf2_read): Likewise. * filesystem.c (_initialize_filesystem): Likewise. * frame.c (_initialize_frame): Likewise. * gnu-nat.c (add_task_commands): Likewise. * infcall.c (_initialize_infcall): Likewise. * infcmd.c (_initialize_infcmd): Likewise. * interps.c (_initialize_interpreter): Likewise. * language.c (_initialize_language): Likewise. * linux-fork.c (_initialize_linux_fork): Likewise. * maint-test-settings.c (_initialize_maint_test_settings): Likewise. * maint.c (_initialize_maint_cmds): Likewise. * memattr.c (_initialize_mem): Likewise. * printcmd.c (_initialize_printcmd): Likewise. * python/lib/gdb/function/strfns.py (_MemEq, _StrLen, _StrEq, _RegEx): Likewise. * ravenscar-thread.c (_initialize_ravenscar): Likewise. * record-btrace.c (_initialize_record_btrace): Likewise. * record-full.c (_initialize_record_full): Likewise. * record.c (_initialize_record): Likewise. * regcache-dump.c (_initialize_regcache_dump): Likewise. * regcache.c (_initialize_regcache): Likewise. * remote.c (add_packet_config_cmd, init_remote_threadtests, _initialize_remote): Likewise. * ser-tcp.c (_initialize_ser_tcp): Likewise. * serial.c (_initialize_serial): Likewise. * skip.c (_initialize_step_skip): Likewise. * source.c (_initialize_source): Likewise. * stack.c (_initialize_stack): Likewise. * symfile.c (_initialize_symfile): Likewise. * symtab.c (_initialize_symtab): Likewise. * target-descriptions.c (_initialize_target_descriptions): Likewise. * top.c (init_main): Likewise. * tracefile-tfile.c (tfile_target_info): Likewise. * tracepoint.c (_initialize_tracepoint): Likewise. * tui/tui-win.c (_initialize_tui_win): Likewise. * utils.c (add_internal_problem_command): Likewise. * valprint.c (value_print_option_defs): Likewise. gdb/testsuite/ChangeLog 2019-08-07 Philippe Waroquiers <philippe.waroquiers@skynet.be> * gdb.base/style.exp: Update tests for help doc new invariants. * gdb.base/help.exp: Likewise.
253 lines
7.9 KiB
C
253 lines
7.9 KiB
C
/* Command-line output logging for GDB, the GNU debugger.
|
|
|
|
Copyright (C) 2003-2019 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 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
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, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "gdbcmd.h"
|
|
#include "ui-out.h"
|
|
#include "interps.h"
|
|
|
|
static char *saved_filename;
|
|
|
|
static char *logging_filename;
|
|
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 (const 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 int debug_redirect;
|
|
|
|
static void
|
|
set_logging_redirect (const 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)
|
|
{
|
|
current_interp_set_logging (NULL, false, false);
|
|
|
|
/* Stay consistent with handle_redirections. */
|
|
if (!current_uiout->is_mi_like_p ())
|
|
current_uiout->redirect (NULL);
|
|
}
|
|
|
|
/* This is a helper for the `set logging' command. */
|
|
static void
|
|
handle_redirections (int from_tty)
|
|
{
|
|
if (saved_filename != NULL)
|
|
{
|
|
fprintf_unfiltered (gdb_stdout, "Already logging to %s.\n",
|
|
saved_filename);
|
|
return;
|
|
}
|
|
|
|
stdio_file_up log (new no_terminal_escape_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 (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);
|
|
|
|
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,
|
|
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
|
|
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 (const char *args, int from_tty)
|
|
{
|
|
const char *rest = args;
|
|
|
|
if (rest && *rest)
|
|
{
|
|
xfree (logging_filename);
|
|
logging_filename = xstrdup (rest);
|
|
}
|
|
handle_redirections (from_tty);
|
|
}
|
|
|
|
static void
|
|
set_logging_off (const char *args, int from_tty)
|
|
{
|
|
if (saved_filename == NULL)
|
|
return;
|
|
|
|
pop_output_files ();
|
|
if (from_tty)
|
|
fprintf_unfiltered (gdb_stdout, "Done logging to %s.\n", saved_filename);
|
|
xfree (saved_filename);
|
|
saved_filename = NULL;
|
|
}
|
|
|
|
static void
|
|
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"
|
|
" set logging off\n"
|
|
" set logging file FILENAME\n"
|
|
" set logging overwrite [on|off]\n"
|
|
" set logging redirect [on|off]\n"));
|
|
}
|
|
|
|
static void
|
|
show_logging_command (const char *args, int from_tty)
|
|
{
|
|
if (saved_filename)
|
|
printf_unfiltered (_("Currently logging to \"%s\".\n"), saved_filename);
|
|
if (saved_filename == NULL
|
|
|| strcmp (logging_filename, saved_filename) != 0)
|
|
printf_unfiltered (_("Future logs will be written to %s.\n"),
|
|
logging_filename);
|
|
|
|
if (logging_overwrite)
|
|
printf_unfiltered (_("Logs will overwrite the log file.\n"));
|
|
else
|
|
printf_unfiltered (_("Logs will be appended to the log file.\n"));
|
|
|
|
if (logging_redirect)
|
|
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
|
|
_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 ", 0, &setlist);
|
|
add_prefix_cmd ("logging", class_support, show_logging_command,
|
|
_("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."),
|
|
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."),
|
|
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."), _("\
|
|
The logfile is used when directing GDB's output."),
|
|
NULL,
|
|
show_logging_filename,
|
|
&set_logging_cmdlist, &show_logging_cmdlist);
|
|
add_cmd ("on", class_support, set_logging_on,
|
|
_("Enable logging."), &set_logging_cmdlist);
|
|
add_cmd ("off", class_support, set_logging_off,
|
|
_("Disable logging."), &set_logging_cmdlist);
|
|
|
|
logging_filename = xstrdup ("gdb.txt");
|
|
}
|