X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Flong-options.c;h=0286bdf98cd88f8603b032029cf9feadf2c4b400;hb=31d3154399f8c679ba23afb0f6bef03b73d4c741;hp=43df8594e3a95cd538d062919aa0c34f477ba669;hpb=f9fa25dca3c78a2298e466e1b33caca0ee7e458b;p=gnulib.git

diff --git a/lib/long-options.c b/lib/long-options.c
index 43df8594e..0286bdf98 100644
--- a/lib/long-options.c
+++ b/lib/long-options.c
@@ -1,10 +1,12 @@
 /* Utility to accept --help and --version options as unobtrusively as possible.
-   Copyright (C) 1993-1994, 1998-1999, 2000, 2002 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,29 +14,27 @@
    GNU General Public License for more details.
 
    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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* 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>
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
 
-#include "long-options.h"
 #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.
@@ -46,8 +46,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;
@@ -63,11 +63,15 @@ parse_long_options (int argc,
       switch (c)
 	{
 	case 'h':
-	  (*usage_func) (0);
+	  (*usage_func) (EXIT_SUCCESS);
 
 	case 'v':
-	  version_etc (stdout, command_name, package, version, authors);
-	  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.  */