[binutils-gdb] gdb: add mailing list and IRC information to --help

[binutils-gdb] gdb: add mailing list and IRC information to --help

[Simon Marchi]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=4412332f4b3a4ec570c378ff98ec671dd83a2959

commit 4412332f4b3a4ec570c378ff98ec671dd83a2959
Author: Jonny Grant <jg@jguk.org>
Date:   Thu Jun 11 10:30:03 2020 -0400

    gdb: add mailing list and IRC information to --help
    
    A few user-vibisble changes to the --help output:
    
     * Remove unnecessary quotes around bug url.
     * Mention the mailing list and IRC channel as places where users can
       ask GDB-related questions.
     * Add empty lines between items in the footer, to improve readability.
     * Remove unnecessary new line at the end of output.
    
    2020-06-09  Jonny Grant  <jg@jguk.org>
    2020-06-09  Simon Marchi  <simon.marchi@polymtl.ca>
    
            * main.c (captured_main_1): Don't print new line after help.
            (print_gdb_help): add mailing list and IRC channel information
            to --help.  Add new lines between items in the footer.  Remove
            quotes around bug url.
    
    Signed-off-by: Jonathan Grant <jg@jguk.org>
    Change-Id: Ibd0746a348d558fb35b5cd7e366f107742806565

Diff:
---
 gdb/ChangeLog | 8 ++++++++
 gdb/main.c    | 9 ++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e006943e493..e5008f66870 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2020-06-09  Jonny Grant  <jg@jguk.org>
+2020-06-09  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* main.c (captured_main_1): Don't print new line after help.
+	(print_gdb_help): add mailing list and IRC channel information
+	to --help.  Add new lines between items in the footer.  Remove
+	quotes around bug url.
+
 2020-06-11  Keith Seitz  <keiths@redhat.com>
 
 	PR gdb/21356
diff --git a/gdb/main.c b/gdb/main.c
index 59cb14161be..3649e4a2201 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -1006,7 +1006,6 @@ captured_main_1 (struct captured_main_args *context)
   if (print_help)
     {
       print_gdb_help (gdb_stdout);
-      fputs_unfiltered ("\n", gdb_stdout);
       exit (0);
     }
 
@@ -1392,7 +1391,11 @@ For more information, type \"help\" from within GDB, or consult the\n\
 GDB manual (available as on-line info or a printed manual).\n\
 "), stream);
   if (REPORT_BUGS_TO[0] && stream == gdb_stdout)
-    fprintf_unfiltered (stream, _("\
-Report bugs to \"%s\".\n\
+    fprintf_unfiltered (stream, _("\n\
+Report bugs to %s.\n\
 "), REPORT_BUGS_TO);
+  if (stream == gdb_stdout)
+    fprintf_unfiltered (stream, _("\n\
+You can ask GDB-related questions on the GDB users mailing list\n\
+(gdb@sourceware.org) or on GDB's IRC channel (#gdb on Freenode).\n"));
 }