X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fversion-etc.c;h=57bf1248cb87bcc1e4ee615050de1a0e7ba500b2;hb=9b59e36232adca7f1e07894e8ecf77244e9fa331;hp=e25aedc3f883f0b39d3d1d46ae93c1985aeaa8e5;hpb=dc96af69ed03215354698caeb5668e3130cf98a5;p=gnulib.git

diff --git a/lib/version-etc.c b/lib/version-etc.c
index e25aedc3f..57bf1248c 100644
--- a/lib/version-etc.c
+++ b/lib/version-etc.c
@@ -1,5 +1,5 @@
 /* Utility to help print --version output in a consistent format.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,32 +15,53 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+/* Written by Jim Meyering. */
+
 #if HAVE_CONFIG_H
 # include <config.h>
 #endif
 
 #include <stdio.h>
+#include "unlocked-io.h"
 #include "version-etc.h"
 
-#if ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-#else
-# define _(Text) Text
-#endif
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
+/* Default copyright goes to the FSF. */
+
+char* version_etc_copyright =
+  /* Do *not* mark this string for translation.  */
+  "Copyright (C) 2002 Free Software Foundation, Inc.";
+
+
+/* Display the --version information the standard way.
 
+   If COMMAND_NAME is NULL, the PACKAGE is asumed to be the name of
+   the program.  The formats are therefore:
+
+   PACKAGE VERSION
+
+   or
+
+   COMMAND_NAME (PACKAGE) VERSION.  */
 void
 version_etc (FILE *stream,
 	     const char *command_name, const char *package,
 	     const char *version, const char *authors)
 {
-  fprintf (stream, "%s (%s) %s\n", command_name, package, version);
+  if (command_name)
+    fprintf (stream, "%s (%s) %s\n", command_name, package, version);
+  else
+    fprintf (stream, "%s %s\n", package, version);
   fprintf (stream, _("Written by %s.\n"), authors);
+  putc ('\n', stream);
+
+  fputs (version_etc_copyright, stream);
+  putc ('\n', stream);
+
   fputs (_("\
-\n\
-Copyright (C) 1999 Free Software Foundation, Inc.\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\
-"
-	   ), stream);
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"),
+	 stream);
 }