[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lib-src/getopt.c
|
From: |
Paul Eggert |
|
Subject: |
[Emacs-diffs] Changes to emacs/lib-src/getopt.c |
|
Date: |
Tue, 26 Jul 2005 17:43:17 -0400 |
Index: emacs/lib-src/getopt.c
diff -c emacs/lib-src/getopt.c:1.25 emacs/lib-src/getopt.c:1.26
*** emacs/lib-src/getopt.c:1.25 Mon Jul 4 15:24:11 2005
--- emacs/lib-src/getopt.c Tue Jul 26 21:43:12 2005
***************
*** 2,9 ****
NOTE: getopt is now part of the C library, so if you don't know what
"Keep this file name-space clean" means, talk to address@hidden
before changing it!
! Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002
! Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
--- 2,9 ----
NOTE: getopt is now part of the C library, so if you don't know what
"Keep this file name-space clean" means, talk to address@hidden
before changing it!
! Copyright (C)
1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002,2003,2004
! Free Software Foundation, Inc.
This file is part of the GNU C Library.
This program is free software; you can redistribute it and/or modify
***************
*** 30,64 ****
# include <config.h>
#endif
- #if !defined __STDC__ || !__STDC__
- /* This is a separate conditional since some stdc systems
- reject `defined (const)'. */
- # ifndef const
- # define const
- # endif
- #endif
-
#include <stdio.h>
- /* Comment out all this code if we are using the GNU C Library, and are not
- actually compiling the library itself. This code is part of the GNU C
- Library, but also included in many other GNU distributions. Compiling
- and linking in this code is a waste when using the GNU C library
- (especially if it is a shared library). Rather than having every GNU
- program understand `configure --with-gnu-libc' and omit the object files,
- it is simpler to just do this in the source for each such file. */
-
- #define GETOPT_INTERFACE_VERSION 2
- #if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
- # include <gnu-versions.h>
- # if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
- # define ELIDE_CODE
- # endif
- #endif
-
- #ifndef ELIDE_CODE
-
-
/* This needs to come after some library #include
to get __GNU_LIBRARY__ defined. */
#ifdef __GNU_LIBRARY__
--- 30,37 ----
***************
*** 68,99 ****
# include <unistd.h>
#endif /* GNU C library. */
#ifdef VMS
# include <unixlib.h>
- # if HAVE_STRING_H - 0
- # include <string.h>
- # endif
#endif
! #if HAVE_LIBINTL_H
# include <libintl.h>
! #endif /* HAVE_LIBINTL_H */
!
! #if 0
! # ifdef _LIBC
! # include <libintl.h>
! # else /* not #ifdef _LIBC */
! /* This is for other GNU distributions with internationalized messages. */
! # include "gettext.h"
! # endif /* end #ifdef _LIBC */
! #endif /* end #if 0 */
!
! #if HAVE_LIBINTL_H
! /* Should I include libintl.h here as in regex.c ? */
! # define _(msgid) gettext (msgid)
! #else /* not #if HAVE_LIBINTL_H */
! # define _(msgid) (msgid)
! #endif /* end #if HAVE_LIBINTL_H */
#if defined _LIBC && defined USE_IN_LIBIO
# include <wchar.h>
--- 41,58 ----
# include <unistd.h>
#endif /* GNU C library. */
+ #include <string.h>
+
#ifdef VMS
# include <unixlib.h>
#endif
! #ifdef _LIBC
# include <libintl.h>
! #else
! # include "gettext.h"
! # define _(msgid) gettext (msgid)
! #endif
#if defined _LIBC && defined USE_IN_LIBIO
# include <wchar.h>
***************
*** 103,123 ****
# define attribute_hidden
#endif
! /* This version of `getopt' appears to the caller like standard Unix `getopt'
! but it behaves differently for the user, since it allows the user
! to intersperse the options with the other arguments.
! As `getopt' works, it permutes the elements of ARGV so that,
when it is done, all the options precede everything else. Thus
all application programs are extended to handle flexible argument order.
! Setting the environment variable POSIXLY_CORRECT disables permutation.
! Then the behavior is completely standard.
GNU application programs can use a third alternative mode in which
they can distinguish the relative order of options and other arguments. */
#include "getopt.h"
/* For communication from `getopt' to the caller.
When `getopt' finds an option that takes an argument,
--- 62,83 ----
# define attribute_hidden
#endif
! /* Unlike standard Unix `getopt', functions like `getopt_long'
! let the user intersperse the options with the other arguments.
! As `getopt_long' works, it permutes the elements of ARGV so that,
when it is done, all the options precede everything else. Thus
all application programs are extended to handle flexible argument order.
! Using `getopt' or setting the environment variable POSIXLY_CORRECT
! disables permutation.
! Then the application's behavior is completely standard.
GNU application programs can use a third alternative mode in which
they can distinguish the relative order of options and other arguments. */
#include "getopt.h"
+ #include "getopt_int.h"
/* For communication from `getopt' to the caller.
When `getopt' finds an option that takes an argument,
***************
*** 142,162 ****
/* 1003.2 says this must be 1 before any call. */
int optind = 1;
- /* Formerly, initialization of getopt depended on optind==0, which
- causes problems with re-calling getopt as programs generally don't
- know that. */
-
- int __getopt_initialized attribute_hidden;
-
- /* The next char to be scanned in the option-element
- in which the last option character we returned was found.
- This allows us to pick up the scan where we left off.
-
- If this is zero, or a null string, it means resume the scan
- by advancing to the next ARGV-element. */
-
- static char *nextchar;
-
/* Callers store zero here to inhibit the error message
for unrecognized options. */
--- 102,107 ----
***************
*** 168,224 ****
int optopt = '?';
! /* Describe how to deal with options that follow non-option ARGV-elements.
! If the caller did not specify anything,
! the default is REQUIRE_ORDER if the environment variable
! POSIXLY_CORRECT is defined, PERMUTE otherwise.
!
! REQUIRE_ORDER means don't recognize them as options;
! stop option processing when the first non-option is seen.
! This is what Unix does.
! This mode of operation is selected by either setting the environment
! variable POSIXLY_CORRECT, or using `+' as the first character
! of the list of option characters.
!
! PERMUTE is the default. We permute the contents of ARGV as we scan,
! so that eventually all the non-options are at the end. This allows options
! to be given in any order, even with programs that were not written to
! expect this.
!
! RETURN_IN_ORDER is an option available to programs that were written
! to expect options and other ARGV-elements in any order and that care about
! the ordering of the two. We describe each non-option ARGV-element
! as if it were the argument of an option with character code 1.
! Using `-' as the first character of the list of option characters
! selects this mode of operation.
!
! The special argument `--' forces an end of option-scanning regardless
! of the value of `ordering'. In the case of RETURN_IN_ORDER, only
! `--' can cause `getopt' to return -1 with `optind' != ARGC. */
!
! static enum
! {
! REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
! } ordering;
- /* Value of POSIXLY_CORRECT environment variable. */
- static char *posixly_correct;
! #ifdef __GNU_LIBRARY__
! /* We want to avoid inclusion of string.h with non-GNU libraries
! because there are many ways it can cause trouble.
! On some systems, it contains special magic macros that don't work
! in GCC. */
! # include <string.h>
! # define my_index strchr
! #else
!
! # if HAVE_STRING_H
! # include <string.h>
! # else
! # include <strings.h>
! # endif
/* Avoid depending on library functions or files
whose names are inconsistent. */
--- 113,124 ----
int optopt = '?';
! /* Keep a global copy of all internal members of getopt_data. */
! static struct _getopt_data getopt_data;
! #ifndef __GNU_LIBRARY__
/* Avoid depending on library functions or files
whose names are inconsistent. */
***************
*** 227,269 ****
extern char *getenv ();
#endif
- static char *
- my_index (str, chr)
- const char *str;
- int chr;
- {
- while (*str)
- {
- if (*str == chr)
- return (char *) str;
- str++;
- }
- return 0;
- }
-
- /* If using GCC, we can safely declare strlen this way.
- If not using GCC, it is ok not to declare it. */
- #ifdef __GNUC__
- /* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
- That was relevant to code that was here before. */
- # if (!defined __STDC__ || !__STDC__) && !defined strlen
- /* gcc with -traditional declares the built-in strlen to return int,
- and has done so at least since version 2.4.5. -- rms. */
- extern int strlen (const char *);
- # endif /* not __STDC__ */
- #endif /* __GNUC__ */
-
#endif /* not __GNU_LIBRARY__ */
- /* Handle permutation of arguments. */
-
- /* Describe the part of ARGV that contains non-options that have
- been skipped. `first_nonopt' is the index in ARGV of the first of them;
- `last_nonopt' is the index after the last of them. */
-
- static int first_nonopt;
- static int last_nonopt;
-
#ifdef _LIBC
/* Stored original parameters.
XXX This is no good solution. We should rather copy the args so
--- 127,134 ----
***************
*** 277,290 ****
# ifdef USE_NONOPTION_FLAGS
/* Defined in getopt_init.c */
extern char *__getopt_nonoption_flags;
-
- static int nonoption_flags_max_len;
- static int nonoption_flags_len;
# endif
# ifdef USE_NONOPTION_FLAGS
# define SWAP_FLAGS(ch1, ch2) \
! if (nonoption_flags_len > 0)
\
{ \
char __tmp = __getopt_nonoption_flags[ch1]; \
__getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \
--- 142,152 ----
# ifdef USE_NONOPTION_FLAGS
/* Defined in getopt_init.c */
extern char *__getopt_nonoption_flags;
# endif
# ifdef USE_NONOPTION_FLAGS
# define SWAP_FLAGS(ch1, ch2) \
! if (d->__nonoption_flags_len > 0) \
{ \
char __tmp = __getopt_nonoption_flags[ch1]; \
__getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \
***************
*** 306,322 ****
`first_nonopt' and `last_nonopt' are relocated so that they describe
the new indices of the non-options in ARGV after they are moved. */
- #if defined __STDC__ && __STDC__
- static void exchange (char **);
- #endif
-
static void
! exchange (argv)
! char **argv;
{
! int bottom = first_nonopt;
! int middle = last_nonopt;
! int top = optind;
char *tem;
/* Exchange the shorter segment with the far end of the longer segment.
--- 168,179 ----
`first_nonopt' and `last_nonopt' are relocated so that they describe
the new indices of the non-options in ARGV after they are moved. */
static void
! exchange (char **argv, struct _getopt_data *d)
{
! int bottom = d->__first_nonopt;
! int middle = d->__last_nonopt;
! int top = d->optind;
char *tem;
/* Exchange the shorter segment with the far end of the longer segment.
***************
*** 328,346 ****
/* First make sure the handling of the `__getopt_nonoption_flags'
string can work normally. Our top argument must be in the range
of the string. */
! if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len)
{
/* We must extend the array. The user plays games with us and
presents new arguments. */
char *new_str = malloc (top + 1);
if (new_str == NULL)
! nonoption_flags_len = nonoption_flags_max_len = 0;
else
{
memset (__mempcpy (new_str, __getopt_nonoption_flags,
! nonoption_flags_max_len),
! '\0', top + 1 - nonoption_flags_max_len);
! nonoption_flags_max_len = top + 1;
__getopt_nonoption_flags = new_str;
}
}
--- 185,203 ----
/* First make sure the handling of the `__getopt_nonoption_flags'
string can work normally. Our top argument must be in the range
of the string. */
! if (d->__nonoption_flags_len > 0 && top >= d->__nonoption_flags_max_len)
{
/* We must extend the array. The user plays games with us and
presents new arguments. */
char *new_str = malloc (top + 1);
if (new_str == NULL)
! d->__nonoption_flags_len = d->__nonoption_flags_max_len = 0;
else
{
memset (__mempcpy (new_str, __getopt_nonoption_flags,
! d->__nonoption_flags_max_len),
! '\0', top + 1 - d->__nonoption_flags_max_len);
! d->__nonoption_flags_max_len = top + 1;
__getopt_nonoption_flags = new_str;
}
}
***************
*** 386,461 ****
/* Update records for the slots the non-options now occupy. */
! first_nonopt += (optind - last_nonopt);
! last_nonopt = optind;
}
/* Initialize the internal data when the first call is made. */
- #if defined __STDC__ && __STDC__
- static const char *_getopt_initialize (int, char *const *, const char *);
- #endif
static const char *
! _getopt_initialize (argc, argv, optstring)
! int argc;
! char *const *argv;
! const char *optstring;
{
/* Start processing options with ARGV-element 1 (since ARGV-element 0
is the program name); the sequence of previously skipped
non-option ARGV-elements is empty. */
! first_nonopt = last_nonopt = optind;
! nextchar = NULL;
! posixly_correct = getenv ("POSIXLY_CORRECT");
/* Determine how to handle the ordering of options and nonoptions. */
if (optstring[0] == '-')
{
! ordering = RETURN_IN_ORDER;
++optstring;
}
else if (optstring[0] == '+')
{
! ordering = REQUIRE_ORDER;
++optstring;
}
! else if (posixly_correct != NULL)
! ordering = REQUIRE_ORDER;
else
! ordering = PERMUTE;
#if defined _LIBC && defined USE_NONOPTION_FLAGS
! if (posixly_correct == NULL
&& argc == __libc_argc && argv == __libc_argv)
{
! if (nonoption_flags_max_len == 0)
{
if (__getopt_nonoption_flags == NULL
|| __getopt_nonoption_flags[0] == '\0')
! nonoption_flags_max_len = -1;
else
{
const char *orig_str = __getopt_nonoption_flags;
! int len = nonoption_flags_max_len = strlen (orig_str);
! if (nonoption_flags_max_len < argc)
! nonoption_flags_max_len = argc;
__getopt_nonoption_flags =
! (char *) malloc (nonoption_flags_max_len);
if (__getopt_nonoption_flags == NULL)
! nonoption_flags_max_len = -1;
else
memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
! '\0', nonoption_flags_max_len - len);
}
}
! nonoption_flags_len = nonoption_flags_max_len;
}
else
! nonoption_flags_len = 0;
#endif
return optstring;
--- 243,313 ----
/* Update records for the slots the non-options now occupy. */
! d->__first_nonopt += (d->optind - d->__last_nonopt);
! d->__last_nonopt = d->optind;
}
/* Initialize the internal data when the first call is made. */
static const char *
! _getopt_initialize (int argc, char **argv, const char *optstring,
! int posixly_correct, struct _getopt_data *d)
{
/* Start processing options with ARGV-element 1 (since ARGV-element 0
is the program name); the sequence of previously skipped
non-option ARGV-elements is empty. */
! d->__first_nonopt = d->__last_nonopt = d->optind;
! d->__nextchar = NULL;
! d->__posixly_correct = posixly_correct || !!getenv ("POSIXLY_CORRECT");
/* Determine how to handle the ordering of options and nonoptions. */
if (optstring[0] == '-')
{
! d->__ordering = RETURN_IN_ORDER;
++optstring;
}
else if (optstring[0] == '+')
{
! d->__ordering = REQUIRE_ORDER;
++optstring;
}
! else if (d->__posixly_correct)
! d->__ordering = REQUIRE_ORDER;
else
! d->__ordering = PERMUTE;
#if defined _LIBC && defined USE_NONOPTION_FLAGS
! if (!d->__posixly_correct
&& argc == __libc_argc && argv == __libc_argv)
{
! if (d->__nonoption_flags_max_len == 0)
{
if (__getopt_nonoption_flags == NULL
|| __getopt_nonoption_flags[0] == '\0')
! d->__nonoption_flags_max_len = -1;
else
{
const char *orig_str = __getopt_nonoption_flags;
! int len = d->__nonoption_flags_max_len = strlen (orig_str);
! if (d->__nonoption_flags_max_len < argc)
! d->__nonoption_flags_max_len = argc;
__getopt_nonoption_flags =
! (char *) malloc (d->__nonoption_flags_max_len);
if (__getopt_nonoption_flags == NULL)
! d->__nonoption_flags_max_len = -1;
else
memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
! '\0', d->__nonoption_flags_max_len - len);
}
}
! d->__nonoption_flags_len = d->__nonoption_flags_max_len;
}
else
! d->__nonoption_flags_len = 0;
#endif
return optstring;
***************
*** 503,512 ****
`flag' field is nonzero, the value of the option's `val' field
if the `flag' field is zero.
- The elements of ARGV aren't really const, because we permute them.
- But we pretend they're const in the prototype to be compatible
- with other systems.
-
LONGOPTS is a vector of `struct option' terminated by an
element containing a name which is zero.
--- 355,360 ----
***************
*** 515,546 ****
recent call.
If LONG_ONLY is nonzero, '-' as well as '--' can introduce
! long-named options. */
int
! _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
! int argc;
! char *const *argv;
! const char *optstring;
! const struct option *longopts;
! int *longind;
! int long_only;
{
! int print_errors = opterr;
if (optstring[0] == ':')
print_errors = 0;
if (argc < 1)
return -1;
! optarg = NULL;
! if (optind == 0 || !__getopt_initialized)
{
! if (optind == 0)
! optind = 1; /* Don't scan ARGV[0], the program name. */
! optstring = _getopt_initialize (argc, argv, optstring);
! __getopt_initialized = 1;
}
/* Test whether ARGV[optind] points to a non-option argument.
--- 363,394 ----
recent call.
If LONG_ONLY is nonzero, '-' as well as '--' can introduce
! long-named options.
!
! If POSIXLY_CORRECT is nonzero, behave as if the POSIXLY_CORRECT
! environment variable were set. */
int
! _getopt_internal_r (int argc, char **argv, const char *optstring,
! const struct option *longopts, int *longind,
! int long_only, int posixly_correct, struct _getopt_data *d)
{
! int print_errors = d->opterr;
if (optstring[0] == ':')
print_errors = 0;
if (argc < 1)
return -1;
! d->optarg = NULL;
! if (d->optind == 0 || !d->__initialized)
{
! if (d->optind == 0)
! d->optind = 1; /* Don't scan ARGV[0], the program name. */
! optstring = _getopt_initialize (argc, argv, optstring,
! posixly_correct, d);
! d->__initialized = 1;
}
/* Test whether ARGV[optind] points to a non-option argument.
***************
*** 548,587 ****
from the shell indicating it is not an option. The later information
is only used when the used in the GNU libc. */
#if defined _LIBC && defined USE_NONOPTION_FLAGS
! # define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0'
\
! || (optind < nonoption_flags_len \
! && __getopt_nonoption_flags[optind] == '1'))
#else
! # define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0')
#endif
! if (nextchar == NULL || *nextchar == '\0')
{
/* Advance to the next ARGV-element. */
/* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
moved back by the user (who may also have changed the arguments). */
! if (last_nonopt > optind)
! last_nonopt = optind;
! if (first_nonopt > optind)
! first_nonopt = optind;
! if (ordering == PERMUTE)
{
/* If we have just processed some options following some non-options,
exchange them so that the options come first. */
! if (first_nonopt != last_nonopt && last_nonopt != optind)
! exchange ((char **) argv);
! else if (last_nonopt != optind)
! first_nonopt = optind;
/* Skip any additional non-options
and extend the range of non-options previously skipped. */
! while (optind < argc && NONOPTION_P)
! optind++;
! last_nonopt = optind;
}
/* The special ARGV-element `--' means premature end of options.
--- 396,436 ----
from the shell indicating it is not an option. The later information
is only used when the used in the GNU libc. */
#if defined _LIBC && defined USE_NONOPTION_FLAGS
! # define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0'
\
! || (d->optind < d->__nonoption_flags_len \
! && __getopt_nonoption_flags[d->optind] == '1'))
#else
! # define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0')
#endif
! if (d->__nextchar == NULL || *d->__nextchar == '\0')
{
/* Advance to the next ARGV-element. */
/* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
moved back by the user (who may also have changed the arguments). */
! if (d->__last_nonopt > d->optind)
! d->__last_nonopt = d->optind;
! if (d->__first_nonopt > d->optind)
! d->__first_nonopt = d->optind;
! if (d->__ordering == PERMUTE)
{
/* If we have just processed some options following some non-options,
exchange them so that the options come first. */
! if (d->__first_nonopt != d->__last_nonopt
! && d->__last_nonopt != d->optind)
! exchange ((char **) argv, d);
! else if (d->__last_nonopt != d->optind)
! d->__first_nonopt = d->optind;
/* Skip any additional non-options
and extend the range of non-options previously skipped. */
! while (d->optind < argc && NONOPTION_P)
! d->optind++;
! d->__last_nonopt = d->optind;
}
/* The special ARGV-element `--' means premature end of options.
***************
*** 589,616 ****
then exchange with previous non-options as if it were an option,
then skip everything else like a non-option. */
! if (optind != argc && !strcmp (argv[optind], "--"))
{
! optind++;
! if (first_nonopt != last_nonopt && last_nonopt != optind)
! exchange ((char **) argv);
! else if (first_nonopt == last_nonopt)
! first_nonopt = optind;
! last_nonopt = argc;
! optind = argc;
}
/* If we have done all the ARGV-elements, stop the scan
and back over any non-options that we skipped and permuted. */
! if (optind == argc)
{
/* Set the next-arg-index to point at the non-options
that we previously skipped, so the caller will digest them. */
! if (first_nonopt != last_nonopt)
! optind = first_nonopt;
return -1;
}
--- 438,466 ----
then exchange with previous non-options as if it were an option,
then skip everything else like a non-option. */
! if (d->optind != argc && !strcmp (argv[d->optind], "--"))
{
! d->optind++;
! if (d->__first_nonopt != d->__last_nonopt
! && d->__last_nonopt != d->optind)
! exchange ((char **) argv, d);
! else if (d->__first_nonopt == d->__last_nonopt)
! d->__first_nonopt = d->optind;
! d->__last_nonopt = argc;
! d->optind = argc;
}
/* If we have done all the ARGV-elements, stop the scan
and back over any non-options that we skipped and permuted. */
! if (d->optind == argc)
{
/* Set the next-arg-index to point at the non-options
that we previously skipped, so the caller will digest them. */
! if (d->__first_nonopt != d->__last_nonopt)
! d->optind = d->__first_nonopt;
return -1;
}
***************
*** 619,635 ****
if (NONOPTION_P)
{
! if (ordering == REQUIRE_ORDER)
return -1;
! optarg = argv[optind++];
return 1;
}
/* We have found another option-ARGV-element.
Skip the initial punctuation. */
! nextchar = (argv[optind] + 1
! + (longopts != NULL && argv[optind][1] == '-'));
}
/* Decode the current option-ARGV-element. */
--- 469,485 ----
if (NONOPTION_P)
{
! if (d->__ordering == REQUIRE_ORDER)
return -1;
! d->optarg = argv[d->optind++];
return 1;
}
/* We have found another option-ARGV-element.
Skip the initial punctuation. */
! d->__nextchar = (argv[d->optind] + 1
! + (longopts != NULL && argv[d->optind][1] == '-'));
}
/* Decode the current option-ARGV-element. */
***************
*** 648,655 ****
This distinction seems to be the most useful approach. */
if (longopts != NULL
! && (argv[optind][1] == '-'
! || (long_only && (argv[optind][2] || !my_index (optstring,
argv[optind][1])))))
{
char *nameend;
const struct option *p;
--- 498,506 ----
This distinction seems to be the most useful approach. */
if (longopts != NULL
! && (argv[d->optind][1] == '-'
! || (long_only && (argv[d->optind][2]
! || !strchr (optstring, argv[d->optind][1])))))
{
char *nameend;
const struct option *p;
***************
*** 659,673 ****
int indfound = -1;
int option_index;
! for (nameend = nextchar; *nameend && *nameend != '='; nameend++)
/* Do nothing. */ ;
/* Test all long options for either exact match
or abbreviated matches. */
for (p = longopts, option_index = 0; p->name; p++, option_index++)
! if (!strncmp (p->name, nextchar, nameend - nextchar))
{
! if ((unsigned int) (nameend - nextchar)
== (unsigned int) strlen (p->name))
{
/* Exact match found. */
--- 510,524 ----
int indfound = -1;
int option_index;
! for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++)
/* Do nothing. */ ;
/* Test all long options for either exact match
or abbreviated matches. */
for (p = longopts, option_index = 0; p->name; p++, option_index++)
! if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar))
{
! if ((unsigned int) (nameend - d->__nextchar)
== (unsigned int) strlen (p->name))
{
/* Exact match found. */
***************
*** 698,734 ****
char *buf;
if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"),
! argv[0], argv[optind]) >= 0)
{
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
free (buf);
}
#else
fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
! argv[0], argv[optind]);
#endif
}
! nextchar += strlen (nextchar);
! optind++;
! optopt = 0;
return '?';
}
if (pfound != NULL)
{
option_index = indfound;
! optind++;
if (*nameend)
{
/* Don't test has_arg with >, because some C compilers don't
allow it to be used on enums. */
if (pfound->has_arg)
! optarg = nameend + 1;
else
{
if (print_errors)
--- 549,592 ----
char *buf;
if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"),
! argv[0], argv[d->optind]) >= 0)
{
+ _IO_flockfile (stderr);
+
+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
+ ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+ _IO_funlockfile (stderr);
+
free (buf);
}
#else
fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
! argv[0], argv[d->optind]);
#endif
}
! d->__nextchar += strlen (d->__nextchar);
! d->optind++;
! d->optopt = 0;
return '?';
}
if (pfound != NULL)
{
option_index = indfound;
! d->optind++;
if (*nameend)
{
/* Don't test has_arg with >, because some C compilers don't
allow it to be used on enums. */
if (pfound->has_arg)
! d->optarg = nameend + 1;
else
{
if (print_errors)
***************
*** 738,744 ****
int n;
#endif
! if (argv[optind - 1][1] == '-')
{
/* --option */
#if defined _LIBC && defined USE_IN_LIBIO
--- 596,602 ----
int n;
#endif
! if (argv[d->optind - 1][1] == '-')
{
/* --option */
#if defined _LIBC && defined USE_IN_LIBIO
***************
*** 757,794 ****
#if defined _LIBC && defined USE_IN_LIBIO
n = __asprintf (&buf, _("\
%s: option `%c%s' doesn't allow an argument\n"),
! argv[0], argv[optind - 1][0],
pfound->name);
#else
fprintf (stderr, _("\
%s: option `%c%s' doesn't allow an argument\n"),
! argv[0], argv[optind - 1][0], pfound->name);
#endif
}
#if defined _LIBC && defined USE_IN_LIBIO
if (n >= 0)
{
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
free (buf);
}
#endif
}
! nextchar += strlen (nextchar);
! optopt = pfound->val;
return '?';
}
}
else if (pfound->has_arg == 1)
{
! if (optind < argc)
! optarg = argv[optind++];
else
{
if (print_errors)
--- 615,662 ----
#if defined _LIBC && defined USE_IN_LIBIO
n = __asprintf (&buf, _("\
%s: option `%c%s' doesn't allow an argument\n"),
! argv[0], argv[d->optind - 1][0],
pfound->name);
#else
fprintf (stderr, _("\
%s: option `%c%s' doesn't allow an argument\n"),
! argv[0], argv[d->optind - 1][0],
! pfound->name);
#endif
}
#if defined _LIBC && defined USE_IN_LIBIO
if (n >= 0)
{
+ _IO_flockfile (stderr);
+
+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+ ((_IO_FILE *) stderr)->_flags2
+ |= _IO_FLAGS2_NOTCANCEL;
+
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
+ ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+ _IO_funlockfile (stderr);
+
free (buf);
}
#endif
}
! d->__nextchar += strlen (d->__nextchar);
! d->optopt = pfound->val;
return '?';
}
}
else if (pfound->has_arg == 1)
{
! if (d->optind < argc)
! d->optarg = argv[d->optind++];
else
{
if (print_errors)
***************
*** 798,824 ****
if (__asprintf (&buf, _("\
%s: option `%s' requires an argument\n"),
! argv[0], argv[optind - 1]) >= 0)
{
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
free (buf);
}
#else
fprintf (stderr,
_("%s: option `%s' requires an argument\n"),
! argv[0], argv[optind - 1]);
#endif
}
! nextchar += strlen (nextchar);
! optopt = pfound->val;
return optstring[0] == ':' ? ':' : '?';
}
}
! nextchar += strlen (nextchar);
if (longind != NULL)
*longind = option_index;
if (pfound->flag)
--- 666,701 ----
if (__asprintf (&buf, _("\
%s: option `%s' requires an argument\n"),
! argv[0], argv[d->optind - 1]) >= 0)
{
+ _IO_flockfile (stderr);
+
+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+ ((_IO_FILE *) stderr)->_flags2
+ |= _IO_FLAGS2_NOTCANCEL;
+
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
+ ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+ _IO_funlockfile (stderr);
+
free (buf);
}
#else
fprintf (stderr,
_("%s: option `%s' requires an argument\n"),
! argv[0], argv[d->optind - 1]);
#endif
}
! d->__nextchar += strlen (d->__nextchar);
! d->optopt = pfound->val;
return optstring[0] == ':' ? ':' : '?';
}
}
! d->__nextchar += strlen (d->__nextchar);
if (longind != NULL)
*longind = option_index;
if (pfound->flag)
***************
*** 833,840 ****
or the option starts with '--' or is not a valid short
option, then it's an error.
Otherwise interpret it as a short option. */
! if (!long_only || argv[optind][1] == '-'
! || my_index (optstring, *nextchar) == NULL)
{
if (print_errors)
{
--- 710,717 ----
or the option starts with '--' or is not a valid short
option, then it's an error.
Otherwise interpret it as a short option. */
! if (!long_only || argv[d->optind][1] == '-'
! || strchr (optstring, *d->__nextchar) == NULL)
{
if (print_errors)
{
***************
*** 843,857 ****
int n;
#endif
! if (argv[optind][1] == '-')
{
/* --option */
#if defined _LIBC && defined USE_IN_LIBIO
n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"),
! argv[0], nextchar);
#else
fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
! argv[0], nextchar);
#endif
}
else
--- 720,734 ----
int n;
#endif
! if (argv[d->optind][1] == '-')
{
/* --option */
#if defined _LIBC && defined USE_IN_LIBIO
n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"),
! argv[0], d->__nextchar);
#else
fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
! argv[0], d->__nextchar);
#endif
}
else
***************
*** 859,886 ****
/* +option or -option */
#if defined _LIBC && defined USE_IN_LIBIO
n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"),
! argv[0], argv[optind][0], nextchar);
#else
fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
! argv[0], argv[optind][0], nextchar);
#endif
}
#if defined _LIBC && defined USE_IN_LIBIO
if (n >= 0)
{
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
free (buf);
}
#endif
}
! nextchar = (char *) "";
! optind++;
! optopt = 0;
return '?';
}
}
--- 736,771 ----
/* +option or -option */
#if defined _LIBC && defined USE_IN_LIBIO
n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"),
! argv[0], argv[d->optind][0], d->__nextchar);
#else
fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
! argv[0], argv[d->optind][0], d->__nextchar);
#endif
}
#if defined _LIBC && defined USE_IN_LIBIO
if (n >= 0)
{
+ _IO_flockfile (stderr);
+
+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
+ ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+ _IO_funlockfile (stderr);
+
free (buf);
}
#endif
}
! d->__nextchar = (char *) "";
! d->optind++;
! d->optopt = 0;
return '?';
}
}
***************
*** 888,899 ****
/* Look at and handle the next short option-character. */
{
! char c = *nextchar++;
! char *temp = my_index (optstring, c);
/* Increment `optind' when we start to process its last character. */
! if (*nextchar == '\0')
! ++optind;
if (temp == NULL || c == ':')
{
--- 773,784 ----
/* Look at and handle the next short option-character. */
{
! char c = *d->__nextchar++;
! char *temp = strchr (optstring, c);
/* Increment `optind' when we start to process its last character. */
! if (*d->__nextchar == '\0')
! ++d->optind;
if (temp == NULL || c == ':')
{
***************
*** 904,910 ****
int n;
#endif
! if (posixly_correct)
{
/* 1003.2 specifies the format of this message. */
#if defined _LIBC && defined USE_IN_LIBIO
--- 789,795 ----
int n;
#endif
! if (d->__posixly_correct)
{
/* 1003.2 specifies the format of this message. */
#if defined _LIBC && defined USE_IN_LIBIO
***************
*** 927,942 ****
#if defined _LIBC && defined USE_IN_LIBIO
if (n >= 0)
{
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
free (buf);
}
#endif
}
! optopt = c;
return '?';
}
/* Convenience. Treat POSIX -W foo same as long option --foo */
--- 812,835 ----
#if defined _LIBC && defined USE_IN_LIBIO
if (n >= 0)
{
+ _IO_flockfile (stderr);
+
+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
+ ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+ _IO_funlockfile (stderr);
+
free (buf);
}
#endif
}
! d->optopt = c;
return '?';
}
/* Convenience. Treat POSIX -W foo same as long option --foo */
***************
*** 951,964 ****
int option_index;
/* This is an option that requires an argument. */
! if (*nextchar != '\0')
{
! optarg = nextchar;
/* If we end this ARGV-element by taking the rest as an arg,
we must advance to the next element now. */
! optind++;
}
! else if (optind == argc)
{
if (print_errors)
{
--- 844,857 ----
int option_index;
/* This is an option that requires an argument. */
! if (*d->__nextchar != '\0')
{
! d->optarg = d->__nextchar;
/* If we end this ARGV-element by taking the rest as an arg,
we must advance to the next element now. */
! d->optind++;
}
! else if (d->optind == argc)
{
if (print_errors)
{
***************
*** 970,980 ****
--- 863,881 ----
_("%s: option requires an argument -- %c\n"),
argv[0], c) >= 0)
{
+ _IO_flockfile (stderr);
+
+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
+ ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+ _IO_funlockfile (stderr);
+
free (buf);
}
#else
***************
*** 982,988 ****
argv[0], c);
#endif
}
! optopt = c;
if (optstring[0] == ':')
c = ':';
else
--- 883,889 ----
argv[0], c);
#endif
}
! d->optopt = c;
if (optstring[0] == ':')
c = ':';
else
***************
*** 990,1011 ****
return c;
}
else
! /* We already incremented `optind' once;
increment it again when taking next ARGV-elt as argument. */
! optarg = argv[optind++];
/* optarg is now the argument, see if it's in the
table of longopts. */
! for (nextchar = nameend = optarg; *nameend && *nameend != '=';
nameend++)
/* Do nothing. */ ;
/* Test all long options for either exact match
or abbreviated matches. */
for (p = longopts, option_index = 0; p->name; p++, option_index++)
! if (!strncmp (p->name, nextchar, nameend - nextchar))
{
! if ((unsigned int) (nameend - nextchar) == strlen (p->name))
{
/* Exact match found. */
pfound = p;
--- 891,913 ----
return c;
}
else
! /* We already incremented `d->optind' once;
increment it again when taking next ARGV-elt as argument. */
! d->optarg = argv[d->optind++];
/* optarg is now the argument, see if it's in the
table of longopts. */
! for (d->__nextchar = nameend = d->optarg; *nameend && *nameend != '=';
! nameend++)
/* Do nothing. */ ;
/* Test all long options for either exact match
or abbreviated matches. */
for (p = longopts, option_index = 0; p->name; p++, option_index++)
! if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar))
{
! if ((unsigned int) (nameend - d->__nextchar) == strlen (p->name))
{
/* Exact match found. */
pfound = p;
***************
*** 1031,1052 ****
char *buf;
if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"),
! argv[0], argv[optind]) >= 0)
{
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
free (buf);
}
#else
fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
! argv[0], argv[optind]);
#endif
}
! nextchar += strlen (nextchar);
! optind++;
return '?';
}
if (pfound != NULL)
--- 933,962 ----
char *buf;
if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"),
! argv[0], argv[d->optind]) >= 0)
{
+ _IO_flockfile (stderr);
+
+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
+ ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+ _IO_funlockfile (stderr);
+
free (buf);
}
#else
fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
! argv[0], argv[d->optind]);
#endif
}
! d->__nextchar += strlen (d->__nextchar);
! d->optind++;
return '?';
}
if (pfound != NULL)
***************
*** 1057,1063 ****
/* Don't test has_arg with >, because some C compilers don't
allow it to be used on enums. */
if (pfound->has_arg)
! optarg = nameend + 1;
else
{
if (print_errors)
--- 967,973 ----
/* Don't test has_arg with >, because some C compilers don't
allow it to be used on enums. */
if (pfound->has_arg)
! d->optarg = nameend + 1;
else
{
if (print_errors)
***************
*** 1069,1079 ****
--- 979,998 ----
%s: option `-W %s' doesn't allow an argument\n"),
argv[0], pfound->name) >= 0)
{
+ _IO_flockfile (stderr);
+
+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+ ((_IO_FILE *) stderr)->_flags2
+ |= _IO_FLAGS2_NOTCANCEL;
+
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
+ ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+ _IO_funlockfile (stderr);
+
free (buf);
}
#else
***************
*** 1083,1096 ****
#endif
}
! nextchar += strlen (nextchar);
return '?';
}
}
else if (pfound->has_arg == 1)
{
! if (optind < argc)
! optarg = argv[optind++];
else
{
if (print_errors)
--- 1002,1015 ----
#endif
}
! d->__nextchar += strlen (d->__nextchar);
return '?';
}
}
else if (pfound->has_arg == 1)
{
! if (d->optind < argc)
! d->optarg = argv[d->optind++];
else
{
if (print_errors)
***************
*** 1100,1125 ****
if (__asprintf (&buf, _("\
%s: option `%s' requires an argument\n"),
! argv[0], argv[optind - 1]) >= 0)
{
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
free (buf);
}
#else
fprintf (stderr,
_("%s: option `%s' requires an argument\n"),
! argv[0], argv[optind - 1]);
#endif
}
! nextchar += strlen (nextchar);
return optstring[0] == ':' ? ':' : '?';
}
}
! nextchar += strlen (nextchar);
if (longind != NULL)
*longind = option_index;
if (pfound->flag)
--- 1019,1053 ----
if (__asprintf (&buf, _("\
%s: option `%s' requires an argument\n"),
! argv[0], argv[d->optind - 1]) >= 0)
{
+ _IO_flockfile (stderr);
+
+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+ ((_IO_FILE *) stderr)->_flags2
+ |= _IO_FLAGS2_NOTCANCEL;
+
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
+ ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+ _IO_funlockfile (stderr);
+
free (buf);
}
#else
fprintf (stderr,
_("%s: option `%s' requires an argument\n"),
! argv[0], argv[d->optind - 1]);
#endif
}
! d->__nextchar += strlen (d->__nextchar);
return optstring[0] == ':' ? ':' : '?';
}
}
! d->__nextchar += strlen (d->__nextchar);
if (longind != NULL)
*longind = option_index;
if (pfound->flag)
***************
*** 1129,1135 ****
}
return pfound->val;
}
! nextchar = NULL;
return 'W'; /* Let the application handle it. */
}
if (temp[1] == ':')
--- 1057,1063 ----
}
return pfound->val;
}
! d->__nextchar = NULL;
return 'W'; /* Let the application handle it. */
}
if (temp[1] == ':')
***************
*** 1137,1162 ****
if (temp[2] == ':')
{
/* This is an option that accepts an argument optionally. */
! if (*nextchar != '\0')
{
! optarg = nextchar;
! optind++;
}
else
! optarg = NULL;
! nextchar = NULL;
}
else
{
/* This is an option that requires an argument. */
! if (*nextchar != '\0')
{
! optarg = nextchar;
/* If we end this ARGV-element by taking the rest as an arg,
we must advance to the next element now. */
! optind++;
}
! else if (optind == argc)
{
if (print_errors)
{
--- 1065,1090 ----
if (temp[2] == ':')
{
/* This is an option that accepts an argument optionally. */
! if (*d->__nextchar != '\0')
{
! d->optarg = d->__nextchar;
! d->optind++;
}
else
! d->optarg = NULL;
! d->__nextchar = NULL;
}
else
{
/* This is an option that requires an argument. */
! if (*d->__nextchar != '\0')
{
! d->optarg = d->__nextchar;
/* If we end this ARGV-element by taking the rest as an arg,
we must advance to the next element now. */
! d->optind++;
}
! else if (d->optind == argc)
{
if (print_errors)
{
***************
*** 1168,1178 ****
--- 1096,1114 ----
%s: option requires an argument -- %c\n"),
argv[0], c) >= 0)
{
+ _IO_flockfile (stderr);
+
+ int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+ ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
+ ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+ _IO_funlockfile (stderr);
+
free (buf);
}
#else
***************
*** 1181,1187 ****
argv[0], c);
#endif
}
! optopt = c;
if (optstring[0] == ':')
c = ':';
else
--- 1117,1123 ----
argv[0], c);
#endif
}
! d->optopt = c;
if (optstring[0] == ':')
c = ':';
else
***************
*** 1190,1197 ****
else
/* We already incremented `optind' once;
increment it again when taking next ARGV-elt as argument. */
! optarg = argv[optind++];
! nextchar = NULL;
}
}
return c;
--- 1126,1133 ----
else
/* We already incremented `optind' once;
increment it again when taking next ARGV-elt as argument. */
! d->optarg = argv[d->optind++];
! d->__nextchar = NULL;
}
}
return c;
***************
*** 1199,1216 ****
}
int
! getopt (argc, argv, optstring)
! int argc;
! char *const *argv;
! const char *optstring;
{
! return _getopt_internal (argc, argv, optstring,
! (const struct option *) 0,
! (int *) 0,
! 0);
}
- #endif /* Not ELIDE_CODE. */
#ifdef TEST
--- 1135,1174 ----
}
int
! _getopt_internal (int argc, char **argv, const char *optstring,
! const struct option *longopts, int *longind,
! int long_only, int posixly_correct)
! {
! int result;
!
! getopt_data.optind = optind;
! getopt_data.opterr = opterr;
!
! result = _getopt_internal_r (argc, argv, optstring, longopts, longind,
! long_only, posixly_correct, &getopt_data);
!
! optind = getopt_data.optind;
! optarg = getopt_data.optarg;
! optopt = getopt_data.optopt;
!
! return result;
! }
!
! /* glibc gets a LSB-compliant getopt.
! Standalone applications get a POSIX-compliant getopt. */
! #if _LIBC
! enum { POSIXLY_CORRECT = 0 };
! #else
! enum { POSIXLY_CORRECT = 1 };
! #endif
!
! int
! getopt (int argc, char *const *argv, const char *optstring)
{
! return _getopt_internal (argc, (char **) argv, optstring, NULL, NULL, 0,
! POSIXLY_CORRECT);
}
#ifdef TEST
***************
*** 1218,1226 ****
the above definition of `getopt'. */
int
! main (argc, argv)
! int argc;
! char **argv;
{
int c;
int digit_optind = 0;
--- 1176,1182 ----
the above definition of `getopt'. */
int
! main (int argc, char **argv)
{
int c;
int digit_optind = 0;
***************
*** 1283,1288 ****
}
#endif /* TEST */
-
- /* arch-tag: 0e6da124-7269-4785-a9de-094c263d20dc
- (do not change this comment) */
--- 1239,1241 ----