mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-21 09:00:10 +00: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.
131 lines
4.7 KiB
C
131 lines
4.7 KiB
C
/* Internal 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_INT_H
|
||
#define _GETOPT_INT_H 1
|
||
|
||
extern int _getopt_internal (int ___argc, char *const *___argv,
|
||
const char *__shortopts,
|
||
const struct option *__longopts, int *__longind,
|
||
int __long_only);
|
||
|
||
|
||
/* Reentrant versions which can handle parsing multiple argument
|
||
vectors at the same time. */
|
||
|
||
/* Data type for reentrant functions. */
|
||
struct _getopt_data
|
||
{
|
||
/* These have exactly the same meaning as the corresponding global
|
||
variables, except that they are used for the reentrant
|
||
versions of getopt. */
|
||
int optind;
|
||
int opterr;
|
||
int optopt;
|
||
char *optarg;
|
||
|
||
/* Internal members. */
|
||
|
||
/* True if the internal members have been initialized. */
|
||
int __initialized;
|
||
|
||
/* 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. */
|
||
char *__nextchar;
|
||
|
||
/* 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. */
|
||
|
||
enum
|
||
{
|
||
REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
|
||
} __ordering;
|
||
|
||
/* If the POSIXLY_CORRECT environment variable is set. */
|
||
int __posixly_correct;
|
||
|
||
|
||
/* 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. */
|
||
|
||
int __first_nonopt;
|
||
int __last_nonopt;
|
||
|
||
#if defined _LIBC && defined USE_NONOPTION_FLAGS
|
||
int __nonoption_flags_max_len;
|
||
int __nonoption_flags_len;
|
||
# endif
|
||
};
|
||
|
||
/* The initializer is necessary to set OPTIND and OPTERR to their
|
||
default values and to clear the initialization flag. */
|
||
#define _GETOPT_DATA_INITIALIZER { 1, 1 }
|
||
|
||
extern int _getopt_internal_r (int ___argc, char *const *___argv,
|
||
const char *__shortopts,
|
||
const struct option *__longopts, int *__longind,
|
||
int __long_only, struct _getopt_data *__data);
|
||
|
||
extern int _getopt_long_r (int ___argc, char *const *___argv,
|
||
const char *__shortopts,
|
||
const struct option *__longopts, int *__longind,
|
||
struct _getopt_data *__data);
|
||
|
||
extern int _getopt_long_only_r (int ___argc, char *const *___argv,
|
||
const char *__shortopts,
|
||
const struct option *__longopts,
|
||
int *__longind,
|
||
struct _getopt_data *__data);
|
||
|
||
#endif /* getopt_int.h */
|