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

diff --git a/lib/long-options.c b/lib/long-options.c
index c1071bfaf..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 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
@@ -12,59 +14,66 @@
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-/* Jim Meyering (meyering@comco.com) */
+/* Written by Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
+/* Specification.  */
+#include "long-options.h"
+
+#include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <getopt.h>
-#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.
    Be careful not to gobble up `--'.  */
 
 void
-parse_long_options (argc, argv, command_name, version_string, usage)
-     int argc;
-     char **argv;
-     const char *command_name;
-     const char *version_string;
-     void (*usage)();
+parse_long_options (int argc,
+		    char **argv,
+		    const char *command_name,
+		    const char *package,
+		    const char *version,
+		    void (*usage_func) (int),
+		    /* const char *author1, ...*/ ...)
 {
   int c;
   int saved_opterr;
-  int saved_optind;
 
   saved_opterr = opterr;
-  saved_optind = optind;
 
   /* Don't print an error message for unrecognized options.  */
   opterr = 0;
 
   if (argc == 2
-      && (c = getopt_long (argc, argv, "+", long_options, (int *) 0)) != EOF)
+      && (c = getopt_long (argc, argv, "+", long_options, NULL)) != -1)
     {
       switch (c)
 	{
 	case 'h':
-	  (*usage) (0);
+	  (*usage_func) (EXIT_SUCCESS);
 
 	case 'v':
-	  printf ("%s - %s\n", command_name, version_string);
-	  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.  */
 	  break;
@@ -74,6 +83,7 @@ parse_long_options (argc, argv, command_name, version_string, usage)
   /* Restore previous value.  */
   opterr = saved_opterr;
 
-  /* Restore optind in case it has advanced past a leading `--'.  */
-  optind = saved_optind;
+  /* Reset this to zero so that getopt internals get initialized from
+     the probably-new parameters when/if getopt is called later.  */
+  optind = 0;
 }