Skip to content

R
riscv-gcc-1
Commit b134508b by Ian Lance Taylor Committed by Jeff Law
Options

getopt.c: Update to latest FSF version. 

        * getopt.c: Update to latest FSF version.
        * getopt1.c: Likewise.
Bring over from devo.

From-SVN: r18169
parent 2b63596a
Showing with 389 additions and 101 deletions
libiberty/ChangeLog
Thu Feb 12 16:29:49 1998 Ian Lance Taylor <ian@cygnus.com>
* getopt.c: Update to latest FSF version.
* getopt1.c: Likewise.
Fri Feb 6 01:35:17 1998 Manfred Hollstein <manfred@s-direktnet.de> Fri Feb 6 01:35:17 1998 Manfred Hollstein <manfred@s-direktnet.de>
* Makefile.in (FLAGS_TO_PASS): Don't pass PICFLAG. * Makefile.in (FLAGS_TO_PASS): Don't pass PICFLAG.
......
libiberty/getopt.c
...@@ -3,29 +3,26 @@ ...@@ -3,29 +3,26 @@
"Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu "Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu
before changing it! before changing it!
Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95 Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of the libiberty library. This library is free NOTE: The canonical source of this file is maintained with the GNU C Library.
software; you can redistribute it and/or modify it under the Bugs can be reported to bug-glibc@prep.ai.mit.edu.
terms of the GNU General Public License as published by the
Free Software Foundation; either version 2, or (at your option) This program is free software; you can redistribute it and/or modify it
any later version. under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2, or (at your option) any
This library is distributed in the hope that it will be useful, later version.
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the This program is distributed in the hope that it will be useful,
GNU General Public License for more details. but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
You should have received a copy of the GNU General Public License GNU General Public License for more details.
along with GNU CC; see the file COPYING. If not, write to
the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
As a special exception, if you link this library with files Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
compiled with a GNU compiler to produce an executable, this does not cause USA. */
the resulting executable to be covered by the GNU General Public License.
This exception does not however invalidate any other reasons why
the executable file might be covered by the GNU General Public License. */
/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>. /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
Ditto for AIX 3.2 and <stdlib.h>. */ Ditto for AIX 3.2 and <stdlib.h>. */
...@@ -34,17 +31,10 @@ the executable file might be covered by the GNU General Public License. */ ...@@ -34,17 +31,10 @@ the executable file might be covered by the GNU General Public License. */
#endif #endif
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#if defined (emacs) || defined (CONFIG_BROKETS)
/* We use <config.h> instead of "config.h" so that a compilation
using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
(which it would do because it found this file in $srcdir). */
#include <config.h> #include <config.h>
#else
#include "config.h"
#endif
#endif #endif
#ifndef __STDC__ #if !defined (__STDC__) || !__STDC__
/* This is a separate conditional since some stdc systems /* This is a separate conditional since some stdc systems
reject `defined (const)'. */ reject `defined (const)'. */
#ifndef const #ifndef const
...@@ -61,11 +51,16 @@ the executable file might be covered by the GNU General Public License. */ ...@@ -61,11 +51,16 @@ the executable file might be covered by the GNU General Public License. */
(especially if it is a shared library). Rather than having every GNU (especially if it is a shared library). Rather than having every GNU
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. */
/* Many versions of the Linux C library include older, broken versions
of these routines, which will break the linker's command-line
parsing. */
#if defined (_LIBC) || !defined (__GNU_LIBRARY__) || defined (__linux__) #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 /* This needs to come after some library #include
...@@ -74,8 +69,27 @@ the executable file might be covered by the GNU General Public License. */ ...@@ -74,8 +69,27 @@ the executable file might be covered by the GNU General Public License. */
/* Don't include stdlib.h for non-GNU C libraries because some of them /* Don't include stdlib.h for non-GNU C libraries because some of them
contain conflicting prototypes for getopt. */ contain conflicting prototypes for getopt. */
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h>
#endif /* GNU C library. */ #endif /* GNU C library. */
#ifdef VMS
#include <unixlib.h>
#if HAVE_STRING_H - 0
#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
to intersperse the options with the other arguments. to intersperse the options with the other arguments.
...@@ -106,14 +120,20 @@ char *optarg = NULL; ...@@ -106,14 +120,20 @@ char *optarg = NULL;
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 = 0;
/* 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.
...@@ -162,12 +182,15 @@ int optopt = '?'; ...@@ -162,12 +182,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
...@@ -202,7 +225,7 @@ my_index (str, chr) ...@@ -202,7 +225,7 @@ my_index (str, chr)
#ifdef __GNUC__ #ifdef __GNUC__
/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h. /* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
That was relevant to code that was here before. */ That was relevant to code that was here before. */
#ifndef __STDC__ #if !defined (__STDC__) || !__STDC__
/* gcc with -traditional declares the built-in strlen to return int, /* gcc with -traditional declares the built-in strlen to return int,
and has done so at least since version 2.4.5. -- rms. */ and has done so at least since version 2.4.5. -- rms. */
extern int strlen (const char *); extern int strlen (const char *);
...@@ -220,6 +243,46 @@ extern int strlen (const char *); ...@@ -220,6 +243,46 @@ extern int strlen (const char *);
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.
...@@ -229,6 +292,10 @@ static int last_nonopt; ...@@ -229,6 +292,10 @@ 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 (argv) exchange (argv)
char **argv; char **argv;
...@@ -243,6 +310,28 @@ exchange (argv) ...@@ -243,6 +310,28 @@ exchange (argv)
It leaves the longer segment in the right place overall, It leaves the longer segment in the right place overall,
but it consists of two parts that need to be swapped next. */ but it consists of two parts that need to be swapped next. */
#ifdef _LIBC
/* 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;
}
}
#endif
while (top > middle && middle > bottom) while (top > middle && middle > bottom)
{ {
if (top - middle > middle - bottom) if (top - middle > middle - bottom)
...@@ -257,6 +346,7 @@ exchange (argv) ...@@ -257,6 +346,7 @@ exchange (argv)
tem = argv[bottom + i]; tem = argv[bottom + i];
argv[bottom + i] = argv[top - (middle - bottom) + i]; argv[bottom + i] = argv[top - (middle - bottom) + i];
argv[top - (middle - bottom) + i] = tem; argv[top - (middle - bottom) + i] = tem;
SWAP_FLAGS (bottom + i, top - (middle - bottom) + i);
} }
/* Exclude the moved bottom segment from further swapping. */ /* Exclude the moved bottom segment from further swapping. */
top -= len; top -= len;
...@@ -273,6 +363,7 @@ exchange (argv) ...@@ -273,6 +363,7 @@ exchange (argv)
tem = argv[bottom + i]; tem = argv[bottom + i];
argv[bottom + i] = argv[middle + i]; argv[bottom + i] = argv[middle + i];
argv[middle + i] = tem; argv[middle + i] = tem;
SWAP_FLAGS (bottom + i, middle + i);
} }
/* Exclude the moved top segment from further swapping. */ /* Exclude the moved top segment from further swapping. */
bottom += len; bottom += len;
...@@ -287,18 +378,25 @@ exchange (argv) ...@@ -287,18 +378,25 @@ exchange (argv)
/* Initialize the internal data when the first call is made. */ /* 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 * static const char *
_getopt_initialize (optstring) _getopt_initialize (argc, argv, optstring)
int argc;
char *const *argv;
const char *optstring; const char *optstring;
{ {
/* Start processing options with ARGV-element 1 (since ARGV-element 0 /* Start processing options with ARGV-element 1 (since ARGV-element 0
is the program name); the sequence of previously skipped is the program name); the sequence of previously skipped
non-option ARGV-elements is empty. */ non-option ARGV-elements is empty. */
first_nonopt = last_nonopt = optind = 1; first_nonopt = last_nonopt = optind;
nextchar = NULL; nextchar = NULL;
posixly_correct = getenv ("POSIXLY_CORRECT");
/* Determine how to handle the ordering of options and nonoptions. */ /* Determine how to handle the ordering of options and nonoptions. */
if (optstring[0] == '-') if (optstring[0] == '-')
...@@ -311,11 +409,41 @@ _getopt_initialize (optstring) ...@@ -311,11 +409,41 @@ _getopt_initialize (optstring)
ordering = REQUIRE_ORDER; ordering = REQUIRE_ORDER;
++optstring; ++optstring;
} }
else if (getenv ("POSIXLY_CORRECT") != NULL) else if (posixly_correct != NULL)
ordering = REQUIRE_ORDER; ordering = REQUIRE_ORDER;
else else
ordering = PERMUTE; 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; return optstring;
} }
...@@ -332,7 +460,7 @@ _getopt_initialize (optstring) ...@@ -332,7 +460,7 @@ _getopt_initialize (optstring)
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.)
...@@ -386,16 +514,37 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only) ...@@ -386,16 +514,37 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
{ {
optarg = NULL; optarg = NULL;
if (optind == 0) if (optind == 0 || !__getopt_initialized)
optstring = _getopt_initialize (optstring); {
if (optind == 0)
optind = 1; /* Don't scan ARGV[0], the program name. */
optstring = _getopt_initialize (argc, argv, optstring);
__getopt_initialized = 1;
}
if (argc == 0) /* Test whether ARGV[optind] points to a non-option argument.
return EOF; 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. */ /* 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,
...@@ -409,8 +558,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only) ...@@ -409,8 +558,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
/* 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'))
optind++; optind++;
last_nonopt = optind; last_nonopt = optind;
} }
...@@ -442,16 +590,16 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only) ...@@ -442,16 +590,16 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
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)
{ {
if (ordering == REQUIRE_ORDER) if (ordering == REQUIRE_ORDER)
return EOF; return -1;
optarg = argv[optind++]; optarg = argv[optind++];
return 1; return 1;
} }
...@@ -487,7 +635,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only) ...@@ -487,7 +635,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
const struct option *pfound = NULL; const struct option *pfound = NULL;
int exact = 0; int exact = 0;
int ambig = 0; int ambig = 0;
int indfound; int indfound = -1;
int option_index; int option_index;
for (nameend = nextchar; *nameend && *nameend != '='; nameend++) for (nameend = nextchar; *nameend && *nameend != '='; nameend++)
...@@ -498,7 +646,8 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only) ...@@ -498,7 +646,8 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
for (p = longopts, option_index = 0; p->name; p++, option_index++) for (p = longopts, option_index = 0; p->name; p++, option_index++)
if (!strncmp (p->name, nextchar, nameend - nextchar)) if (!strncmp (p->name, nextchar, nameend - nextchar))
{ {
if (nameend - nextchar == strlen (p->name)) if ((unsigned int) (nameend - nextchar)
== (unsigned int) strlen (p->name))
{ {
/* Exact match found. */ /* Exact match found. */
pfound = p; pfound = p;
...@@ -520,10 +669,11 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only) ...@@ -520,10 +669,11 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
if (ambig && !exact) if (ambig && !exact)
{ {
if (opterr) if (opterr)
fprintf (stderr, "%s: option `%s' is ambiguous\n", fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
argv[0], argv[optind]); argv[0], argv[optind]);
nextchar += strlen (nextchar); nextchar += strlen (nextchar);
optind++; optind++;
optopt = 0;
return '?'; return '?';
} }
...@@ -540,19 +690,20 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only) ...@@ -540,19 +690,20 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
else else
{ {
if (opterr) if (opterr)
{ if (argv[optind - 1][1] == '-')
if (argv[optind - 1][1] == '-') /* --option */
/* --option */ fprintf (stderr,
fprintf (stderr, _("%s: option `--%s' doesn't allow an argument\n"),
"%s: option `--%s' doesn't allow an argument\n", argv[0], 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", argv[0], argv[optind - 1][0], pfound->name);
argv[0], argv[optind - 1][0], pfound->name);
}
nextchar += strlen (nextchar); nextchar += strlen (nextchar);
optopt = pfound->val;
return '?'; return '?';
} }
} }
...@@ -563,9 +714,11 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only) ...@@ -563,9 +714,11 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
else else
{ {
if (opterr) if (opterr)
fprintf (stderr, "%s: option `%s' requires an argument\n", fprintf (stderr,
argv[0], argv[optind - 1]); _("%s: option `%s' requires an argument\n"),
argv[0], argv[optind - 1]);
nextchar += strlen (nextchar); nextchar += strlen (nextchar);
optopt = pfound->val;
return optstring[0] == ':' ? ':' : '?'; return optstring[0] == ':' ? ':' : '?';
} }
} }
...@@ -591,15 +744,16 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only) ...@@ -591,15 +744,16 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
{ {
if (argv[optind][1] == '-') if (argv[optind][1] == '-')
/* --option */ /* --option */
fprintf (stderr, "%s: unrecognized option `--%s'\n", fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
argv[0], nextchar); argv[0], nextchar);
else else
/* +option or -option */ /* +option or -option */
fprintf (stderr, "%s: unrecognized option `%c%s'\n", fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
argv[0], argv[optind][0], nextchar); argv[0], argv[optind][0], nextchar);
} }
nextchar = (char *) ""; nextchar = (char *) "";
optind++; optind++;
optopt = 0;
return '?'; return '?';
} }
} }
...@@ -618,12 +772,141 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only) ...@@ -618,12 +772,141 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
{ {
if (opterr) if (opterr)
{ {
/* 1003.2 specifies the format of this message. */ if (posixly_correct)
fprintf (stderr, "%s: illegal option -- %c\n", argv[0], c); /* 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; optopt = c;
return '?'; 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);
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);
return optstring[0] == ':' ? ':' : '?';
}
}
nextchar += strlen (nextchar);
if (longind != NULL)
*longind = option_index;
if (pfound->flag)
{
*(pfound->flag) = pfound->val;
return 0;
}
return pfound->val;
}
nextchar = NULL;
return 'W'; /* Let the application handle it. */
}
if (temp[1] == ':') if (temp[1] == ':')
{ {
if (temp[2] == ':') if (temp[2] == ':')
...@@ -653,8 +936,9 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only) ...@@ -653,8 +936,9 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
if (opterr) if (opterr)
{ {
/* 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,
argv[0], c); _("%s: option requires an argument -- %c\n"),
argv[0], c);
} }
optopt = c; optopt = c;
if (optstring[0] == ':') if (optstring[0] == ':')
...@@ -685,7 +969,7 @@ getopt (argc, argv, optstring) ...@@ -685,7 +969,7 @@ getopt (argc, argv, optstring)
0); 0);
} }
#endif /* _LIBC or not __GNU_LIBRARY__. */ #endif /* Not ELIDE_CODE. */
#ifdef TEST #ifdef TEST
...@@ -705,7 +989,7 @@ main (argc, argv) ...@@ -705,7 +989,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)
......
libiberty/getopt1.c
/* getopt_long and getopt_long_only entry points for GNU getopt. /* getopt_long and getopt_long_only entry points for GNU getopt.
Copyright (C) 1987, 88, 89, 90, 91, 92, 1993 Copyright (C) 1987,88,89,90,91,92,93,94,96,97 Free Software Foundation, Inc.
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or NOTE: The canonical source of this file is maintained with the GNU C Library.
modify it under the terms of the GNU Library General Public License Bugs can be reported to bug-glibc@prep.ai.mit.edu.
as published by the Free Software Foundation; either version 2, or
(at your option) any later version. 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 the
Free Software Foundation; either version 2, or (at your option) any
later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Library General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU Library 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#if defined (emacs) || defined (CONFIG_BROKETS)
/* We use <config.h> instead of "config.h" so that a compilation
using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
(which it would do because it found this file in $srcdir). */
#include <config.h> #include <config.h>
#else
#include "config.h"
#endif
#endif #endif
#include "getopt.h" #include "getopt.h"
#ifndef __STDC__ #if !defined (__STDC__) || !__STDC__
/* This is a separate conditional since some stdc systems /* This is a separate conditional since some stdc systems
reject `defined (const)'. */ reject `defined (const)'. */
#ifndef const #ifndef const
...@@ -46,19 +42,22 @@ ...@@ -46,19 +42,22 @@
(especially if it is a shared library). Rather than having every GNU (especially if it is a shared library). Rather than having every GNU
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. */
/* Many versions of the Linux C library include older, broken versions
of these routines, which will break the linker's command-line
parsing. */
#if defined (_LIBC) || !defined (__GNU_LIBRARY__) || defined (__linux__) #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 /* This needs to come after some library #include
to get __GNU_LIBRARY__ defined. */ to get __GNU_LIBRARY__ defined. */
#ifdef __GNU_LIBRARY__ #ifdef __GNU_LIBRARY__
#include <stdlib.h> #include <stdlib.h>
#else
char *getenv ();
#endif #endif
#ifndef NULL #ifndef NULL
...@@ -93,7 +92,7 @@ getopt_long_only (argc, argv, options, long_options, opt_index) ...@@ -93,7 +92,7 @@ getopt_long_only (argc, argv, options, long_options, opt_index)
} }
#endif /* _LIBC or not __GNU_LIBRARY__. */ #endif /* Not ELIDE_CODE. */
#ifdef TEST #ifdef TEST
...@@ -124,7 +123,7 @@ main (argc, argv) ...@@ -124,7 +123,7 @@ main (argc, argv)
c = getopt_long (argc, argv, "abc:d:0123456789", c = getopt_long (argc, argv, "abc:d:0123456789",
long_options, &option_index); long_options, &option_index);
if (c == EOF) if (c == -1)
break; break;
switch (c) switch (c)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment