1
0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-07-29 11:59:36 +02:00

(_getopt_internal, _getopt_internal_r,

_getopt_long_r, _getopt_long_only_r): argv is char **,
not char *__getopt_argv_const *.
This commit is contained in:
Paul Eggert
2004-11-17 01:06:02 +00:00
parent 6fab3fdec9
commit 2fb1ffff55
+10 -9
View File
@@ -20,10 +20,10 @@
#ifndef _GETOPT_INT_H
#define _GETOPT_INT_H 1
extern int _getopt_internal (int ___argc, char *__getopt_argv_const *___argv,
extern int _getopt_internal (int ___argc, char **___argv,
const char *__shortopts,
const struct option *__longopts, int *__longind,
int __long_only);
int __long_only, int __posixly_correct);
/* Reentrant versions which can handle parsing multiple argument
@@ -64,7 +64,7 @@ struct _getopt_data
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.
of the list of option characters, or by calling getopt.
PERMUTE is the default. We permute the contents of ARGV as we
scan, so that eventually all the non-options are at the end.
@@ -87,7 +87,8 @@ struct _getopt_data
REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
} __ordering;
/* If the POSIXLY_CORRECT environment variable is set. */
/* If the POSIXLY_CORRECT environment variable is set
or getopt was called. */
int __posixly_correct;
@@ -110,18 +111,18 @@ struct _getopt_data
default values and to clear the initialization flag. */
#define _GETOPT_DATA_INITIALIZER { 1, 1 }
extern int _getopt_internal_r (int ___argc, char *__getopt_argv_const *___argv,
extern int _getopt_internal_r (int ___argc, char **___argv,
const char *__shortopts,
const struct option *__longopts, int *__longind,
int __long_only, struct _getopt_data *__data);
int __long_only, int __posixly_correct,
struct _getopt_data *__data);
extern int _getopt_long_r (int ___argc, char *__getopt_argv_const *___argv,
extern int _getopt_long_r (int ___argc, char **___argv,
const char *__shortopts,
const struct option *__longopts, int *__longind,
struct _getopt_data *__data);
extern int _getopt_long_only_r (int ___argc,
char *__getopt_argv_const *___argv,
extern int _getopt_long_only_r (int ___argc, char **___argv,
const char *__shortopts,
const struct option *__longopts,
int *__longind,