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

diff --git a/lib/long-options.c b/lib/long-options.c
index ec826e61d..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,12 @@
 
 #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>
@@ -69,16 +73,7 @@ parse_long_options (int argc,
 	  (*usage_func) (0);
 
 	case 'v':
-	  printf ("%s (%s) %s\n", command_name, package, version);
-	  printf (_("\
-\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\
-\n\
-"));
-	  printf (_("Written by %s.\n"), authors);
-	  close_stdout (); /* FIXME: output failure exit status
-			      should be settable via an arg.  */
+	  version_etc (stdout, command_name, package, version, authors);
 	  exit (0);
 
 	default: