X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Flong-options.c;h=e36685fb01a6d71f23a8995da3bb13d1729fd245;hb=7d8d614280a61d7bbdac8e218bfdc1aa849329c7;hp=a3827d5954f513616f9ad5324f1537f8ec879e88;hpb=378b0cd38d502d1df1c35c343bc08a48afc60c05;p=gnulib.git

diff --git a/lib/long-options.c b/lib/long-options.c
index a3827d595..e36685fb0 100644
--- a/lib/long-options.c
+++ b/lib/long-options.c
@@ -1,5 +1,5 @@
 /* Utility to accept --help and --version options as unobtrusively as possible.
-   Copyright (C) 1993, 1994, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1998, 1999, 2000 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
@@ -23,8 +23,19 @@
 
 #include <stdio.h>
 #include <getopt.h>
-#include "closeout.h"
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
 #include "long-options.h"
+#include "version-etc.h"
+
+#if ENABLE_NLS
+# include <libintl.h>
+# define _(Text) gettext (Text)
+#else
+# define _(Text) Text
+#endif
 
 static struct option const long_options[] =
 {
@@ -37,8 +48,12 @@ static struct option const long_options[] =
    Be careful not to gobble up `--'.  */
 
 void
-parse_long_options (int argc, char **argv, const char *command_name,
-		    const char *package, const char *version,
+parse_long_options (int argc,
+		    char **argv,
+		    const char *command_name,
+		    const char *package,
+		    const char *version,
+		    const char *authors,
 		    void (*usage_func)())
 {
   int c;
@@ -58,9 +73,7 @@ parse_long_options (int argc, char **argv, const char *command_name,
 	  (*usage_func) (0);
 
 	case 'v':
-	  printf ("%s (%s) %s\n", command_name, package, version);
-	  close_stdout (); /* FIXME: output failure exit status
-			      should be settable via an arg.  */
+	  version_etc (stdout, command_name, package, version, authors);
 	  exit (0);
 
 	default: