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

diff --git a/lib/long-options.c b/lib/long-options.c
index ec826e61d..58bc93c1d 100644
--- a/lib/long-options.c
+++ b/lib/long-options.c
@@ -1,5 +1,7 @@
 /* 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, 2002, 2003 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
@@ -21,17 +23,13 @@
 # include <config.h>
 #endif
 
+#include "long-options.h"
+
 #include <stdio.h>
 #include <getopt.h>
-#include "closeout.h"
-#include "long-options.h"
+#include <stdlib.h>
 
-#if ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-#else
-# define _(Text) Text
-#endif
+#include "version-etc.h"
 
 static struct option const long_options[] =
 {
@@ -69,16 +67,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: