Don't redeclare strsep if the system already has it.

[gnulib.git] / lib / long-options.c

diff --git a/lib/long-options.c b/lib/long-options.c
index baf2c2a..1c4e74a 100644 (file)
--- 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 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
@@ -17,13 +19,19 @@
 
 /* Written by Jim Meyering.  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#if 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[] =
 {
@@ -36,13 +44,13 @@ static struct option const long_options[] =
    Be careful not to gobble up `--'.  */
 
 void
-parse_long_options (argc, argv, command_name, package, version, usage)
-     int argc;
-     char **argv;
-     const char *command_name;
-     const char *package;
-     const char *version;
-     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;
@@ -58,11 +66,15 @@ parse_long_options (argc, argv, command_name, package, version, usage)
       switch (c)
        {
        case 'h':
-         (*usage) (0);
+         (*usage_func) (EXIT_SUCCESS);
 
        case 'v':
-         printf ("%s (%s) %s\n", command_name, package, version);
-         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.  */