diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2004-11-17 01:06:02 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2004-11-17 01:06:02 +0000 |
| commit | 2fb1ffff55c194ac089560aa61b99b669fb2d46d (patch) | |
| tree | 024c10e30db1996dc7e9160e0e7d33ab5ff9c0bf /lib | |
| parent | 6fab3fdec9db75c61d2e0f060f1ba9e48f3e4780 (diff) | |
| download | coreutils-2fb1ffff55c194ac089560aa61b99b669fb2d46d.tar.xz | |
(_getopt_internal, _getopt_internal_r,
_getopt_long_r, _getopt_long_only_r): argv is char **,
not char *__getopt_argv_const *.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/getopt_int.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/getopt_int.h b/lib/getopt_int.h index 158a53a09..e5bc3f2fd 100644 --- a/lib/getopt_int.h +++ b/lib/getopt_int.h @@ -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, |