/* Utility to accept --help and --version options as unobtrusively as possible.
- Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+ Copyright (C) 1993, 1994, 1998 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
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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-/* Jim Meyering (meyering@comco.com) */
+/* Written by Jim Meyering. */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#if HAVE_CONFIG_H
+# include <config.h>
#endif
#include <stdio.h>
#include <getopt.h>
+#include "closeout.h"
#include "long-options.h"
static struct option const long_options[] =
Be careful not to gobble up `--'. */
void
-parse_long_options (argc, argv, command_name, version_string, usage)
+parse_long_options (argc, argv, command_name, package, version, usage)
int argc;
char **argv;
const char *command_name;
- const char *version_string;
+ const char *package;
+ const char *version;
void (*usage)();
{
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)
{
(*usage) (0);
case 'v':
- printf ("%s - %s\n", command_name, version_string);
+ printf ("%s (%s) %s\n", command_name, package, version);
+ close_stdout (); /* FIXME: output failure exit status
+ should be settable via an arg. */
exit (0);
default:
/* 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;
}