Small copyright string and hostname related cleanup.
diff --git a/lib/command.c b/lib/command.c
index 4495d22..fc115d9 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -36,13 +36,6 @@
/* Host information structure. */
struct host host;
-/* Default motd string. */
-const char *default_motd =
-"\r\n\
-Hello, this is " QUAGGA_PROGNAME " (version " QUAGGA_VERSION ").\r\n\
-Copyright 1996-2004 Kunihiro Ishiguro, et al.\r\n\
-\r\n";
-
/* Standard command node structures. */
struct cmd_node auth_node =
{
@@ -74,6 +67,21 @@
"%s(config)# ",
1
};
+
+/* Default motd string. */
+const char *default_motd =
+"\r\n\
+Hello, this is " QUAGGA_PROGNAME " (version " QUAGGA_VERSION ").\r\n\
+" QUAGGA_COPYRIGHT "\r\n\
+\r\n";
+
+void
+print_version (const char *progname)
+{
+ printf ("%s version %s (%s)\n", progname, QUAGGA_VERSION, host.name);
+ printf ("%s\n", QUAGGA_COPYRIGHT);
+}
+
/* Utility function to concatenate argv argument into a single string
with inserting ' ' character between each argument. */
@@ -2397,10 +2405,8 @@
SHOW_STR
"Displays zebra version\n")
{
- vty_out (vty, "Quagga %s (%s).%s", QUAGGA_VERSION,
- host_name,
- VTY_NEWLINE);
- vty_out (vty, "Copyright 1996-2002, Kunihiro Ishiguro.%s", VTY_NEWLINE);
+ vty_out (vty, "Quagga %s (%s).%s", QUAGGA_VERSION, host.name, VTY_NEWLINE);
+ vty_out (vty, "%s%s", QUAGGA_COPYRIGHT, VTY_NEWLINE);
return CMD_SUCCESS;
}
@@ -2412,7 +2418,7 @@
"Description of the interactive help system\n")
{
vty_out (vty,
- "Zebra VTY provides advanced help feature. When you need help,%s\
+ "Quagga VTY provides advanced help feature. When you need help,%s\
anytime at the command line please press '?'.%s\
%s\
If nothing matches, the help list will be empty and you must backup%s\