archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 09:24:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix long options

Browse source
This commit is contained in:
Antony Dovgal 2007-04-23 11:04:54 +00:00
parent 1607e9fa79
commit 83d74b7488
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sapi/cgi/getopt.c
View file

@ -145,7 +145,8 @@ int php_getopt(int argc, char* const *argv, const opt_struct opts[], char **opta
} }
return opts[opts_idx].opt_char; return opts[opts_idx].opt_char;
} else { } else {
if (arg_start >= 2) { /* multiple options specified as one (exclude long opts) */
if (arg_start >= 2 && !((argv[*optind][0] == '-') && (argv[*optind][1] == '-'))) {
if (!argv[*optind][optchr+1]) if (!argv[*optind][optchr+1])
{ {
dash = 0; dash = 0;

3
sapi/cli/getopt.c
View file

@ -145,7 +145,8 @@ int php_getopt(int argc, char* const *argv, const opt_struct opts[], char **opta
} }
return opts[opts_idx].opt_char; return opts[opts_idx].opt_char;
} else { } else {
if (arg_start >= 2) { /* multiple options specified as one (exclude long opts) */
if (arg_start >= 2 && !((argv[*optind][0] == '-') && (argv[*optind][1] == '-'))) {
if (!argv[*optind][optchr+1]) if (!argv[*optind][optchr+1])
{ {
dash = 0; dash = 0;