claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

make names more consistent

Browse Source
This commit is contained in:
Josh Coalson
2002-11-07 05:08:59 +00:00
parent b8f8a07684
commit d4dbadcc11
4 changed files with 191 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
include/share/getopt.h
View File

@@ -31,8 +31,8 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#ifndef FLAC__SHARE__GETOPT_H #ifndef SHARE__GETOPT_H
#define FLAC__SHARE__GETOPT_H #define SHARE__GETOPT_H
#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__) #if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
#define GETOPT_API #define GETOPT_API
@@ -59,60 +59,60 @@
extern "C" { extern "C" {
#endif #endif
/* For communication from `FLAC__share__getopt' to the caller. /* For communication from `share__getopt' to the caller.
When `FLAC__share__getopt' finds an option that takes an argument, When `share__getopt' finds an option that takes an argument,
the argument value is returned here. the argument value is returned here.
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. */
GETOPT_API extern char *FLAC__share__optarg; GETOPT_API extern char *share__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
and for communication between successive calls to `FLAC__share__getopt'. and for communication between successive calls to `share__getopt'.
On entry to `FLAC__share__getopt', zero means this is the first call; initialize. On entry to `share__getopt', zero means this is the first call; initialize.
When `FLAC__share__getopt' returns -1, this is the index of the first of the When `share__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, `FLAC__share__optind' communicates from one call to the next Otherwise, `share__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. */
GETOPT_API extern int FLAC__share__optind; GETOPT_API extern int share__optind;
/* Callers store zero here to inhibit the error message `FLAC__share__getopt' prints /* Callers store zero here to inhibit the error message `share__getopt' prints
for unrecognized options. */ for unrecognized options. */
GETOPT_API extern int FLAC__share__opterr; GETOPT_API extern int share__opterr;
/* Set to an option character which was unrecognized. */ /* Set to an option character which was unrecognized. */
GETOPT_API extern int FLAC__share__optopt; GETOPT_API extern int share__optopt;
/*[JEC] was:#ifndef __need_getopt */ /*[JEC] was:#ifndef __need_getopt */
/* Describe the long-named options requested by the application. /* Describe the long-named options requested by the application.
The LONG_OPTIONS argument to FLAC__share__getopt_long or FLAC__share__getopt_long_only is a vector The LONG_OPTIONS argument to share__getopt_long or share__getopt_long_only is a vector
of `struct FLAC__share__option' terminated by an element containing a name which is of `struct share__option' terminated by an element containing a name which is
zero. zero.
The field `has_arg' is: The field `has_arg' is:
FLAC__share__no_argument (or 0) if the option does not take an argument, share__no_argument (or 0) if the option does not take an argument,
FLAC__share__required_argument (or 1) if the option requires an argument, share__required_argument (or 1) if the option requires an argument,
FLAC__share__optional_argument (or 2) if the option takes an optional argument. share__optional_argument (or 2) if the option takes an optional argument.
If the field `flag' is not NULL, it points to a variable that is set If the field `flag' is not NULL, it points to a variable that is set
to the value given in the field `val' when the option is found, but to the value given in the field `val' when the option is found, but
left unchanged if the option is not found. left unchanged if the option is not found.
To have a long-named option do something other than set an `int' to To have a long-named option do something other than set an `int' to
a compiled-in constant, such as set a value from `FLAC__share__optarg', set the a compiled-in constant, such as set a value from `share__optarg', set the
option's `flag' field to zero and its `val' field to a nonzero option's `flag' field to zero and its `val' field to a nonzero
value (the equivalent single-letter option character, if there is value (the equivalent single-letter option character, if there is
one). For long options that have a zero `flag' field, `FLAC__share__getopt' one). For long options that have a zero `flag' field, `share__getopt'
returns the contents of the `val' field. */ returns the contents of the `val' field. */
struct FLAC__share__option struct share__option
{ {
# if defined __STDC__ && __STDC__ # if defined __STDC__ && __STDC__
const char *name; const char *name;
@@ -126,11 +126,11 @@ struct FLAC__share__option
int val; int val;
}; };
/* Names for the values of the `has_arg' field of `struct FLAC__share__option'. */ /* Names for the values of the `has_arg' field of `struct share__option'. */
# define FLAC__share__no_argument 0 # define share__no_argument 0
# define FLAC__share__required_argument 1 # define share__required_argument 1
# define FLAC__share__optional_argument 2 # define share__optional_argument 2
/*[JEC] was:#endif*/ /* need getopt */ /*[JEC] was:#endif*/ /* need getopt */
@@ -140,45 +140,45 @@ struct FLAC__share__option
Return the option character from OPTS just read. Return -1 when Return the option character from OPTS just read. Return -1 when
there are no more options. For unrecognized options, or options there are no more options. For unrecognized options, or options
missing arguments, `FLAC__share__optopt' is set to the option letter, and '?' is missing arguments, `share__optopt' is set to the option letter, and '?' is
returned. returned.
The OPTS string is a list of characters which are recognized option The OPTS string is a list of characters which are recognized option
letters, optionally followed by colons, specifying that that letter letters, optionally followed by colons, specifying that that letter
takes an argument, to be placed in `FLAC__share__optarg'. takes an argument, to be placed in `share__optarg'.
If a letter in OPTS is followed by two colons, its argument is If a letter in OPTS is followed by two colons, its argument is
optional. This behavior is specific to the GNU `FLAC__share__getopt'. optional. This behavior is specific to the GNU `share__getopt'.
The argument `--' causes premature termination of argument The argument `--' causes premature termination of argument
scanning, explicitly telling `FLAC__share__getopt' that there are no more scanning, explicitly telling `share__getopt' that there are no more
options. options.
If OPTS begins with `--', then non-option arguments are treated as If OPTS begins with `--', then non-option arguments are treated as
arguments to the option '\0'. This behavior is specific to the GNU arguments to the option '\0'. This behavior is specific to the GNU
`FLAC__share__getopt'. */ `share__getopt'. */
/*[JEC] was:#if defined __STDC__ && __STDC__*/ /*[JEC] was:#if defined __STDC__ && __STDC__*/
/*[JEC] was:# ifdef __GNU_LIBRARY__*/ /*[JEC] was:# ifdef __GNU_LIBRARY__*/
/* Many other libraries have conflicting prototypes for getopt, with /* Many other libraries have conflicting prototypes for getopt, with
differences in the consts, in stdlib.h. To avoid compilation differences in the consts, in stdlib.h. To avoid compilation
errors, only prototype getopt for the GNU C library. */ errors, only prototype getopt for the GNU C library. */
GETOPT_API extern int FLAC__share__getopt (int __argc, char *const *__argv, const char *__shortopts); GETOPT_API extern int share__getopt (int __argc, char *const *__argv, const char *__shortopts);
/*[JEC] was:# else*/ /* not __GNU_LIBRARY__ */ /*[JEC] was:# else*/ /* not __GNU_LIBRARY__ */
/*[JEC] was:extern int getopt ();*/ /*[JEC] was:extern int getopt ();*/
/*[JEC] was:# endif*/ /* __GNU_LIBRARY__ */ /*[JEC] was:# endif*/ /* __GNU_LIBRARY__ */
/*[JEC] was:# ifndef __need_getopt*/ /*[JEC] was:# ifndef __need_getopt*/
GETOPT_API extern int FLAC__share__getopt_long (int __argc, char *const *__argv, const char *__shortopts, GETOPT_API extern int share__getopt_long (int __argc, char *const *__argv, const char *__shortopts,
const struct FLAC__share__option *__longopts, int *__longind); const struct share__option *__longopts, int *__longind);
GETOPT_API extern int FLAC__share__getopt_long_only (int __argc, char *const *__argv, GETOPT_API extern int share__getopt_long_only (int __argc, char *const *__argv,
const char *__shortopts, const char *__shortopts,
const struct FLAC__share__option *__longopts, int *__longind); const struct share__option *__longopts, int *__longind);
/* Internal only. Users should not call this directly. */ /* Internal only. Users should not call this directly. */
GETOPT_API extern int FLAC__share___getopt_internal (int __argc, char *const *__argv, GETOPT_API extern int share___getopt_internal (int __argc, char *const *__argv,
const char *__shortopts, const char *__shortopts,
const struct FLAC__share__option *__longopts, int *__longind, const struct share__option *__longopts, int *__longind,
int __long_only); int __long_only);
/*[JEC] was:# endif*/ /*[JEC] was:# endif*/
/*[JEC] was:#else*/ /* not __STDC__ */ /*[JEC] was:#else*/ /* not __STDC__ */

4
include/share/utf8.h
View File

@@ -1,5 +1,5 @@
#ifndef FLAC__SHARE__UTF8_H #ifndef SHARE__UTF8_H
#define FLAC__SHARE__UTF8_H #define SHARE__UTF8_H
#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__) #if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
#define UTF8_API #define UTF8_API

270
src/share/getopt/getopt.c
View File

@@ -102,11 +102,11 @@
# endif # endif
#endif #endif
/* This version of `FLAC__share__getopt' appears to the caller like standard Unix `getopt' /* This version of `share__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.
As `FLAC__share__getopt' works, it permutes the elements of ARGV so that, As `share__getopt' works, it permutes the elements of ARGV so that,
when it is done, all the options precede everything else. Thus when it is done, all the options precede everything else. Thus
all application programs are extended to handle flexible argument order. all application programs are extended to handle flexible argument order.
@@ -119,34 +119,34 @@
#include "share/getopt.h" #include "share/getopt.h"
/*[JEC] was:#include "getopt.h"*/ /*[JEC] was:#include "getopt.h"*/
/* For communication from `FLAC__share__getopt' to the caller. /* For communication from `share__getopt' to the caller.
When `FLAC__share__getopt' finds an option that takes an argument, When `share__getopt' finds an option that takes an argument,
the argument value is returned here. the argument value is returned here.
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. */
GETOPT_API char *FLAC__share__optarg; GETOPT_API char *share__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
and for communication between successive calls to `FLAC__share__getopt'. and for communication between successive calls to `share__getopt'.
On entry to `FLAC__share__getopt', zero means this is the first call; initialize. On entry to `share__getopt', zero means this is the first call; initialize.
When `FLAC__share__getopt' returns -1, this is the index of the first of the When `share__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, `FLAC__share__optind' communicates from one call to the next Otherwise, `share__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. */
/* 1003.2 says this must be 1 before any call. */ /* 1003.2 says this must be 1 before any call. */
GETOPT_API int FLAC__share__optind = 1; GETOPT_API int share__optind = 1;
/* Formerly, initialization of getopt depended on FLAC__share__optind==0, which /* Formerly, initialization of getopt depended on share__optind==0, which
causes problems with re-calling getopt as programs generally don't causes problems with re-calling getopt as programs generally don't
know that. */ know that. */
int FLAC__share____getopt_initialized; int share____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.
@@ -160,13 +160,13 @@ static char *nextchar;
/* Callers store zero here to inhibit the error message /* Callers store zero here to inhibit the error message
for unrecognized options. */ for unrecognized options. */
GETOPT_API int FLAC__share__opterr = 1; GETOPT_API int share__opterr = 1;
/* Set to an option character which was unrecognized. /* Set to an option character which was unrecognized.
This must be initialized on some systems to avoid linking in the This must be initialized on some systems to avoid linking in the
system's own getopt implementation. */ system's own getopt implementation. */
GETOPT_API int FLAC__share__optopt = '?'; GETOPT_API int share__optopt = '?';
/* Describe how to deal with options that follow non-option ARGV-elements. /* Describe how to deal with options that follow non-option ARGV-elements.
@@ -195,7 +195,7 @@ GETOPT_API int FLAC__share__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 `FLAC__share__getopt' to return -1 with `FLAC__share__optind' != ARGC. */ `--' can cause `share__getopt' to return -1 with `share__optind' != ARGC. */
static enum static enum
{ {
@@ -303,7 +303,7 @@ text_set_element (__libc_subinit, store_args_and_env);
/* 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.
The other is elements [last_nonopt,FLAC__share__optind), which contains all The other is elements [last_nonopt,share__optind), which contains all
the options processed since those non-options were skipped. the options processed since those non-options were skipped.
`first_nonopt' and `last_nonopt' are relocated so that they describe `first_nonopt' and `last_nonopt' are relocated so that they describe
@@ -319,7 +319,7 @@ exchange (argv)
{ {
int bottom = first_nonopt; int bottom = first_nonopt;
int middle = last_nonopt; int middle = last_nonopt;
int top = FLAC__share__optind; int top = share__optind;
char *tem; char *tem;
/* Exchange the shorter segment with the far end of the longer segment. /* Exchange the shorter segment with the far end of the longer segment.
@@ -389,17 +389,17 @@ exchange (argv)
/* Update records for the slots the non-options now occupy. */ /* Update records for the slots the non-options now occupy. */
first_nonopt += (FLAC__share__optind - last_nonopt); first_nonopt += (share__optind - last_nonopt);
last_nonopt = FLAC__share__optind; last_nonopt = share__optind;
} }
/* Initialize the internal data when the first call is made. */ /* Initialize the internal data when the first call is made. */
#if defined __STDC__ && __STDC__ #if defined __STDC__ && __STDC__
static const char *FLAC__share___getopt_initialize (int, char *const *, const char *); static const char *share___getopt_initialize (int, char *const *, const char *);
#endif #endif
static const char * static const char *
FLAC__share___getopt_initialize (argc, argv, optstring) share___getopt_initialize (argc, argv, optstring)
int argc; int argc;
char *const *argv; char *const *argv;
const char *optstring; const char *optstring;
@@ -408,7 +408,7 @@ FLAC__share___getopt_initialize (argc, argv, optstring)
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 = FLAC__share__optind; first_nonopt = last_nonopt = share__optind;
nextchar = NULL; nextchar = NULL;
@@ -471,29 +471,29 @@ FLAC__share___getopt_initialize (argc, argv, optstring)
If an element of ARGV starts with '-', and is not exactly "-" or "--", If an element of ARGV starts with '-', and is not exactly "-" or "--",
then it is an option element. The characters of this element then it is an option element. The characters of this element
(aside from the initial '-') are option characters. If `FLAC__share__getopt' (aside from the initial '-') are option characters. If `share__getopt'
is called repeatedly, it returns successively each of the option characters is called repeatedly, it returns successively each of the option characters
from each of the option elements. from each of the option elements.
If `FLAC__share__getopt' finds another option character, it returns that character, If `share__getopt' finds another option character, it returns that character,
updating `FLAC__share__optind' and `nextchar' so that the next call to `FLAC__share__getopt' can updating `share__optind' and `nextchar' so that the next call to `share__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, `FLAC__share__getopt' returns -1. If there are no more option characters, `share__getopt' returns -1.
Then `FLAC__share__optind' is the index in ARGV of the first ARGV-element Then `share__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.)
OPTSTRING is a string containing the legitimate option characters. OPTSTRING is a string containing the legitimate option characters.
If an option character is seen that is not listed in OPTSTRING, If an option character is seen that is not listed in OPTSTRING,
return '?' after printing an error message. If you set `FLAC__share__opterr' to return '?' after printing an error message. If you set `share__opterr' to
zero, the error message is suppressed but we still return '?'. 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, 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 so the following text in the same ARGV-element, or the text of the following
ARGV-element, is returned in `FLAC__share__optarg'. Two colons mean an option that ARGV-element, is returned in `share__optarg'. Two colons mean an option that
wants an optional arg; if there is text in the current ARGV-element, wants an optional arg; if there is text in the current ARGV-element,
it is returned in `FLAC__share__optarg', otherwise `FLAC__share__optarg' is set to zero. it is returned in `share__optarg', otherwise `share__optarg' is set to zero.
If OPTSTRING starts with `-' or `+', it requests different methods of If OPTSTRING starts with `-' or `+', it requests different methods of
handling the non-option ARGV-elements. handling the non-option ARGV-elements.
@@ -504,7 +504,7 @@ FLAC__share___getopt_initialize (argc, argv, optstring)
or is an exact match for some defined option. If they have an 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 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. from the option name by a `=', or else the in next ARGV-element.
When `FLAC__share__getopt' finds a long-named option, it returns 0 if that option's When `share__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 `flag' field is nonzero, the value of the option's `val' field
if the `flag' field is zero. if the `flag' field is zero.
@@ -512,7 +512,7 @@ FLAC__share___getopt_initialize (argc, argv, optstring)
But we pretend they're const in the prototype to be compatible But we pretend they're const in the prototype to be compatible
with other systems. with other systems.
LONGOPTS is a vector of `struct FLAC__share__option' terminated by an LONGOPTS is a vector of `struct share__option' terminated by an
element containing a name which is zero. element containing a name which is zero.
LONGIND returns the index in LONGOPT of the long-named option found. LONGIND returns the index in LONGOPT of the long-named option found.
@@ -523,34 +523,34 @@ FLAC__share___getopt_initialize (argc, argv, optstring)
long-named options. */ long-named options. */
GETOPT_API int GETOPT_API int
FLAC__share___getopt_internal (argc, argv, optstring, longopts, longind, long_only) share___getopt_internal (argc, argv, optstring, longopts, longind, long_only)
int argc; int argc;
char *const *argv; char *const *argv;
const char *optstring; const char *optstring;
const struct FLAC__share__option *longopts; const struct share__option *longopts;
int *longind; int *longind;
int long_only; int long_only;
{ {
FLAC__share__optarg = NULL; share__optarg = NULL;
if (FLAC__share__optind == 0 || !FLAC__share____getopt_initialized) if (share__optind == 0 || !share____getopt_initialized)
{ {
if (FLAC__share__optind == 0) if (share__optind == 0)
FLAC__share__optind = 1; /* Don't scan ARGV[0], the program name. */ share__optind = 1; /* Don't scan ARGV[0], the program name. */
optstring = FLAC__share___getopt_initialize (argc, argv, optstring); optstring = share___getopt_initialize (argc, argv, optstring);
FLAC__share____getopt_initialized = 1; share____getopt_initialized = 1;
} }
/* Test whether ARGV[FLAC__share__optind] points to a non-option argument. /* Test whether ARGV[share__optind] points to a non-option argument.
Either it does not have option syntax, or there is an environment flag 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 from the shell indicating it is not an option. The later information
is only used when the used in the GNU libc. */ is only used when the used in the GNU libc. */
#ifdef _LIBC #ifdef _LIBC
# define NONOPTION_P (argv[FLAC__share__optind][0] != '-' || argv[FLAC__share__optind][1] == '\0' \ # define NONOPTION_P (argv[share__optind][0] != '-' || argv[share__optind][1] == '\0' \
|| (FLAC__share__optind < nonoption_flags_len \ || (share__optind < nonoption_flags_len \
&& __getopt_nonoption_flags[FLAC__share__optind] == '1')) && __getopt_nonoption_flags[share__optind] == '1'))
#else #else
# define NONOPTION_P (argv[FLAC__share__optind][0] != '-' || argv[FLAC__share__optind][1] == '\0') # define NONOPTION_P (argv[share__optind][0] != '-' || argv[share__optind][1] == '\0')
#endif #endif
if (nextchar == NULL || *nextchar == '\0') if (nextchar == NULL || *nextchar == '\0')
@@ -559,27 +559,27 @@ FLAC__share___getopt_internal (argc, argv, optstring, longopts, longind, long_on
/* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
moved back by the user (who may also have changed the arguments). */ moved back by the user (who may also have changed the arguments). */
if (last_nonopt > FLAC__share__optind) if (last_nonopt > share__optind)
last_nonopt = FLAC__share__optind; last_nonopt = share__optind;
if (first_nonopt > FLAC__share__optind) if (first_nonopt > share__optind)
first_nonopt = FLAC__share__optind; first_nonopt = share__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,
exchange them so that the options come first. */ exchange them so that the options come first. */
if (first_nonopt != last_nonopt && last_nonopt != FLAC__share__optind) if (first_nonopt != last_nonopt && last_nonopt != share__optind)
exchange ((char **) argv); exchange ((char **) argv);
else if (last_nonopt != FLAC__share__optind) else if (last_nonopt != share__optind)
first_nonopt = FLAC__share__optind; first_nonopt = share__optind;
/* 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 (FLAC__share__optind < argc && NONOPTION_P) while (share__optind < argc && NONOPTION_P)
FLAC__share__optind++; share__optind++;
last_nonopt = FLAC__share__optind; last_nonopt = share__optind;
} }
/* The special ARGV-element `--' means premature end of options. /* The special ARGV-element `--' means premature end of options.
@@ -587,28 +587,28 @@ FLAC__share___getopt_internal (argc, argv, optstring, longopts, longind, long_on
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. */
if (FLAC__share__optind != argc && !strcmp (argv[FLAC__share__optind], "--")) if (share__optind != argc && !strcmp (argv[share__optind], "--"))
{ {
FLAC__share__optind++; share__optind++;
if (first_nonopt != last_nonopt && last_nonopt != FLAC__share__optind) if (first_nonopt != last_nonopt && last_nonopt != share__optind)
exchange ((char **) argv); exchange ((char **) argv);
else if (first_nonopt == last_nonopt) else if (first_nonopt == last_nonopt)
first_nonopt = FLAC__share__optind; first_nonopt = share__optind;
last_nonopt = argc; last_nonopt = argc;
FLAC__share__optind = argc; share__optind = argc;
} }
/* If we have done all the ARGV-elements, stop the scan /* If we have done all the ARGV-elements, stop the scan
and back over any non-options that we skipped and permuted. */ and back over any non-options that we skipped and permuted. */
if (FLAC__share__optind == argc) if (share__optind == argc)
{ {
/* Set the next-arg-index to point at the non-options /* Set the next-arg-index to point at the non-options
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)
FLAC__share__optind = first_nonopt; share__optind = first_nonopt;
return -1; return -1;
} }
@@ -619,15 +619,15 @@ FLAC__share___getopt_internal (argc, argv, optstring, longopts, longind, long_on
{ {
if (ordering == REQUIRE_ORDER) if (ordering == REQUIRE_ORDER)
return -1; return -1;
FLAC__share__optarg = argv[FLAC__share__optind++]; share__optarg = argv[share__optind++];
return 1; return 1;
} }
/* We have found another option-ARGV-element. /* We have found another option-ARGV-element.
Skip the initial punctuation. */ Skip the initial punctuation. */
nextchar = (argv[FLAC__share__optind] + 1 nextchar = (argv[share__optind] + 1
+ (longopts != NULL && argv[FLAC__share__optind][1] == '-')); + (longopts != NULL && argv[share__optind][1] == '-'));
} }
/* Decode the current option-ARGV-element. */ /* Decode the current option-ARGV-element. */
@@ -646,12 +646,12 @@ FLAC__share___getopt_internal (argc, argv, optstring, longopts, longind, long_on
This distinction seems to be the most useful approach. */ This distinction seems to be the most useful approach. */
if (longopts != NULL if (longopts != NULL
&& (argv[FLAC__share__optind][1] == '-' && (argv[share__optind][1] == '-'
|| (long_only && (argv[FLAC__share__optind][2] || !my_index (optstring, argv[FLAC__share__optind][1]))))) || (long_only && (argv[share__optind][2] || !my_index (optstring, argv[share__optind][1])))))
{ {
char *nameend; char *nameend;
const struct FLAC__share__option *p; const struct share__option *p;
const struct FLAC__share__option *pfound = NULL; const struct share__option *pfound = NULL;
int exact = 0; int exact = 0;
int ambig = 0; int ambig = 0;
int indfound = -1; int indfound = -1;
@@ -687,30 +687,30 @@ FLAC__share___getopt_internal (argc, argv, optstring, longopts, longind, long_on
if (ambig && !exact) if (ambig && !exact)
{ {
if (FLAC__share__opterr) if (share__opterr)
fprintf (stderr, _("%s: option `%s' is ambiguous\n"), fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
argv[0], argv[FLAC__share__optind]); argv[0], argv[share__optind]);
nextchar += strlen (nextchar); nextchar += strlen (nextchar);
FLAC__share__optind++; share__optind++;
FLAC__share__optopt = 0; share__optopt = 0;
return '?'; return '?';
} }
if (pfound != NULL) if (pfound != NULL)
{ {
option_index = indfound; option_index = indfound;
FLAC__share__optind++; share__optind++;
if (*nameend) 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)
FLAC__share__optarg = nameend + 1; share__optarg = nameend + 1;
else else
{ {
if (FLAC__share__opterr) if (share__opterr)
{ {
if (argv[FLAC__share__optind - 1][1] == '-') if (argv[share__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"),
@@ -719,27 +719,27 @@ FLAC__share___getopt_internal (argc, argv, optstring, longopts, longind, long_on
/* +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[FLAC__share__optind - 1][0], pfound->name); argv[0], argv[share__optind - 1][0], pfound->name);
} }
nextchar += strlen (nextchar); nextchar += strlen (nextchar);
FLAC__share__optopt = pfound->val; share__optopt = pfound->val;
return '?'; return '?';
} }
} }
else if (pfound->has_arg == 1) else if (pfound->has_arg == 1)
{ {
if (FLAC__share__optind < argc) if (share__optind < argc)
FLAC__share__optarg = argv[FLAC__share__optind++]; share__optarg = argv[share__optind++];
else else
{ {
if (FLAC__share__opterr) if (share__opterr)
fprintf (stderr, fprintf (stderr,
_("%s: option `%s' requires an argument\n"), _("%s: option `%s' requires an argument\n"),
argv[0], argv[FLAC__share__optind - 1]); argv[0], argv[share__optind - 1]);
nextchar += strlen (nextchar); nextchar += strlen (nextchar);
FLAC__share__optopt = pfound->val; share__optopt = pfound->val;
return optstring[0] == ':' ? ':' : '?'; return optstring[0] == ':' ? ':' : '?';
} }
} }
@@ -754,27 +754,27 @@ FLAC__share___getopt_internal (argc, argv, optstring, longopts, longind, long_on
return pfound->val; return pfound->val;
} }
/* Can't find it as a long option. If this is not FLAC__share__getopt_long_only, /* Can't find it as a long option. If this is not share__getopt_long_only,
or the option starts with '--' or is not a valid short or the option starts with '--' or is not a valid short
option, then it's an error. option, then it's an error.
Otherwise interpret it as a short option. */ Otherwise interpret it as a short option. */
if (!long_only || argv[FLAC__share__optind][1] == '-' if (!long_only || argv[share__optind][1] == '-'
|| my_index (optstring, *nextchar) == NULL) || my_index (optstring, *nextchar) == NULL)
{ {
if (FLAC__share__opterr) if (share__opterr)
{ {
if (argv[FLAC__share__optind][1] == '-') if (argv[share__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[FLAC__share__optind][0], nextchar); argv[0], argv[share__optind][0], nextchar);
} }
nextchar = (char *) ""; nextchar = (char *) "";
FLAC__share__optind++; share__optind++;
FLAC__share__optopt = 0; share__optopt = 0;
return '?'; return '?';
} }
} }
@@ -785,13 +785,13 @@ FLAC__share___getopt_internal (argc, argv, optstring, longopts, longind, long_on
char c = *nextchar++; char c = *nextchar++;
char *temp = my_index (optstring, c); char *temp = my_index (optstring, c);
/* Increment `FLAC__share__optind' when we start to process its last character. */ /* Increment `share__optind' when we start to process its last character. */
if (*nextchar == '\0') if (*nextchar == '\0')
++FLAC__share__optind; ++share__optind;
if (temp == NULL || c == ':') if (temp == NULL || c == ':')
{ {
if (FLAC__share__opterr) if (share__opterr)
{ {
if (posixly_correct) if (posixly_correct)
/* 1003.2 specifies the format of this message. */ /* 1003.2 specifies the format of this message. */
@@ -801,15 +801,15 @@ FLAC__share___getopt_internal (argc, argv, optstring, longopts, longind, long_on
fprintf (stderr, _("%s: invalid option -- %c\n"), fprintf (stderr, _("%s: invalid option -- %c\n"),
argv[0], c); argv[0], c);
} }
FLAC__share__optopt = c; share__optopt = c;
return '?'; return '?';
} }
/* Convenience. Treat POSIX -W foo same as long option --foo */ /* Convenience. Treat POSIX -W foo same as long option --foo */
if (temp[0] == 'W' && temp[1] == ';') if (temp[0] == 'W' && temp[1] == ';')
{ {
char *nameend; char *nameend;
const struct FLAC__share__option *p; const struct share__option *p;
const struct FLAC__share__option *pfound = NULL; const struct share__option *pfound = NULL;
int exact = 0; int exact = 0;
int ambig = 0; int ambig = 0;
int indfound = 0; int indfound = 0;
@@ -818,20 +818,20 @@ FLAC__share___getopt_internal (argc, argv, optstring, longopts, longind, long_on
/* This is an option that requires an argument. */ /* This is an option that requires an argument. */
if (*nextchar != '\0') if (*nextchar != '\0')
{ {
FLAC__share__optarg = nextchar; share__optarg = nextchar;
/* If we end this ARGV-element by taking the rest as an arg, /* If we end this ARGV-element by taking the rest as an arg,
we must advance to the next element now. */ we must advance to the next element now. */
FLAC__share__optind++; share__optind++;
} }
else if (FLAC__share__optind == argc) else if (share__optind == argc)
{ {
if (FLAC__share__opterr) if (share__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, _("%s: option requires an argument -- %c\n"),
argv[0], c); argv[0], c);
} }
FLAC__share__optopt = c; share__optopt = c;
if (optstring[0] == ':') if (optstring[0] == ':')
c = ':'; c = ':';
else else
@@ -839,14 +839,14 @@ FLAC__share___getopt_internal (argc, argv, optstring, longopts, longind, long_on
return c; return c;
} }
else else
/* We already incremented `FLAC__share__optind' once; /* We already incremented `share__optind' once;
increment it again when taking next ARGV-elt as argument. */ increment it again when taking next ARGV-elt as argument. */
FLAC__share__optarg = argv[FLAC__share__optind++]; share__optarg = argv[share__optind++];
/* FLAC__share__optarg is now the argument, see if it's in the /* share__optarg is now the argument, see if it's in the
table of longopts. */ table of longopts. */
for (nextchar = nameend = FLAC__share__optarg; *nameend && *nameend != '='; nameend++) for (nextchar = nameend = share__optarg; *nameend && *nameend != '='; nameend++)
/* Do nothing. */ ; /* Do nothing. */ ;
/* Test all long options for either exact match /* Test all long options for either exact match
@@ -874,11 +874,11 @@ FLAC__share___getopt_internal (argc, argv, optstring, longopts, longind, long_on
} }
if (ambig && !exact) if (ambig && !exact)
{ {
if (FLAC__share__opterr) if (share__opterr)
fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"), fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
argv[0], argv[FLAC__share__optind]); argv[0], argv[share__optind]);
nextchar += strlen (nextchar); nextchar += strlen (nextchar);
FLAC__share__optind++; share__optind++;
return '?'; return '?';
} }
if (pfound != NULL) if (pfound != NULL)
@@ -889,10 +889,10 @@ FLAC__share___getopt_internal (argc, argv, optstring, longopts, longind, long_on
/* 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)
FLAC__share__optarg = nameend + 1; share__optarg = nameend + 1;
else else
{ {
if (FLAC__share__opterr) if (share__opterr)
fprintf (stderr, _("\ fprintf (stderr, _("\
%s: option `-W %s' doesn't allow an argument\n"), %s: option `-W %s' doesn't allow an argument\n"),
argv[0], pfound->name); argv[0], pfound->name);
@@ -903,14 +903,14 @@ FLAC__share___getopt_internal (argc, argv, optstring, longopts, longind, long_on
} }
else if (pfound->has_arg == 1) else if (pfound->has_arg == 1)
{ {
if (FLAC__share__optind < argc) if (share__optind < argc)
FLAC__share__optarg = argv[FLAC__share__optind++]; share__optarg = argv[share__optind++];
else else
{ {
if (FLAC__share__opterr) if (share__opterr)
fprintf (stderr, fprintf (stderr,
_("%s: option `%s' requires an argument\n"), _("%s: option `%s' requires an argument\n"),
argv[0], argv[FLAC__share__optind - 1]); argv[0], argv[share__optind - 1]);
nextchar += strlen (nextchar); nextchar += strlen (nextchar);
return optstring[0] == ':' ? ':' : '?'; return optstring[0] == ':' ? ':' : '?';
} }
@@ -935,11 +935,11 @@ FLAC__share___getopt_internal (argc, argv, optstring, longopts, longind, long_on
/* This is an option that accepts an argument optionally. */ /* This is an option that accepts an argument optionally. */
if (*nextchar != '\0') if (*nextchar != '\0')
{ {
FLAC__share__optarg = nextchar; share__optarg = nextchar;
FLAC__share__optind++; share__optind++;
} }
else else
FLAC__share__optarg = NULL; share__optarg = NULL;
nextchar = NULL; nextchar = NULL;
} }
else else
@@ -947,30 +947,30 @@ FLAC__share___getopt_internal (argc, argv, optstring, longopts, longind, long_on
/* This is an option that requires an argument. */ /* This is an option that requires an argument. */
if (*nextchar != '\0') if (*nextchar != '\0')
{ {
FLAC__share__optarg = nextchar; share__optarg = nextchar;
/* If we end this ARGV-element by taking the rest as an arg, /* If we end this ARGV-element by taking the rest as an arg,
we must advance to the next element now. */ we must advance to the next element now. */
FLAC__share__optind++; share__optind++;
} }
else if (FLAC__share__optind == argc) else if (share__optind == argc)
{ {
if (FLAC__share__opterr) if (share__opterr)
{ {
/* 1003.2 specifies the format of this message. */ /* 1003.2 specifies the format of this message. */
fprintf (stderr, fprintf (stderr,
_("%s: option requires an argument -- %c\n"), _("%s: option requires an argument -- %c\n"),
argv[0], c); argv[0], c);
} }
FLAC__share__optopt = c; share__optopt = c;
if (optstring[0] == ':') if (optstring[0] == ':')
c = ':'; c = ':';
else else
c = '?'; c = '?';
} }
else else
/* We already incremented `FLAC__share__optind' once; /* We already incremented `share__optind' once;
increment it again when taking next ARGV-elt as argument. */ increment it again when taking next ARGV-elt as argument. */
FLAC__share__optarg = argv[FLAC__share__optind++]; share__optarg = argv[share__optind++];
nextchar = NULL; nextchar = NULL;
} }
} }
@@ -979,13 +979,13 @@ FLAC__share___getopt_internal (argc, argv, optstring, longopts, longind, long_on
} }
GETOPT_API int GETOPT_API int
FLAC__share__getopt (argc, argv, optstring) share__getopt (argc, argv, optstring)
int argc; int argc;
char *const *argv; char *const *argv;
const char *optstring; const char *optstring;
{ {
return FLAC__share___getopt_internal (argc, argv, optstring, return share___getopt_internal (argc, argv, optstring,
(const struct FLAC__share__option *) 0, (const struct share__option *) 0,
(int *) 0, (int *) 0,
0); 0);
} }
@@ -995,7 +995,7 @@ FLAC__share__getopt (argc, argv, optstring)
#ifdef TEST #ifdef TEST
/* Compile with -DTEST to make an executable for use in testing /* Compile with -DTEST to make an executable for use in testing
the above definition of `FLAC__share__getopt'. */ the above definition of `share__getopt'. */
int int
main (argc, argv) main (argc, argv)
@@ -1007,9 +1007,9 @@ main (argc, argv)
while (1) while (1)
{ {
int this_option_optind = FLAC__share__optind ? FLAC__share__optind : 1; int this_option_optind = share__optind ? share__optind : 1;
c = FLAC__share__getopt (argc, argv, "abc:d:0123456789"); c = share__getopt (argc, argv, "abc:d:0123456789");
if (c == -1) if (c == -1)
break; break;
@@ -1040,7 +1040,7 @@ main (argc, argv)
break; break;
case 'c': case 'c':
printf ("option c with value `%s'\n", FLAC__share__optarg); printf ("option c with value `%s'\n", share__optarg);
break; break;
case '?': case '?':
@@ -1051,11 +1051,11 @@ main (argc, argv)
} }
} }
if (FLAC__share__optind < argc) if (share__optind < argc)
{ {
printf ("non-option ARGV-elements: "); printf ("non-option ARGV-elements: ");
while (FLAC__share__optind < argc) while (share__optind < argc)
printf ("%s ", argv[FLAC__share__optind++]); printf ("%s ", argv[share__optind++]);
printf ("\n"); printf ("\n");
} }

34
src/share/getopt/getopt1.c
View File

@@ -80,30 +80,30 @@
#endif #endif
GETOPT_API int GETOPT_API int
FLAC__share__getopt_long (argc, argv, options, long_options, opt_index) share__getopt_long (argc, argv, options, long_options, opt_index)
int argc; int argc;
char *const *argv; char *const *argv;
const char *options; const char *options;
const struct FLAC__share__option *long_options; const struct share__option *long_options;
int *opt_index; int *opt_index;
{ {
return FLAC__share___getopt_internal (argc, argv, options, long_options, opt_index, 0); return share___getopt_internal (argc, argv, options, long_options, opt_index, 0);
} }
/* Like FLAC__share__getopt_long, but '-' as well as '--' can indicate a long option. /* Like share__getopt_long, but '-' as well as '--' can indicate a long option.
If an option that starts with '-' (not '--') doesn't match a long option, If an option that starts with '-' (not '--') doesn't match a long option,
but does match a short option, it is parsed as a short option but does match a short option, it is parsed as a short option
instead. */ instead. */
GETOPT_API int GETOPT_API int
FLAC__share__getopt_long_only (argc, argv, options, long_options, opt_index) share__getopt_long_only (argc, argv, options, long_options, opt_index)
int argc; int argc;
char *const *argv; char *const *argv;
const char *options; const char *options;
const struct FLAC__share__option *long_options; const struct share__option *long_options;
int *opt_index; int *opt_index;
{ {
return FLAC__share___getopt_internal (argc, argv, options, long_options, opt_index, 1); return share___getopt_internal (argc, argv, options, long_options, opt_index, 1);
} }
@@ -123,9 +123,9 @@ main (argc, argv)
while (1) while (1)
{ {
int this_option_optind = FLAC__share__optind ? FLAC__share__optind : 1; int this_option_optind = share__optind ? share__optind : 1;
int option_index = 0; int option_index = 0;
static struct FLAC__share__option long_options[] = static struct share__option long_options[] =
{ {
{"add", 1, 0, 0}, {"add", 1, 0, 0},
{"append", 0, 0, 0}, {"append", 0, 0, 0},
@@ -136,7 +136,7 @@ main (argc, argv)
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
c = FLAC__share__getopt_long (argc, argv, "abc:d:0123456789", c = share__getopt_long (argc, argv, "abc:d:0123456789",
long_options, &option_index); long_options, &option_index);
if (c == -1) if (c == -1)
break; break;
@@ -145,8 +145,8 @@ main (argc, argv)
{ {
case 0: case 0:
printf ("option %s", long_options[option_index].name); printf ("option %s", long_options[option_index].name);
if (FLAC__share__optarg) if (share__optarg)
printf (" with arg %s", FLAC__share__optarg); printf (" with arg %s", share__optarg);
printf ("\n"); printf ("\n");
break; break;
@@ -175,11 +175,11 @@ main (argc, argv)
break; break;
case 'c': case 'c':
printf ("option c with value `%s'\n", FLAC__share__optarg); printf ("option c with value `%s'\n", share__optarg);
break; break;
case 'd': case 'd':
printf ("option d with value `%s'\n", FLAC__share__optarg); printf ("option d with value `%s'\n", share__optarg);
break; break;
case '?': case '?':
@@ -190,11 +190,11 @@ main (argc, argv)
} }
} }
if (FLAC__share__optind < argc) if (share__optind < argc)
{ {
printf ("non-option ARGV-elements: "); printf ("non-option ARGV-elements: ");
while (FLAC__share__optind < argc) while (share__optind < argc)
printf ("%s ", argv[FLAC__share__optind++]); printf ("%s ", argv[share__optind++]);
printf ("\n"); printf ("\n");
} }