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

diff --git a/lib/long-options.c b/lib/long-options.c
index c1071bfaf..723cad5d6 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 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 1993-1994, 1998-2000, 2002-2006, 2009-2013 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,68 +14,75 @@
    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, see <http://www.gnu.org/licenses/>.  */
 
-/* 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 `--'.  */
+   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);
-
-	case 'v':
-	  printf ("%s - %s\n", command_name, version_string);
-	  exit (0);
-	
-	default:
-	  /* Don't process any other long-named options.  */
-	  break;
-	}
+        {
+        case 'h':
+          (*usage_func) (EXIT_SUCCESS);
+
+        case 'v':
+          {
+            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;
+        }
     }
 
   /* 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;
 }