533da48302
+2020-01-01 Jakub Jelinek <jakub@redhat.com> + + Update copyright years. + +2019-12-06 Tim Ruehsen <tim.ruehsen@gmx.de> + + * make-relative-prefix.c (split_directories): + Return early on empty 'name' + +2019-11-16 Tim Ruehsen <tim.ruehsen@gmx.de> + + * cp-demangle.c (d_print_init): Remove const from 4th param. + (cplus_demangle_fill_name): Initialize d->d_counting. + (cplus_demangle_fill_extended_operator): Likewise. + (cplus_demangle_fill_ctor): Likewise. + (cplus_demangle_fill_dtor): Likewise. + (d_make_empty): Likewise. + (d_count_templates_scopes): Remobe const from 3rd param, + Return on dc->d_counting > 1, + Increment dc->d_counting. + * cp-demint.c (cplus_demangle_fill_component): Initialize d->d_counting. + (cplus_demangle_fill_builtin_type): Likewise. + (cplus_demangle_fill_operator): Likewise. + +2019-11-16 Eduard-Mihai Burtescu <eddyb@lyken.rs> + + * cplus-dem.c (cplus_demangle): Use rust_demangle directly. + (rust_demangle): Remove. + * rust-demangle.c (is_prefixed_hash): Rename to is_legacy_prefixed_hash. + (parse_lower_hex_nibble): Rename to decode_lower_hex_nibble. + (parse_legacy_escape): Rename to decode_legacy_escape. + (rust_is_mangled): Remove. + (struct rust_demangler): Add. + (peek): Add. + (next): Add. + (struct rust_mangled_ident): Add. + (parse_ident): Add. + (rust_demangle_sym): Remove. + (print_str): Add. + (PRINT): Add. + (print_ident): Add. + (rust_demangle_callback): Add. + (struct str_buf): Add. + (str_buf_reserve): Add. + (str_buf_append): Add. + (str_buf_demangle_callback): Add. + (rust_demangle): Add. + * rust-demangle.h: Remove. + +2019-11-15 Miguel Saldivar <saldivarcher@gmail.com> + + * testsuite/demangle-expected: Fix test. + +2019-11-04 Kamlesh Kumar <kamleshbhalui@gmail.com> + + * cp-demangle.c (d_expr_primary): Handle + nullptr demangling. + * testsuite/demangle-expected: Added test. + +2019-10-29 Paul Pluzhnikov <ppluzhnikov@google.com> + + * cp-demangle.c (d_number): Avoid signed int overflow. + +2019-10-28 Miguel Saldivar <saldivarcher@gmail.com> + + * cp-demangle.c (d_print_mod): Add a space before printing `complex` + and `imaginary`, as opposed to after. + * testsuite/demangle-expected: Adjust test. + +2019-10-03 Eduard-Mihai Burtescu <eddyb@lyken.rs> + + * rust-demangle.c (looks_like_rust): Remove. + (rust_is_mangled): Don't check escapes. + (is_prefixed_hash): Allow 0-9a-f permutations. + (rust_demangle_sym): Don't bail on unknown escapes. + * testsuite/rust-demangle-expected: Update 'main::$99$' test. + +2019-09-03 Eduard-Mihai Burtescu <eddyb@lyken.rs> + + * rust-demangle.c (unescape): Remove. + (parse_lower_hex_nibble): New function. + (parse_legacy_escape): New function. + (is_prefixed_hash): Use parse_lower_hex_nibble. + (looks_like_rust): Use parse_legacy_escape. + (rust_demangle_sym): Use parse_legacy_escape. + * testsuite/rust-demangle-expected: Add 'llv$u6d$' test. + +2019-08-27 Martin Liska <mliska@suse.cz> + + PR lto/91478 + * simple-object-elf.c (simple_object_elf_copy_lto_debug_sections): + First find a WEAK HIDDEN symbol in symbol table that will be + preserved. Later, use the symbol name for all removed symbols. + +2019-08-12 Martin Liska <mliska@suse.cz> + + * Makefile.in: Add filedescriptor.c. + * filedescriptor.c: New file. + * lrealpath.c (is_valid_fd): Remove. diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in index 0be45b4ae8..fe738d0db4 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in @@ -1,7 +1,7 @@ # Makefile for the libiberty library. # Originally written by K. Richard Pixley <rich@cygnus.com>. # -# Copyright (C) 1990-2019 Free Software Foundation, Inc. +# Copyright (C) 1990-2020 Free Software Foundation, Inc. # # This file is part of the libiberty library. # Libiberty is free software; you can redistribute it and/or @@ -127,7 +127,7 @@ CFILES = alloca.c argv.c asprintf.c atexit.c \ calloc.c choose-temp.c clock.c concat.c cp-demangle.c \ cp-demint.c cplus-dem.c crc32.c \ d-demangle.c dwarfnames.c dyn-string.c \ - fdmatch.c ffs.c fibheap.c filename_cmp.c floatformat.c \ + fdmatch.c ffs.c fibheap.c filedescriptor.c filename_cmp.c floatformat.c \ fnmatch.c fopen_unlocked.c \ getcwd.c getopt.c getopt1.c getpagesize.c getpwd.c getruntime.c \ gettimeofday.c \ @@ -171,6 +171,7 @@ REQUIRED_OFILES = \ ./cp-demint.$(objext) ./crc32.$(objext) ./d-demangle.$(objext) \ ./dwarfnames.$(objext) ./dyn-string.$(objext) \ ./fdmatch.$(objext) ./fibheap.$(objext) \ + ./filedescriptor.$(objext) \ ./filename_cmp.$(objext) ./floatformat.$(objext) \ ./fnmatch.$(objext) ./fopen_unlocked.$(objext) \ ./getopt.$(objext) ./getopt1.$(objext) ./getpwd.$(objext) \ @@ -756,6 +757,17 @@ $(CONFIGURED_OFILES): stamp-picdir stamp-noasandir else true; fi $(COMPILE.c) $(srcdir)/fibheap.c $(OUTPUT_OPTION) +./filedescriptor.$(objext): $(srcdir)/filedescriptor.c config.h $(INCDIR)/ansidecl.h \ + $(INCDIR)/libiberty.h + if [ x"$(PICFLAG)" != x ]; then \ + $(COMPILE.c) $(PICFLAG) $(srcdir)/filedescriptor.c -o pic/$@; \ + else true; fi + if [ x"$(NOASANFLAG)" != x ]; then \ + $(COMPILE.c) $(PICFLAG) $(NOASANFLAG) $(srcdir)/filedescriptor.c -o noasan/$@; \ + else true; fi + $(COMPILE.c) $(srcdir)/filedescriptor.c $(OUTPUT_OPTION) + + ./filename_cmp.$(objext): $(srcdir)/filename_cmp.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/filenames.h $(INCDIR)/hashtab.h \ $(INCDIR)/safe-ctype.h diff --git a/libiberty/_doprnt.c b/libiberty/_doprnt.c index d44dc415ed..a739f4304f 100644 --- a/libiberty/_doprnt.c +++ b/libiberty/_doprnt.c @@ -1,5 +1,5 @@ /* Provide a version of _doprnt in terms of fprintf. - Copyright (C) 1998-2019 Free Software Foundation, Inc. + Copyright (C) 1998-2020 Free Software Foundation, Inc. Contributed by Kaveh Ghazi (ghazi@caip.rutgers.edu) 3/29/98 This program is free software; you can redistribute it and/or modify it diff --git a/libiberty/argv.c b/libiberty/argv.c index 6444896f99..8c9794db6a 100644 --- a/libiberty/argv.c +++ b/libiberty/argv.c @@ -1,5 +1,5 @@ /* Create and destroy argument vectors (argv's) - Copyright (C) 1992-2019 Free Software Foundation, Inc. + Copyright (C) 1992-2020 Free Software Foundation, Inc. Written by Fred Fish @ Cygnus Support This file is part of the libiberty library. diff --git a/libiberty/asprintf.c b/libiberty/asprintf.c index 5718682f69..6e38e2234d 100644 --- a/libiberty/asprintf.c +++ b/libiberty/asprintf.c @@ -1,6 +1,6 @@ /* Like sprintf but provides a pointer to malloc'd storage, which must be freed by the caller. - Copyright (C) 1997-2019 Free Software Foundation, Inc. + Copyright (C) 1997-2020 Free Software Foundation, Inc. Contributed by Cygnus Solutions. This file is part of the libiberty library. diff --git a/libiberty/choose-temp.c b/libiberty/choose-temp.c index 72c1b710bd..49a2faaa51 100644 --- a/libiberty/choose-temp.c +++ b/libiberty/choose-temp.c @@ -1,5 +1,5 @@ /* Utility to pick a temporary filename prefix. - Copyright (C) 1996-2019 Free Software Foundation, Inc. + Copyright (C) 1996-2020 Free Software Foundation, Inc. This file is part of the libiberty library. Libiberty is free software; you can redistribute it and/or diff --git a/libiberty/clock.c b/libiberty/clock.c index a3730714bd..0de74657d0 100644 --- a/libiberty/clock.c +++ b/libiberty/clock.c @@ -1,5 +1,5 @@ /* ANSI-compatible clock function. - Copyright (C) 1994-2019 Free Software Foundation, Inc. + Copyright (C) 1994-2020 Free Software Foundation, Inc. This file is part of the libiberty library. This library is free software; you can redistribute it and/or modify it under the diff --git
1052 lines
30 KiB
C
1052 lines
30 KiB
C
/* Getopt for GNU.
|
||
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 drepper@gnu.org
|
||
before changing it!
|
||
|
||
Copyright (C) 1987-2020 Free Software Foundation, Inc.
|
||
|
||
NOTE: This source is derived from an old version taken from the GNU C
|
||
Library (glibc).
|
||
|
||
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,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
GNU General Public License for more details.
|
||
|
||
You should have received a copy of the GNU General Public License
|
||
along with this program; if not, write to the Free Software
|
||
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
|
||
USA. */
|
||
|
||
/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
|
||
Ditto for AIX 3.2 and <stdlib.h>. */
|
||
#ifndef _NO_PROTO
|
||
# define _NO_PROTO
|
||
#endif
|
||
|
||
#ifdef HAVE_CONFIG_H
|
||
# 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 "ansidecl.h"
|
||
#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__
|
||
/* Don't include stdlib.h for non-GNU C libraries because some of them
|
||
contain conflicting prototypes for getopt. */
|
||
# include <stdlib.h>
|
||
# include <unistd.h>
|
||
#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. */
|
||
# if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
|
||
# 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'
|
||
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,
|
||
the argument value is returned here.
|
||
Also, when `ordering' is RETURN_IN_ORDER,
|
||
each non-option ARGV-element is returned here. */
|
||
|
||
char *optarg = NULL;
|
||
|
||
/* Index in ARGV of the next element to be scanned.
|
||
This is used for communication to and from the caller
|
||
and for communication between successive calls to `getopt'.
|
||
|
||
On entry to `getopt', zero means this is the first call; initialize.
|
||
|
||
When `getopt' returns -1, this is the index of the first of the
|
||
non-option elements that the caller should itself scan.
|
||
|
||
Otherwise, `optind' communicates from one call to the next
|
||
how much of ARGV has been scanned so far. */
|
||
|
||
/* 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 = 0;
|
||
|
||
/* 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. */
|
||
|
||
int opterr = 1;
|
||
|
||
/* Set to an option character which was unrecognized.
|
||
This must be initialized on some systems to avoid linking in the
|
||
system's own getopt implementation. */
|
||
|
||
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
|
||
# if HAVE_STRINGS_H
|
||
# include <strings.h>
|
||
# endif
|
||
# endif
|
||
|
||
/* Avoid depending on library functions or files
|
||
whose names are inconsistent. */
|
||
|
||
#if HAVE_STDLIB_H && HAVE_DECL_GETENV
|
||
# include <stdlib.h>
|
||
#elif !defined(getenv)
|
||
# ifdef __cplusplus
|
||
extern "C" {
|
||
# endif /* __cplusplus */
|
||
extern char *getenv (const char *);
|
||
# ifdef __cplusplus
|
||
}
|
||
# endif /* __cplusplus */
|
||
#endif
|
||
|
||
static char *
|
||
my_index (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
|
||
/* 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.
|
||
One subsequence is elements [first_nonopt,last_nonopt)
|
||
which contains all the non-options that have been skipped so far.
|
||
The other is elements [last_nonopt,optind), which contains all
|
||
the options processed since those non-options were skipped.
|
||
|
||
`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 (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.
|
||
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. */
|
||
|
||
#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 = (char *) 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. */
|
||
|
||
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 (int argc ATTRIBUTE_UNUSED,
|
||
char *const *argv ATTRIBUTE_UNUSED,
|
||
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
|
||
given in OPTSTRING.
|
||
|
||
If an element of ARGV starts with '-', and is not exactly "-" or "--",
|
||
then it is an option element. The characters of this element
|
||
(aside from the initial '-') are option characters. If `getopt'
|
||
is called repeatedly, it returns successively each of the option characters
|
||
from each of the option elements.
|
||
|
||
If `getopt' finds another option character, it returns that character,
|
||
updating `optind' and `nextchar' so that the next call to `getopt' can
|
||
resume the scan with the following option character or ARGV-element.
|
||
|
||
If there are no more option characters, `getopt' returns -1.
|
||
Then `optind' is the index in ARGV of the first ARGV-element
|
||
that is not an option. (The ARGV-elements have been permuted
|
||
so that those that are not options now come last.)
|
||
|
||
OPTSTRING is a string containing the legitimate option characters.
|
||
If an option character is seen that is not listed in OPTSTRING,
|
||
return '?' after printing an error message. If you set `opterr' to
|
||
zero, the error message is suppressed but we still return '?'.
|
||
|
||
If a char in OPTSTRING is followed by a colon, that means it wants an arg,
|
||
so the following text in the same ARGV-element, or the text of the following
|
||
ARGV-element, is returned in `optarg'. Two colons mean an option that
|
||
wants an optional arg; if there is text in the current ARGV-element,
|
||
it is returned in `optarg', otherwise `optarg' is set to zero.
|
||
|
||
If OPTSTRING starts with `-' or `+', it requests different methods of
|
||
handling the non-option ARGV-elements.
|
||
See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
|
||
|
||
Long-named options begin with `--' instead of `-'.
|
||
Their names may be abbreviated as long as the abbreviation is unique
|
||
or is an exact match for some defined option. If they have an
|
||
argument, it follows the option name in the same ARGV-element, separated
|
||
from the option name by a `=', or else the in next ARGV-element.
|
||
When `getopt' finds a long-named option, it returns 0 if that option's
|
||
`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.
|
||
|
||
LONGIND returns the index in LONGOPT of the long-named option found.
|
||
It is only valid when a long-named option has been found by the most
|
||
recent call.
|
||
|
||
If LONG_ONLY is nonzero, '-' as well as '--' can introduce
|
||
long-named options. */
|
||
|
||
int
|
||
_getopt_internal (int argc, char *const *argv, const char *optstring,
|
||
const struct option *longopts,
|
||
int *longind, int long_only)
|
||
{
|
||
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.
|
||
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')
|
||
{
|
||
/* 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.
|
||
Skip it like a null option,
|
||
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;
|
||
}
|
||
|
||
/* 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. */
|
||
|
||
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. */
|
||
|
||
/* 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
|
||
&& (argv[optind][1] == '-'
|
||
|| (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1])))))
|
||
{
|
||
char *nameend;
|
||
const struct option *p;
|
||
const struct option *pfound = NULL;
|
||
int exact = 0;
|
||
int ambig = 0;
|
||
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. */
|
||
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 `%s' is ambiguous\n"),
|
||
argv[0], argv[optind]);
|
||
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 (opterr)
|
||
{
|
||
if (argv[optind - 1][1] == '-')
|
||
/* --option */
|
||
fprintf (stderr,
|
||
_("%s: option `--%s' doesn't allow an argument\n"),
|
||
argv[0], pfound->name);
|
||
else
|
||
/* +option or -option */
|
||
fprintf (stderr,
|
||
_("%s: option `%c%s' doesn't allow an argument\n"),
|
||
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);
|
||
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[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 (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 = '?';
|
||
}
|
||
else
|
||
/* We already incremented `optind' once;
|
||
increment it again when taking next ARGV-elt as argument. */
|
||
optarg = argv[optind++];
|
||
nextchar = NULL;
|
||
}
|
||
}
|
||
return c;
|
||
}
|
||
}
|
||
|
||
int
|
||
getopt (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
|
||
|
||
/* Compile with -DTEST to make an executable for use in testing
|
||
the above definition of `getopt'. */
|
||
|
||
int
|
||
main (int argc, char **argv)
|
||
{
|
||
int c;
|
||
int digit_optind = 0;
|
||
|
||
while (1)
|
||
{
|
||
int this_option_optind = optind ? optind : 1;
|
||
|
||
c = getopt (argc, argv, "abc:d:0123456789");
|
||
if (c == -1)
|
||
break;
|
||
|
||
switch (c)
|
||
{
|
||
case '0':
|
||
case '1':
|
||
case '2':
|
||
case '3':
|
||
case '4':
|
||
case '5':
|
||
case '6':
|
||
case '7':
|
||
case '8':
|
||
case '9':
|
||
if (digit_optind != 0 && digit_optind != this_option_optind)
|
||
printf ("digits occur in two different argv-elements.\n");
|
||
digit_optind = this_option_optind;
|
||
printf ("option %c\n", c);
|
||
break;
|
||
|
||
case 'a':
|
||
printf ("option a\n");
|
||
break;
|
||
|
||
case 'b':
|
||
printf ("option b\n");
|
||
break;
|
||
|
||
case 'c':
|
||
printf ("option c with value `%s'\n", optarg);
|
||
break;
|
||
|
||
case '?':
|
||
break;
|
||
|
||
default:
|
||
printf ("?? getopt returned character code 0%o ??\n", c);
|
||
}
|
||
}
|
||
|
||
if (optind < argc)
|
||
{
|
||
printf ("non-option ARGV-elements: ");
|
||
while (optind < argc)
|
||
printf ("%s ", argv[optind++]);
|
||
printf ("\n");
|
||
}
|
||
|
||
exit (0);
|
||
}
|
||
|
||
#endif /* TEST */
|