X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Flong-options.c;h=1c4e74a001d6a15f38657bf44c5eb2ad8b5526df;hb=44fd637accbdb4f21edb7cc5194f5cf0848eac62;hp=649fdb98e584d7d19dfecb496b24bb4a202a29f2;hpb=83af9954b1026521f2f06c330220940d1c427392;p=gnulib.git

diff --git a/lib/long-options.c b/lib/long-options.c
index 649fdb98e..1c4e74a00 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, 2004 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,15 @@
 # include <config.h>
 #endif
 
+/* Specification.  */
+#include "long-options.h"
+
+#include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <getopt.h>
-#include "closeout.h"
-#include "long-options.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[] =
 {
@@ -49,8 +49,8 @@ parse_long_options (int argc,
 		    const char *command_name,
 		    const char *package,
 		    const char *version,
-		    const char *authors,
-		    void (*usage_func)())
+		    void (*usage_func) (int),
+		    /* const char *author1, ...*/ ...)
 {
   int c;
   int saved_opterr;
@@ -66,19 +66,15 @@ parse_long_options (int argc,
       switch (c)
 	{
 	case 'h':
-	  (*usage_func) (0);
+	  (*usage_func) (EXIT_SUCCESS);
 
 	case 'v':
-	  printf ("%s (%s) %s\n", command_name, package, version);
-	  printf (_("\
-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\
-"));
-	  printf (_("Written by %s.\n"), authors);
-	  close_stdout (); /* FIXME: output failure exit status
-			      should be settable via an arg.  */
-	  exit (0);
+	  {
+	    va_list authors;
+	    va_start (authors, usage_func);
+	    version_etc_va (stdout, command_name, package, version, authors);
+	    exit (0);
+	  }
 
 	default:
 	  /* Don't process any other long-named options.  */