Provide not only copyright information, but a GPL blurb, in all the

version/usage messages.

Put newlines at the end of various version strings.

svn path=/trunk/; revision=16870

1 files changed, 29 insertions, 1 deletions

diff --git a/version_info.c b/version_info.c
index 954b05379e..c2de660309 100644
--- a/version_info.c
+++ b/version_info.c
@@ -81,7 +81,6 @@
 	const char *svnversion = "";
 #endif
 
-
 /*
  * See whether the last line in the string goes past column 80; if so,
  * replace the blank at the specified point with a newline.
@@ -103,6 +102,19 @@ do_word_wrap(GString *str, gint point)
 }	
 
 /*
+ * If the string doesn't end with a newline, append one.
+ */
+static void
+end_string(GString *str)
+{
+	size_t point;
+
+	point = strlen(str->str);
+	if (point == 0 || str->str[point - 1] != '\n')
+		g_string_append(str, "\n");
+}	
+
+/*
  * Get various library compile-time versions and append them to
  * the specified GString.
  */
@@ -201,6 +213,8 @@ get_compiled_version_info(GString *str)
 			"\nsyntax.");
 	do_word_wrap(str, break_point);
 #endif	/* HAVE_LIBPCRE */
+
+	end_string(str);
 }
 
 /*
@@ -373,4 +387,18 @@ get_runtime_version_info(GString *str)
 	g_string_append(str, "an unknown OS");
 #endif
 	g_string_append(str, ".");
+
+	end_string(str);
+}
+
+/*
+ * Get copyright information.
+ */
+const char *
+get_copyright_info(void)
+{
+	return
+"Copyright 1998-2005 Gerald Combs <gerald@ethereal.com>.\n"
+"This is free software; see the source for copying conditions. There is NO\n"
+"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n";
 }