mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-24 10:22:41 +08:00
511676f708
2004-03-08 Paul Eggert <eggert@cs.ucla.edu> Merge from gnulib. We now assume C89 or better. * posix/getopt1.c (const): Remove. * posix/getopt.c (const): Likewise. * posix/getopt1.c (getopt_long, _getopt_long_r, getopt_long_only, _getopt_long_only_r, main): Use prototypes, not old-style definitions. * posix/getopt.c (exchange, _getopt_initialize, _getopt_internal_r, _getopt_internal, getopt, main): Likewise. * posix/getopt.h (getopt, getopt_long, getopt_long_only): Likewise. * posix/getopt.c [!defined VMS || !HAVE_STRING_H]: Include <string.h> regardless. No need for <strings.h>. [!defined _LIBC]: Include "gettext.h" rather than rolling it ourselves. (_): Define to gettext always. (my_index): Remove: all uses changed to strchr. (strlen): Remove declaration. * posix/getopt.h (struct option.name): Always const char *. 2004-03-08 Marcus Brinkmann <marcus@gnu.org> * posix/getopt.h (_getopt_internal): Move to ... * posix/getopt_int.h: ... here. New file. * include/getopt_int.h: New file. * include/getopt.h: Remove libc_hidden_proto for getopt_long and getopt_long_only. * posix/getopt1.c: Include "getopt_int.h". Remove libc_hidden_def for getopt_long and getopt_long_only. (_getopt_long_r, _getopt_long_only_r): New functions. * posix/getopt.c: Include "getopt_int.h". (__getopt_initialized): Variable removed. (nextchar, ordering, posixly_correct, first_nonopt, last_nonopt): Static variables removed. (nonoption_flags_max_len, nonoption_flags_len) [_LIBC && USE_NONOPTION_FLAGS]: Static variables removed. (getopt_data): New static variable. (SWAP_FLAGS): Use d->__nonoption_flags_len instead nonoption_flags_len. (exchange): Add new argument D of type struct getopt_data *. Replace optind with d->optind, optarg with d->optarg, opterr with d->opterr, optopt with d->optopt, nextchar with d->__nextchar, first_nonopt with d->__first_nonopt, last_nonopt with d->__last_nonopt, d->ordering with d->__ordering, d->posixly_correct with d->__posixly_correct (which is now an int instead a string, so fix users), nonoption_flags_len with d->__nonoption_flags_len, nonoption_flags_max_len with d->__nonoption_flags_max_len. (_getopt_initialize): Likewise. (_getopt_internal): Rename to ... (_getopt_internal_r): ... this. Also add new argument D of type struct getopt_data * and use of members of D rather than global or static variables as described for exchange() above. Add new argument to invocations of _getopt_initialize and exchange. (_getopt_internal): Reimplement in terms of _getopt_internal_r. * argp/argp-parse.c: Include <getopt_int.h>. [_LIBC]: Do not include <bits/libc-lock.h>. [!_LIBC && HAVE_CTHREADS_H]: Do not include <cthreads.h>. [!_LIBC] (_argp_hang): Make static. (getopt_lock, LOCK_GETOPT, UNLOCK_GETOPT): Remove. (_argp_unlock_xxx): Remove. (parser_init): Do not use LOCK_GETOPT. (parser_finalize): Do not use UNLOCK_GETOPT. (struct parser): New member OPT_DATA. (parser_init): Initialize parser->opt_data. Use parser->opt_data.opterr instead of opterr. (parser_parse_opt): Use parser->opt_data.optarg instead optarg. (parser_parse_next): Likewise. Use parser->opt_data.optind instead optind. Use parser->opt_data.optopt instead of optopt. Call _getopt_long_only_r and _getopt_long_r instead of getopt_long_only and getopt_long, and pass the extra argument.
178 lines
6.0 KiB
C
178 lines
6.0 KiB
C
/* Declarations for getopt.
|
|
Copyright (C) 1989-1994,1996-1999,2001,2003,2004
|
|
Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#ifndef _GETOPT_H
|
|
|
|
#ifndef __need_getopt
|
|
# define _GETOPT_H 1
|
|
#endif
|
|
|
|
/* If __GNU_LIBRARY__ is not already defined, either we are being used
|
|
standalone, or this is the first header included in the source file.
|
|
If we are being used with glibc, we need to include <features.h>, but
|
|
that does not exist if we are standalone. So: if __GNU_LIBRARY__ is
|
|
not defined, include <ctype.h>, which will pull in <features.h> for us
|
|
if it's from glibc. (Why ctype.h? It's guaranteed to exist and it
|
|
doesn't flood the namespace with stuff the way some other headers do.) */
|
|
#if !defined __GNU_LIBRARY__
|
|
# include <ctype.h>
|
|
#endif
|
|
|
|
#ifndef __THROW
|
|
# ifndef __GNUC__
|
|
# define __GNUC_PREREQ(maj, min) (0)
|
|
# endif
|
|
# if defined __cplusplus && __GNUC_PREREQ (2,8)
|
|
# define __THROW throw ()
|
|
# else
|
|
# define __THROW
|
|
# endif
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/* 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. */
|
|
|
|
extern char *optarg;
|
|
|
|
/* 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. */
|
|
|
|
extern int optind;
|
|
|
|
/* Callers store zero here to inhibit the error message `getopt' prints
|
|
for unrecognized options. */
|
|
|
|
extern int opterr;
|
|
|
|
/* Set to an option character which was unrecognized. */
|
|
|
|
extern int optopt;
|
|
|
|
#ifndef __need_getopt
|
|
/* Describe the long-named options requested by the application.
|
|
The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
|
|
of `struct option' terminated by an element containing a name which is
|
|
zero.
|
|
|
|
The field `has_arg' is:
|
|
no_argument (or 0) if the option does not take an argument,
|
|
required_argument (or 1) if the option requires an argument,
|
|
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
|
|
to the value given in the field `val' when the option is found, but
|
|
left unchanged if the option is not found.
|
|
|
|
To have a long-named option do something other than set an `int' to
|
|
a compiled-in constant, such as set a value from `optarg', set the
|
|
option's `flag' field to zero and its `val' field to a nonzero
|
|
value (the equivalent single-letter option character, if there is
|
|
one). For long options that have a zero `flag' field, `getopt'
|
|
returns the contents of the `val' field. */
|
|
|
|
struct option
|
|
{
|
|
const char *name;
|
|
/* has_arg can't be an enum because some compilers complain about
|
|
type mismatches in all the code that assumes it is an int. */
|
|
int has_arg;
|
|
int *flag;
|
|
int val;
|
|
};
|
|
|
|
/* Names for the values of the `has_arg' field of `struct option'. */
|
|
|
|
# define no_argument 0
|
|
# define required_argument 1
|
|
# define optional_argument 2
|
|
#endif /* need getopt */
|
|
|
|
|
|
/* Get definitions and prototypes for functions to process the
|
|
arguments in ARGV (ARGC of them, minus the program name) for
|
|
options given in OPTS.
|
|
|
|
Return the option character from OPTS just read. Return -1 when
|
|
there are no more options. For unrecognized options, or options
|
|
missing arguments, `optopt' is set to the option letter, and '?' is
|
|
returned.
|
|
|
|
The OPTS string is a list of characters which are recognized option
|
|
letters, optionally followed by colons, specifying that that letter
|
|
takes an argument, to be placed in `optarg'.
|
|
|
|
If a letter in OPTS is followed by two colons, its argument is
|
|
optional. This behavior is specific to the GNU `getopt'.
|
|
|
|
The argument `--' causes premature termination of argument
|
|
scanning, explicitly telling `getopt' that there are no more
|
|
options.
|
|
|
|
If OPTS begins with `--', then non-option arguments are treated as
|
|
arguments to the option '\0'. This behavior is specific to the GNU
|
|
`getopt'. */
|
|
|
|
#ifdef __GNU_LIBRARY__
|
|
/* Many other libraries have conflicting prototypes for getopt, with
|
|
differences in the consts, in stdlib.h. To avoid compilation
|
|
errors, only prototype getopt for the GNU C library. */
|
|
extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
|
|
__THROW;
|
|
#else /* not __GNU_LIBRARY__ */
|
|
extern int getopt ();
|
|
#endif /* __GNU_LIBRARY__ */
|
|
|
|
#ifndef __need_getopt
|
|
extern int getopt_long (int ___argc, char *const *___argv,
|
|
const char *__shortopts,
|
|
const struct option *__longopts, int *__longind)
|
|
__THROW;
|
|
extern int getopt_long_only (int ___argc, char *const *___argv,
|
|
const char *__shortopts,
|
|
const struct option *__longopts, int *__longind)
|
|
__THROW;
|
|
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
/* Make sure we later can get all the definitions and declarations. */
|
|
#undef __need_getopt
|
|
|
|
#endif /* getopt.h */
|