From patchwork Fri May 11 19:40:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 27249 Received: (qmail 100519 invoked by alias); 11 May 2018 19:40:18 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 100503 invoked by uid 89); 11 May 2018 19:40:17 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=junk, slowly, UD:amd64-init-x87-values.S, interactive X-HELO: gateway30.websitewelcome.com Received: from gateway30.websitewelcome.com (HELO gateway30.websitewelcome.com) (192.185.147.85) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 11 May 2018 19:40:14 +0000 Received: from cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway30.websitewelcome.com (Postfix) with ESMTP id 16CC962C0 for ; Fri, 11 May 2018 14:40:13 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id HDtlf9HWUA3CSHDtlfC8sR; Fri, 11 May 2018 14:40:13 -0500 X-Authority-Reason: nr=8 Received: from 97-122-176-117.hlrn.qwest.net ([97.122.176.117]:33154 helo=pokyo.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89_1) (envelope-from ) id 1fHDtk-0016Mt-RQ; Fri, 11 May 2018 14:40:12 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA] Remove some text from --version output Date: Fri, 11 May 2018 13:40:08 -0600 Message-Id: <20180511194008.16382-1-tom@tromey.com> X-BWhitelist: no X-Source-L: No X-Exim-ID: 1fHDtk-0016Mt-RQ X-Source-Sender: 97-122-176-117.hlrn.qwest.net (pokyo.Home) [97.122.176.117]:33154 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes 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 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: . Find the GDB manual and other documentation resources online at: . 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 that 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. (Perhaps the URLs ought to be indented a bit as well, but I did not do that.) 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 This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. This GDB was configured as "x86_64-pc-linux-gnu". For bug reporting instructions, please see: . Find the GDB manual and other documentation resources online at: . Tested by the buildbot. 2018-05-11 Tom Tromey * 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. 2018-05-11 Tom Tromey * gdb.base/default.exp: Update expected "show version" output. --- gdb/ChangeLog | 9 +++++++++ gdb/cli/cli-cmds.c | 2 +- gdb/main.c | 6 +++--- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.base/default.exp | 2 +- gdb/top.c | 30 ++++++++++++++++++++---------- gdb/top.h | 8 +++++++- 7 files changed, 45 insertions(+), 16 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a3a133c036..7f5bbe9a7c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2018-05-11 Tom Tromey + + * 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. + 2018-05-11 Max Filippov * configure.tgt (xtensa*-*-linux*): Drop gdb_target definition. diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 95bd58ce54..5c5d6dc456 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -315,7 +315,7 @@ is_complete_command (struct cmd_list_element *c) static void show_version (const char *args, int from_tty) { - print_gdb_version (gdb_stdout); + print_gdb_version (gdb_stdout, true); printf_filtered ("\n"); } diff --git a/gdb/main.c b/gdb/main.c index 189266f90e..9694af2426 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 (""); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 9fc54c0001..22a4ce50e2 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2018-05-11 Tom Tromey + + * gdb.base/default.exp: Update expected "show version" output. + 2018-05-08 Andrew Burgess * gdb.arch/amd64-init-x87-values.S: New file. diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp index 689d3abf93..c6a2ed8fdc 100644 --- a/gdb/testsuite/gdb.base/default.exp +++ b/gdb/testsuite/gdb.base/default.exp @@ -686,7 +686,7 @@ gdb_test_no_output "show values" "show values" #test show verbose gdb_test "show verbose" "Verbose printing of informational messages is o.*|Verbosity is off.*" "show verbose" #test show version -gdb_test "show version" "GNU gdb \[0-9\.\]*(\[^\r\n\]*\[\r\n\])+Copyright \\(C\\) \[0-9\]* Free Software Foundation, Inc(\[^\r\n\]*\[\r\n\])+License GPLv3\\+: GNU GPL version 3 or later (\[^\r\n\]*\[\r\n\])+This is free software: you are free to change and redistribute it.(\[^\r\n\]*\[\r\n\])+There is NO WARRANTY, to the extent permitted by law. Type \"show copying\"(\[^\r\n\]*\[\r\n\])+and \"show warranty\" for details..*" "show version" +gdb_test "show version" "GNU gdb \[0-9\.\]*(\[^\r\n\]*\[\r\n\])+Copyright \\(C\\) \[0-9\]* Free Software Foundation, Inc(\[^\r\n\]*\[\r\n\])+License GPLv3\\+: GNU GPL version 3 or later (\[^\r\n\]*\[\r\n\])+This is free software: you are free to change and redistribute it.(\[^\r\n\]*\[\r\n\])+There is NO WARRANTY, to the extent permitted by law.(\[^\r\n\]*\[\r\n\])+Type \"show copying\" and \"show warranty\" for details..*" "show version" #test show width gdb_test "show width" "Number of characters gdb thinks are in a line is.*" "show width" #test show write diff --git a/gdb/top.c b/gdb/top.c index 07b386dacb..6983bfcedc 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -1278,9 +1278,9 @@ command_line_input (const char *prompt_arg, int repeat, return cmd; } -/* Print the GDB banner. */ +/* See top.h. */ void -print_gdb_version (struct ui_file *stream) +print_gdb_version (struct ui_file *stream, bool interactive) { /* From GNU coding standards, first line is meant to be easy for a program to parse, and is just canonical program name and version @@ -1301,8 +1301,11 @@ print_gdb_version (struct ui_file *stream) fprintf_filtered (stream, "\ License GPLv3+: GNU GPL version 3 or later \ \nThis is free software: you are free to change and redistribute it.\n\ -There is NO WARRANTY, to the extent permitted by law. Type \"show copying\"\n\ -and \"show warranty\" for details.\n"); +There is NO WARRANTY, to the extent permitted by law.\n"); + + if (interactive) + fprintf_filtered (stream, ("Type \"show copying\" and " + "\"show warranty\" for details.\n")); /* After the required info we print the configuration information. */ @@ -1316,21 +1319,28 @@ and \"show warranty\" for details.\n"); { fprintf_filtered (stream, "%s", host_name); } - fprintf_filtered (stream, "\".\n\ -Type \"show configuration\" for configuration details."); + fprintf_filtered (stream, "\".\n"); + + if (interactive) + fprintf_filtered (stream, _("Type \"show configuration\" " + "for configuration details.\n")); if (REPORT_BUGS_TO[0]) { fprintf_filtered (stream, - _("\nFor bug reporting instructions, please see:\n")); + _("For bug reporting instructions, please see:\n")); fprintf_filtered (stream, "%s.\n", REPORT_BUGS_TO); } fprintf_filtered (stream, _("Find the GDB manual and other documentation \ -resources online at:\n.\n")); - fprintf_filtered (stream, _("For help, type \"help\".\n")); - fprintf_filtered (stream, _("Type \"apropos word\" to search for \ +resources online at:\n.")); + if (interactive) + { + fprintf_filtered (stream, "\n\n"); + fprintf_filtered (stream, _("For help, type \"help\".\n")); + fprintf_filtered (stream, _("Type \"apropos word\" to search for \ commands related to \"word\".")); + } } /* Print the details of GDB build-time configuration. */ diff --git a/gdb/top.h b/gdb/top.h index d54b6f15c4..b34defa1f2 100644 --- a/gdb/top.h +++ b/gdb/top.h @@ -222,7 +222,13 @@ extern int confirm; extern int inhibit_gdbinit; extern const char gdbinit[]; -extern void print_gdb_version (struct ui_file *); +/* Print the GDB version banner to STREAM. If INTERACTIVE is false, + then information referring to commands (e.g., "show configuration") + is omitted; this mode is used for the --version command line + option. If INTERACTIVE is true, then interactive commands are + mentioned. */ +extern void print_gdb_version (struct ui_file *stream, bool interactive); + extern void print_gdb_configuration (struct ui_file *); extern void read_command_file (FILE *);