X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Flong-options.c;h=fb61661aacbbe58a59a62068953bfb26a2aa9b45;hb=fe0f080532b2357794d4e25d66a35f4aedc4f93a;hp=fdc9ec09502dc5cc2d95f056f5058dfa82e7809b;hpb=b18bd420fa0099ff6ef96277aeb002cca7d1b78f;p=gnulib.git

diff --git a/lib/long-options.c b/lib/long-options.c
index fdc9ec095..fb61661aa 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, 2005,
+   2006 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
@@ -13,31 +15,27 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Jim Meyering.  */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
+
+/* 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[] =
 {
-  {"help", no_argument, 0, 'h'},
-  {"version", no_argument, 0, 'v'},
-  {0, 0, 0, 0}
+  {"help", no_argument, NULL, 'h'},
+  {"version", no_argument, NULL, 'v'},
+  {NULL, 0, NULL, 0}
 };
 
 /* Process long options --help and --version, but only if argc == 2.
@@ -49,8 +47,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,14 +64,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 (_("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.  */