moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

[svn] Add a fresher getopt.c.

Browse Source
This commit is contained in:
hniksic 2003-10-07 15:58:27 -07:00
parent cc5d6f0ab8
commit d7cbc755e0
2 changed files with 717 additions and 376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2003-10-08 Hrvoje Niksic <hniksic@xemacs.org>
* getopt.c: Newer version, imported from Free libit.
2003-10-07 Hrvoje Niksic <hniksic@xemacs.org> 2003-10-07 Hrvoje Niksic <hniksic@xemacs.org>
* cookies.c (struct cookie): Remove unused backpointer to cookie * cookies.c (struct cookie): Remove unused backpointer to cookie

745
src/getopt.c
View File

@ -1,9 +1,8 @@
/* Getopt for GNU. /* Getopt for GNU.
NOTE: getopt is now part of the C library, so if you don't know what NOTE: The canonical source of this file is maintained with the GNU
"Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu C Library. Bugs can be reported to bug-glibc@gnu.org.
before changing it!
Copyright (C) 1987, 88, 89, 90, 91, 92, 1993 Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99
Free Software Foundation, Inc. Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it This program is free software; you can redistribute it and/or modify it
@ -17,34 +16,28 @@
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software Foundation,
Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/* NOTE!!! AIX requires this to be the first thing in the file. /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
Do not put ANYTHING before it! */ Ditto for AIX 3.2 and <stdlib.h>. */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
#include "wget.h"
#if !__STDC__ && !defined(const) && IN_GCC
#define const
#endif
/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>. */
#ifndef _NO_PROTO #ifndef _NO_PROTO
# define _NO_PROTO # define _NO_PROTO
#endif #endif
#include <stdio.h> #ifdef HAVE_CONFIG_H
#ifdef HAVE_STRING_H # include <config.h>
# include <string.h>
#else #else
# include <strings.h> # if !defined __STDC__ || !__STDC__
/* This is a separate conditional since some stdc systems
reject `defined (const)'. */
# ifndef const
# define const
# endif # endif
# endif
#endif
#include <stdio.h>
/* Comment out all this code if we are using the GNU C Library, and are not /* 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 actually compiling the library itself. This code is part of the GNU C
@ -54,15 +47,43 @@
program understand `configure --with-gnu-libc' and omit the object files, 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. */ it is simpler to just do this in the source for each such file. */
#if defined (_LIBC) || !defined (__GNU_LIBRARY__) #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__
/* Don't include stdlib.h for non-GNU C libraries because some of them
contain conflicting prototypes for getopt. */
# include <stdlib.h> # include <stdlib.h>
# include <unistd.h>
#endif /* GNU C library. */
/* If GETOPT_COMPAT is defined, `+' as well as `--' can introduce a #ifdef VMS
long-named option. Because this is not POSIX.2 compliant, it is # include <unixlib.h>
being phased out. */ # if HAVE_STRING_H - 0
/* #define GETOPT_COMPAT */ # include <string.h>
# endif
#endif
#ifndef _
/* This is for other GNU distributions with internationalized messages.
When compiling libc, the _ macro is predefined. */
# ifdef HAVE_LIBINTL_H
# include <libintl.h>
# define _(msgid) gettext (msgid)
# else
# define _(msgid) (msgid)
# endif
#endif
/* This version of `getopt' appears to the caller like standard Unix `getopt' /* This version of `getopt' appears to the caller like standard Unix `getopt'
but it behaves differently for the user, since it allows the user but it behaves differently for the user, since it allows the user
@ -86,7 +107,7 @@
Also, when `ordering' is RETURN_IN_ORDER, Also, when `ordering' is RETURN_IN_ORDER,
each non-option ARGV-element is returned here. */ each non-option ARGV-element is returned here. */
char *optarg = 0; char *optarg;
/* Index in ARGV of the next element to be scanned. /* Index in ARGV of the next element to be scanned.
This is used for communication to and from the caller This is used for communication to and from the caller
@ -94,14 +115,20 @@ char *optarg = 0;
On entry to `getopt', zero means this is the first call; initialize. On entry to `getopt', zero means this is the first call; initialize.
When `getopt' returns EOF, this is the index of the first of the When `getopt' returns -1, this is the index of the first of the
non-option elements that the caller should itself scan. non-option elements that the caller should itself scan.
Otherwise, `optind' communicates from one call to the next Otherwise, `optind' communicates from one call to the next
how much of ARGV has been scanned so far. */ how much of ARGV has been scanned so far. */
/* XXX 1003.2 says this must be 1 before any call. */ /* 1003.2 says this must be 1 before any call. */
int optind = 0; 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;
/* The next char to be scanned in the option-element /* The next char to be scanned in the option-element
in which the last option character we returned was found. in which the last option character we returned was found.
@ -150,12 +177,15 @@ int optopt = '?';
The special argument `--' forces an end of option-scanning regardless The special argument `--' forces an end of option-scanning regardless
of the value of `ordering'. In the case of RETURN_IN_ORDER, only of the value of `ordering'. In the case of RETURN_IN_ORDER, only
`--' can cause `getopt' to return EOF with `optind' != ARGC. */ `--' can cause `getopt' to return -1 with `optind' != ARGC. */
static enum static enum
{ {
REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
} ordering; } ordering;
/* Value of POSIXLY_CORRECT environment variable. */
static char *posixly_correct;
#ifdef __GNU_LIBRARY__ #ifdef __GNU_LIBRARY__
/* We want to avoid inclusion of string.h with non-GNU libraries /* We want to avoid inclusion of string.h with non-GNU libraries
@ -164,16 +194,25 @@ static enum
in GCC. */ in GCC. */
# include <string.h> # include <string.h>
# define my_index strchr # define my_index strchr
#define my_bcopy(src, dst, n) memcpy ((dst), (src), (n))
#else #else
# if HAVE_STRING_H
# include <string.h>
# else
# include <strings.h>
# endif
/* Avoid depending on library functions or files /* Avoid depending on library functions or files
whose names are inconsistent. */ whose names are inconsistent. */
char *getenv (); #ifndef getenv
extern char *getenv ();
#endif
static char * static char *
my_index (const char *str, int chr) my_index (str, chr)
const char *str;
int chr;
{ {
while (*str) while (*str)
{ {
@ -184,14 +223,19 @@ my_index (const char *str, int chr)
return 0; return 0;
} }
static void /* If using GCC, we can safely declare strlen this way.
my_bcopy (const char *from, char *to, int size) If not using GCC, it is ok not to declare it. */
{ #ifdef __GNUC__
int i; /* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
for (i = 0; i < size; i++) That was relevant to code that was here before. */
to[i] = from[i]; # if (!defined __STDC__ || !__STDC__) && !defined strlen
} /* gcc with -traditional declares the built-in strlen to return int,
#endif /* GNU C library. */ 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. */ /* Handle permutation of arguments. */
@ -202,6 +246,46 @@ my_bcopy (const char *from, char *to, int size)
static int first_nonopt; static int first_nonopt;
static int last_nonopt; static int last_nonopt;
#ifdef _LIBC
/* Bash 2.0 gives us an environment variable containing flags
indicating ARGV elements that should not be considered arguments. */
/* Defined in getopt_init.c */
extern char *__getopt_nonoption_flags;
static int nonoption_flags_max_len;
static int nonoption_flags_len;
static int original_argc;
static char *const *original_argv;
/* Make sure the environment variable bash 2.0 puts in the environment
is valid for the getopt call we must make sure that the ARGV passed
to getopt is that one passed to the process. */
static void
__attribute__ ((unused))
store_args_and_env (int argc, char *const *argv)
{
/* XXX This is no good solution. We should rather copy the args so
that we can compare them later. But we must not use malloc(3). */
original_argc = argc;
original_argv = argv;
}
# ifdef text_set_element
text_set_element (__libc_subinit, store_args_and_env);
# endif /* text_set_element */
# define SWAP_FLAGS(ch1, ch2) \
if (nonoption_flags_len > 0) \
{ \
char __tmp = __getopt_nonoption_flags[ch1]; \
__getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \
__getopt_nonoption_flags[ch2] = __tmp; \
}
#else /* !_LIBC */
# define SWAP_FLAGS(ch1, ch2)
#endif /* _LIBC */
/* Exchange two adjacent subsequences of ARGV. /* Exchange two adjacent subsequences of ARGV.
One subsequence is elements [first_nonopt,last_nonopt) One subsequence is elements [first_nonopt,last_nonopt)
which contains all the non-options that have been skipped so far. which contains all the non-options that have been skipped so far.
@ -211,26 +295,160 @@ static int last_nonopt;
`first_nonopt' and `last_nonopt' are relocated so that they describe `first_nonopt' and `last_nonopt' are relocated so that they describe
the new indices of the non-options in ARGV after they are moved. */ the new indices of the non-options in ARGV after they are moved. */
#if defined __STDC__ && __STDC__
static void exchange (char **);
#endif
static void static void
exchange (char **argv) exchange (argv)
char **argv;
{ {
int nonopts_size = (last_nonopt - first_nonopt) * sizeof (char *); int bottom = first_nonopt;
char **temp = (char **) alloca (nonopts_size); int middle = last_nonopt;
int top = optind;
char *tem;
/* Interchange the two blocks of data in ARGV. */ /* Exchange the shorter segment with the far end of the longer segment.
That puts the shorter segment into the right place.
It leaves the longer segment in the right place overall,
but it consists of two parts that need to be swapped next. */
my_bcopy ((char *) &argv[first_nonopt], (char *) temp, nonopts_size); #ifdef _LIBC
my_bcopy ((char *) &argv[last_nonopt], (char *) &argv[first_nonopt], /* First make sure the handling of the `__getopt_nonoption_flags'
(optind - last_nonopt) * sizeof (char *)); string can work normally. Our top argument must be in the range
my_bcopy ((char *) temp, of the string. */
(char *) &argv[first_nonopt + optind - last_nonopt], if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len)
nonopts_size); {
/* 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;
}
}
#endif
while (top > middle && middle > bottom)
{
if (top - middle > middle - bottom)
{
/* Bottom segment is the short one. */
int len = middle - bottom;
register int i;
/* Swap it with the top part of the top segment. */
for (i = 0; i < len; i++)
{
tem = argv[bottom + i];
argv[bottom + i] = argv[top - (middle - bottom) + i];
argv[top - (middle - bottom) + i] = tem;
SWAP_FLAGS (bottom + i, top - (middle - bottom) + i);
}
/* Exclude the moved bottom segment from further swapping. */
top -= len;
}
else
{
/* Top segment is the short one. */
int len = top - middle;
register int i;
/* Swap it with the bottom part of the bottom segment. */
for (i = 0; i < len; i++)
{
tem = argv[bottom + i];
argv[bottom + i] = argv[middle + i];
argv[middle + i] = tem;
SWAP_FLAGS (bottom + i, middle + i);
}
/* Exclude the moved top segment from further swapping. */
bottom += len;
}
}
/* Update records for the slots the non-options now occupy. */ /* Update records for the slots the non-options now occupy. */
first_nonopt += (optind - last_nonopt); first_nonopt += (optind - last_nonopt);
last_nonopt = optind; 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;
#ifdef _LIBC
if (posixly_correct == NULL
&& argc == original_argc && argv == original_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;
}
/* Scan elements of ARGV (whose length is ARGC) for option characters /* Scan elements of ARGV (whose length is ARGC) for option characters
given in OPTSTRING. given in OPTSTRING.
@ -245,7 +463,7 @@ exchange (char **argv)
updating `optind' and `nextchar' so that the next call to `getopt' can updating `optind' and `nextchar' so that the next call to `getopt' can
resume the scan with the following option character or ARGV-element. resume the scan with the following option character or ARGV-element.
If there are no more option characters, `getopt' returns `EOF'. If there are no more option characters, `getopt' returns -1.
Then `optind' is the index in ARGV of the first ARGV-element Then `optind' is the index in ARGV of the first ARGV-element
that is not an option. (The ARGV-elements have been permuted that is not an option. (The ARGV-elements have been permuted
so that those that are not options now come last.) so that those that are not options now come last.)
@ -289,44 +507,47 @@ exchange (char **argv)
long-named options. */ long-named options. */
int int
_getopt_internal (int argc, char *const *argv, const char *optstring, _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
const struct option *longopts, int *longind, int long_only) int argc;
char *const *argv;
const char *optstring;
const struct option *longopts;
int *longind;
int long_only;
{ {
int option_index; optarg = NULL;
optarg = 0;
/* Initialize the internal data when the first call is made.
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. */
if (optind == 0 || !__getopt_initialized)
{
if (optind == 0) if (optind == 0)
{ optind = 1; /* Don't scan ARGV[0], the program name. */
first_nonopt = last_nonopt = optind = 1; optstring = _getopt_initialize (argc, argv, optstring);
__getopt_initialized = 1;
nextchar = NULL;
/* 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 (getenv ("POSIXLY_CORRECT") != NULL)
ordering = REQUIRE_ORDER;
else
ordering = PERMUTE;
} }
/* Test whether ARGV[optind] points to a non-option argument.
Either it does not have option syntax, or there is an environment flag
from the shell indicating it is not an option. The later information
is only used when the used in the GNU libc. */
#ifdef _LIBC
# 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') 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 (ordering == PERMUTE)
{ {
/* If we have just processed some options following some non-options, /* If we have just processed some options following some non-options,
@ -337,21 +558,15 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
else if (last_nonopt != optind) else if (last_nonopt != optind)
first_nonopt = optind; first_nonopt = optind;
/* Now skip any additional non-options /* Skip any additional non-options
and extend the range of non-options previously skipped. */ and extend the range of non-options previously skipped. */
while (optind < argc while (optind < argc && NONOPTION_P)
&& (argv[optind][0] != '-' || argv[optind][1] == '\0')
#ifdef GETOPT_COMPAT
&& (longopts == NULL
|| argv[optind][0] != '+' || argv[optind][1] == '\0')
#endif /* GETOPT_COMPAT */
)
optind++; optind++;
last_nonopt = optind; last_nonopt = optind;
} }
/* Special ARGV-element `--' means premature end of options. /* The special ARGV-element `--' means premature end of options.
Skip it like a null option, Skip it like a null option,
then exchange with previous non-options as if it were an option, then exchange with previous non-options as if it were an option,
then skip everything else like a non-option. */ then skip everything else like a non-option. */
@ -378,58 +593,64 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
that we previously skipped, so the caller will digest them. */ that we previously skipped, so the caller will digest them. */
if (first_nonopt != last_nonopt) if (first_nonopt != last_nonopt)
optind = first_nonopt; optind = first_nonopt;
return EOF; return -1;
} }
/* If we have come to a non-option and did not permute it, /* If we have come to a non-option and did not permute it,
either stop the scan or describe it to the caller and pass it by. */ either stop the scan or describe it to the caller and pass it by. */
if ((argv[optind][0] != '-' || argv[optind][1] == '\0') if (NONOPTION_P)
#ifdef GETOPT_COMPAT
&& (longopts == NULL
|| argv[optind][0] != '+' || argv[optind][1] == '\0')
#endif /* GETOPT_COMPAT */
)
{ {
if (ordering == REQUIRE_ORDER) if (ordering == REQUIRE_ORDER)
return EOF; return -1;
optarg = argv[optind++]; optarg = argv[optind++];
return 1; return 1;
} }
/* We have found another option-ARGV-element. /* We have found another option-ARGV-element.
Start decoding its characters. */ Skip the initial punctuation. */
nextchar = (argv[optind] + 1 nextchar = (argv[optind] + 1
+ (longopts != NULL && argv[optind][1] == '-')); + (longopts != NULL && argv[optind][1] == '-'));
} }
/* Decode the current option-ARGV-element. */
/* Check whether the ARGV-element is a long option.
If long_only and the ARGV-element has the form "-f", where f is
a valid short option, don't consider it an abbreviated form of
a long option that starts with f. Otherwise there would be no
way to give the -f short option.
On the other hand, if there's a long option "fubar" and
the ARGV-element is "-fu", do consider that an abbreviation of
the long option, just like "--fu", and not "-f" with arg "u".
This distinction seems to be the most useful approach. */
if (longopts != NULL if (longopts != NULL
&& ((argv[optind][0] == '-' && (argv[optind][1] == '-'
&& (argv[optind][1] == '-' || long_only)) || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1])))))
#ifdef GETOPT_COMPAT
|| argv[optind][0] == '+'
#endif /* GETOPT_COMPAT */
))
{ {
char *nameend;
const struct option *p; const struct option *p;
char *s = nextchar; const struct option *pfound = NULL;
int exact = 0; int exact = 0;
int ambig = 0; int ambig = 0;
const struct option *pfound = NULL; int indfound = -1;
int indfound; int option_index;
indfound = 0; /* To silence the compiler. */ for (nameend = nextchar; *nameend && *nameend != '='; nameend++)
/* Do nothing. */ ;
while (*s && *s != '=') /* Test all long options for either exact match
s++; or abbreviated matches. */
for (p = longopts, option_index = 0; p->name; p++, option_index++)
/* Test all options for either exact match or abbreviated matches. */ if (!strncmp (p->name, nextchar, nameend - nextchar))
for (p = longopts, option_index = 0; p->name;
p++, option_index++)
if (!strncmp (p->name, nextchar, s - nextchar))
{ {
if (s - nextchar == strlen (p->name)) if ((unsigned int) (nameend - nextchar)
== (unsigned int) strlen (p->name))
{ {
/* Exact match found. */ /* Exact match found. */
pfound = p; pfound = p;
@ -444,7 +665,7 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
indfound = option_index; indfound = option_index;
} }
else else
/* Second nonexact match found. */ /* Second or later nonexact match found. */
ambig = 1; ambig = 1;
} }
@ -452,9 +673,10 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
{ {
if (opterr) if (opterr)
fprintf (stderr, _("%s: option `%s' is ambiguous\n"), fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
exec_name, argv[optind]); argv[0], argv[optind]);
nextchar += strlen (nextchar); nextchar += strlen (nextchar);
optind++; optind++;
optopt = 0;
return '?'; return '?';
} }
@ -462,12 +684,12 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
{ {
option_index = indfound; option_index = indfound;
optind++; optind++;
if (*s) if (*nameend)
{ {
/* Don't test has_arg with >, because some C compilers don't /* Don't test has_arg with >, because some C compilers don't
allow it to be used on enums. */ allow it to be used on enums. */
if (pfound->has_arg) if (pfound->has_arg)
optarg = s + 1; optarg = nameend + 1;
else else
{ {
if (opterr) if (opterr)
@ -476,13 +698,189 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
/* --option */ /* --option */
fprintf (stderr, fprintf (stderr,
_("%s: option `--%s' doesn't allow an argument\n"), _("%s: option `--%s' doesn't allow an argument\n"),
exec_name, pfound->name); argv[0], pfound->name);
else else
/* +option or -option */ /* +option or -option */
fprintf (stderr, fprintf (stderr,
_("%s: option `%c%s' doesn't allow an argument\n"), _("%s: option `%c%s' doesn't allow an argument\n"),
exec_name, argv[optind - 1][0], pfound->name); argv[0], argv[optind - 1][0], pfound->name);
} }
nextchar += strlen (nextchar);
optopt = pfound->val;
return '?';
}
}
else if (pfound->has_arg == 1)
{
if (optind < argc)
optarg = argv[optind++];
else
{
if (opterr)
fprintf (stderr,
_("%s: option `%s' requires an argument\n"),
argv[0], argv[optind - 1]);
nextchar += strlen (nextchar);
optopt = pfound->val;
return optstring[0] == ':' ? ':' : '?';
}
}
nextchar += strlen (nextchar);
if (longind != NULL)
*longind = option_index;
if (pfound->flag)
{
*(pfound->flag) = pfound->val;
return 0;
}
return pfound->val;
}
/* Can't find it as a long option. If this is not getopt_long_only,
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 (opterr)
{
if (argv[optind][1] == '-')
/* --option */
fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
argv[0], nextchar);
else
/* +option or -option */
fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
argv[0], argv[optind][0], nextchar);
}
nextchar = (char *) "";
optind++;
optopt = 0;
return '?';
}
}
/* 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 == ':')
{
if (opterr)
{
if (posixly_correct)
/* 1003.2 specifies the format of this message. */
fprintf (stderr, _("%s: illegal option -- %c\n"),
argv[0], c);
else
fprintf (stderr, _("%s: invalid option -- %c\n"),
argv[0], c);
}
optopt = c;
return '?';
}
/* Convenience. Treat POSIX -W foo same as long option --foo */
if (temp[0] == 'W' && temp[1] == ';')
{
char *nameend;
const struct option *p;
const struct option *pfound = NULL;
int exact = 0;
int ambig = 0;
int indfound = 0;
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 (opterr)
{
/* 1003.2 specifies the format of this message. */
fprintf (stderr, _("%s: option requires an argument -- %c\n"),
argv[0], c);
}
optopt = c;
if (optstring[0] == ':')
c = ':';
else
c = '?';
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;
indfound = option_index;
exact = 1;
break;
}
else if (pfound == NULL)
{
/* First nonexact match found. */
pfound = p;
indfound = option_index;
}
else
/* Second or later nonexact match found. */
ambig = 1;
}
if (ambig && !exact)
{
if (opterr)
fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
argv[0], argv[optind]);
nextchar += strlen (nextchar);
optind++;
return '?';
}
if (pfound != NULL)
{
option_index = indfound;
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 (opterr)
fprintf (stderr, _("\
%s: option `-W %s' doesn't allow an argument\n"),
argv[0], pfound->name);
nextchar += strlen (nextchar); nextchar += strlen (nextchar);
return '?'; return '?';
} }
@ -496,7 +894,7 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
if (opterr) if (opterr)
fprintf (stderr, fprintf (stderr,
_("%s: option `%s' requires an argument\n"), _("%s: option `%s' requires an argument\n"),
exec_name, argv[optind - 1]); argv[0], argv[optind - 1]);
nextchar += strlen (nextchar); nextchar += strlen (nextchar);
return optstring[0] == ':' ? ':' : '?'; return optstring[0] == ':' ? ':' : '?';
} }
@ -511,60 +909,8 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
} }
return pfound->val; return pfound->val;
} }
/* Can't find it as a long option. If this is not getopt_long_only, nextchar = NULL;
or the option starts with '--' or is not a valid short return 'W'; /* Let the application handle it. */
option, then it's an error.
Otherwise interpret it as a short option. */
if (!long_only || argv[optind][1] == '-'
#ifdef GETOPT_COMPAT
|| argv[optind][0] == '+'
#endif /* GETOPT_COMPAT */
|| my_index (optstring, *nextchar) == NULL)
{
if (opterr)
{
if (argv[optind][1] == '-')
/* --option */
fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
exec_name, nextchar);
else
/* +option or -option */
fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
exec_name, argv[optind][0], nextchar);
}
nextchar = (char *) "";
optind++;
return '?';
}
}
/* Look at and handle the next 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 == ':')
{
if (opterr)
{
#if 0
if (c < 040 || c >= 0177)
fprintf (stderr, "%s: unrecognized option, character code 0%o\n",
exec_name, c);
else
fprintf (stderr, "%s: unrecognized option `-%c'\n", exec_name, c);
#else
/* 1003.2 specifies the format of this message. */
fprintf (stderr, _("%s: illegal option -- %c\n"), exec_name, c);
#endif
}
optopt = c;
return '?';
} }
if (temp[1] == ':') if (temp[1] == ':')
{ {
@ -577,7 +923,7 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
optind++; optind++;
} }
else else
optarg = 0; optarg = NULL;
nextchar = NULL; nextchar = NULL;
} }
else else
@ -594,14 +940,10 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
{ {
if (opterr) if (opterr)
{ {
#if 0
fprintf (stderr, "%s: option `-%c' requires an argument\n",
exec_name, c);
#else
/* 1003.2 specifies the format of this message. */ /* 1003.2 specifies the format of this message. */
fprintf (stderr, _("%s: option requires an argument -- %c\n"), fprintf (stderr,
exec_name, c); _("%s: option requires an argument -- %c\n"),
#endif argv[0], c);
} }
optopt = c; optopt = c;
if (optstring[0] == ':') if (optstring[0] == ':')
@ -620,16 +962,11 @@ _getopt_internal (int argc, char *const *argv, const char *optstring,
} }
} }
/* Calls internal getopt function to enable long option names. */
int int
getopt_long (int argc, char *const *argv, const char *shortopts, getopt (argc, argv, optstring)
const struct option *longopts, int *longind) int argc;
{ char *const *argv;
return _getopt_internal (argc, argv, shortopts, longopts, longind, 0); const char *optstring;
}
int
getopt (int argc, char *const *argv, const char *optstring)
{ {
return _getopt_internal (argc, argv, optstring, return _getopt_internal (argc, argv, optstring,
(const struct option *) 0, (const struct option *) 0,
@ -637,7 +974,7 @@ getopt (int argc, char *const *argv, const char *optstring)
0); 0);
} }
#endif /* _LIBC or not __GNU_LIBRARY__. */ #endif /* Not ELIDE_CODE. */
#ifdef TEST #ifdef TEST
@ -657,7 +994,7 @@ main (argc, argv)
int this_option_optind = optind ? optind : 1; int this_option_optind = optind ? optind : 1;
c = getopt (argc, argv, "abc:d:0123456789"); c = getopt (argc, argv, "abc:d:0123456789");
if (c == EOF) if (c == -1)
break; break;
switch (c) switch (c)