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);
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;
}