/* Utility to accept --help and --version options as unobtrusively as possible.
- Copyright (C) 1993-1994, 1998-1999, 2000, 2002 Free Software Foundation, Inc.
+
+ Copyright (C) 1993, 1994, 1998, 1999, 2000, 2002, 2003, 2004, 2005 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
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. */
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
/* Written by Jim Meyering. */
# include <config.h>
#endif
+/* 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.
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;
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. */