aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Fish <fnf@specifix.com>1996-09-27 17:53:06 +0000
committerFred Fish <fnf@specifix.com>1996-09-27 17:53:06 +0000
commit50140ab2a774b72c6262e2bebc97bc33f14909e3 (patch)
treef84631266dfe3a598ec31bf85477b40a56f08c98
parent567417775d8694538d59374074de3f8751295df8 (diff)
downloadgdb-50140ab2a774b72c6262e2bebc97bc33f14909e3.zip
gdb-50140ab2a774b72c6262e2bebc97bc33f14909e3.tar.gz
gdb-50140ab2a774b72c6262e2bebc97bc33f14909e3.tar.bz2
* top.c (print_gdb_version): Rewrote to comply with new GNU coding
standards for the --version option. (print_gnu_advertisement): Remove, now part of print_gdb_version. (show_version): Remove call to print_gnu_advertisement. * top.h (print_gnu_advertisement): Remove prototype. * main.c (print_gdb_help): Move help to static function and add prototype. (main): Call print_gdb_help rather than inlining it. (main): Remove call to print_gnu_advertisement. * gdbtk.tcl (create_copyright_window): Increase timeout from 15 seconds to 30 seconds.
-rw-r--r--gdb/ChangeLog16
-rw-r--r--gdb/gdbtk.tcl4
-rw-r--r--gdb/top.c47
-rw-r--r--gdb/top.h1
4 files changed, 48 insertions, 20 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5b2220d..357ebab 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,19 @@
+Fri Sep 27 10:25:30 1996 Fred Fish <fnf@cygnus.com>
+
+ * top.c (print_gdb_version): Rewrote to comply with new GNU coding
+ standards for the --version option.
+ (print_gnu_advertisement): Remove, now part of print_gdb_version.
+ (show_version): Remove call to print_gnu_advertisement.
+ * top.h (print_gnu_advertisement): Remove prototype.
+ * main.c (print_gdb_help): Move help to static function and
+ add prototype.
+ (main): Call print_gdb_help rather than inlining it.
+ (main): Remove call to print_gnu_advertisement.
+start-sanitize-gdbtk
+ * gdbtk.tcl (create_copyright_window): Increase timeout from
+ 15 seconds to 30 seconds.
+end-sanitize-gdbtk
+
start-sanitize-d10v
Fri Sep 27 13:32:53 1996 Michael Meissner <meissner@tiktok.cygnus.com>
diff --git a/gdb/gdbtk.tcl b/gdb/gdbtk.tcl
index bd08669..598e59c 100644
--- a/gdb/gdbtk.tcl
+++ b/gdb/gdbtk.tcl
@@ -3352,8 +3352,8 @@ proc create_copyright_window {} {
bind .c.m <1> {destroy .c}
bind .c <Leave> {destroy .c}
- # "suitable period" currently means "15 seconds".
- after 15000 {
+ # "suitable period" currently means "30 seconds".
+ after 30000 {
if {[winfo exists .c]} then {
destroy .c
}
diff --git a/gdb/top.c b/gdb/top.c
index a5a90f4..a55a9eb 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -2748,28 +2748,42 @@ document_command (comname, from_tty)
}
void
-print_gnu_advertisement ()
-{
- printf_unfiltered ("\
-GDB is free software and you are welcome to distribute copies of it\n\
- under certain conditions; type \"show copying\" to see the conditions.\n\
-There is absolutely no warranty for GDB; type \"show warranty\" for details.\n\
-");
-}
-
-void
print_gdb_version (stream)
GDB_FILE *stream;
{
+ /* From GNU coding standards, first line is meant to be easy for a
+ program to parse, and is just canonical program name and version
+ number, which starts after last space. */
+
+ fprintf_filtered (stream, "GNU gdb %s\n", version);
+
+ /* Second line is a copyright notice. */
+
+ fprintf_filtered (stream, "Copyright 1996 Free Software Foundation, Inc.\n");
+
+ /* Following the copyright is a brief statement that the program is
+ free software, that users are free to copy and change it on
+ certain conditions, that it is covered by the GNU GPL, and that
+ there is no warranty. */
+
fprintf_filtered (stream, "\
-GDB %s (%s", version, host_name);
+GDB is free software, covered by the GNU General Public License, and you are\n\
+welcome to change it and/or distribute copies of it under certain conditions.\n\
+Type \"show copying\" to see the conditions.\n\
+There is absolutely no warranty for GDB. Type \"show warranty\" for details.\n");
- if (!STREQ (host_name, target_name))
- fprintf_filtered (stream, " --target %s", target_name);
+ /* After the required info we print the configuration information. */
- fprintf_filtered (stream, "), ");
- wrap_here("");
- fprintf_filtered (stream, "Copyright 1996 Free Software Foundation, Inc.");
+ fprintf_filtered (stream, "This GDB was configured as \"");
+ if (!STREQ (host_name, target_name))
+ {
+ fprintf_filtered (stream, "--host=%s --target=%s", host_name, target_name);
+ }
+ else
+ {
+ fprintf_filtered (stream, "%s", host_name);
+ }
+ fprintf_filtered (stream, "\".");
}
/* ARGSUSED */
@@ -2779,7 +2793,6 @@ show_version (args, from_tty)
int from_tty;
{
immediate_quit++;
- print_gnu_advertisement ();
print_gdb_version (gdb_stdout);
printf_filtered ("\n");
immediate_quit--;
diff --git a/gdb/top.h b/gdb/top.h
index 661f4ef..f997750 100644
--- a/gdb/top.h
+++ b/gdb/top.h
@@ -33,7 +33,6 @@ extern jmp_buf error_return;
extern jmp_buf quit_return;
extern void print_gdb_version PARAMS ((GDB_FILE *));
-extern void print_gnu_advertisement PARAMS ((void));
extern void source_command PARAMS ((char *, int));
extern void cd_command PARAMS ((char *, int));