aboutsummaryrefslogtreecommitdiff
path: root/gdb/main.c
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2018-05-11 12:21:03 -0600
committerTom Tromey <tom@tromey.com>2018-06-05 11:47:50 -0600
commitc61b06a19a34baab66e3809c7b41b0c31009ed9f (patch)
treee15238ee1c30840aa5b761cc8663bd079f51e4a8 /gdb/main.c
parent115f7325b5b76450b9a1d16848a2a54f54e49747 (diff)
downloadgdb-c61b06a19a34baab66e3809c7b41b0c31009ed9f.zip
gdb-c61b06a19a34baab66e3809c7b41b0c31009ed9f.tar.gz
gdb-c61b06a19a34baab66e3809c7b41b0c31009ed9f.tar.bz2
Remove some text from --version output
I happened to notice recently that "gdb --version" says: GNU gdb (GDB) 8.0.50.20170911-git Copyright (C) 2017 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-pc-linux-gnu". Type "show configuration" for configuration details. For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/>. For help, type "help". Type "apropos word" to search for commands related to "word". This is a bit on the wordy side, but also references interactive commands, which I think doesn't really make sense for --version. This patch removes some text from --version, while leaving it in the "show version" output. It also adds a newline between the URLs and the "For help, ..." text, because I thought that was easier to read. Finally, it indents one of the URLs, since that was simpler to read, but not the other URL, because the current format is specified by the GNU coding standards section on "--version". Now the --version output looks like: GNU gdb (GDB) 8.1.50.20180511-git Copyright (C) 2018 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Tested by the buildbot. gdb/ChangeLog 2018-06-05 Tom Tromey <tom@tromey.com> * cli/cli-cmds.c (show_version): Update. * top.c (print_gdb_version): Add "interactive" parameter. Update. * main.c (captured_main_1): Update. * top.h (print_gdb_version): Add "interactive" parameter and a comment. gdb/testsuite/ChangeLog 2018-06-05 Tom Tromey <tom@tromey.com> * gdb.base/default.exp: Update expected "show version" output.
Diffstat (limited to 'gdb/main.c')
-rw-r--r--gdb/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gdb/main.c b/gdb/main.c
index 189266f..9694af2 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -918,7 +918,7 @@ captured_main_1 (struct captured_main_args *context)
if (print_version)
{
- print_gdb_version (gdb_stdout);
+ print_gdb_version (gdb_stdout, false);
wrap_here ("");
printf_filtered ("\n");
exit (0);
@@ -947,7 +947,7 @@ captured_main_1 (struct captured_main_args *context)
{
/* Print all the junk at the top, with trailing "..." if we are
about to read a symbol file (possibly slowly). */
- print_gdb_version (gdb_stdout);
+ print_gdb_version (gdb_stdout, true);
if (symarg)
printf_filtered ("..");
wrap_here ("");
@@ -968,7 +968,7 @@ captured_main_1 (struct captured_main_args *context)
{
/* Print all the junk at the top, with trailing "..." if we are
about to read a symbol file (possibly slowly). */
- print_gdb_version (gdb_stdout);
+ print_gdb_version (gdb_stdout, true);
if (symarg)
printf_filtered ("..");
wrap_here ("");