From: Jim Meyering <jim@meyering.net>
Date: Thu, 18 Sep 2003 18:13:18 +0000 (+0000)
Subject: Include stdarg.h.
X-Git-Tag: v5.1.0~588
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e1f55d40fc360c6cebb80710f56497fa7f7b900;p=thirdparty%2Fcoreutils.git

Include stdarg.h.
(parse_long_options): Make this function variadic (authors), too.
Call version_etc_va, not version_etc.
---

diff --git a/lib/long-options.c b/lib/long-options.c
index 58bc93c1d1..94fea1587a 100644
--- a/lib/long-options.c
+++ b/lib/long-options.c
@@ -25,9 +25,10 @@
 
 #include "long-options.h"
 
+#include <stdarg.h>
 #include <stdio.h>
-#include <getopt.h>
 #include <stdlib.h>
+#include <getopt.h>
 
 #include "version-etc.h"
 
@@ -47,8 +48,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 c;
   int saved_opterr;
@@ -67,8 +68,12 @@ parse_long_options (int argc,
 	  (*usage_func) (0);
 
 	case 'v':
-	  version_etc (stdout, command_name, package, version, authors);
-	  exit (0);
+	  {
+	    va_list args;
+	    va_start (args, usage_func);
+	    version_etc_va (stdout, command_name, package, version, args);
+	    exit (0);
+	  }
 
 	default:
 	  /* Don't process any other long-named options.  */