- Merge getopt fixes from re2c

19 years ago · 223cd73da9
2 changed files with 6 additions and 2 deletions
--- a/sapi/cgi/getopt.c
+++ b/sapi/cgi/getopt.c
@ -107,6 +107,7 @@ int php_getopt(int argc, char* const *argv, const opt_struct opts[], char **opta
 			(*optind)++;
 			return (php_opt_error(argc, argv, *optind-1, optchr, OPTERRCOLON, show_err));
 		}
+		arg_start = 1 + optchr;
 	}
 	if (opts_idx < 0) {
 		while (1) {
@ -120,6 +121,7 @@ int php_getopt(int argc, char* const *argv, const opt_struct opts[], char **opta
 					(*optind)++;
 				} else {
 					optchr++;
+					arg_start++;
 				}
 				return(php_opt_error(argc, argv, errind, errchr, OPTERRNF, show_err));
 			} else if (argv[*optind][optchr] == opts[opts_idx].opt_char) {
@ -143,7 +145,7 @@ int php_getopt(int argc, char* const *argv, const opt_struct opts[], char **opta
 		}
 		return opts[opts_idx].opt_char;
 	} else {
-		if (arg_start == 2) {
+		if (arg_start >= 2) {
 			if (!argv[*optind][optchr+1])
 			{
 				dash = 0;
--- a/sapi/cli/getopt.c
+++ b/sapi/cli/getopt.c
@ -107,6 +107,7 @@ int php_getopt(int argc, char* const *argv, const opt_struct opts[], char **opta
 			(*optind)++;
 			return (php_opt_error(argc, argv, *optind-1, optchr, OPTERRCOLON, show_err));
 		}
+		arg_start = 1 + optchr;
 	}
 	if (opts_idx < 0) {
 		while (1) {
@ -120,6 +121,7 @@ int php_getopt(int argc, char* const *argv, const opt_struct opts[], char **opta
 					(*optind)++;
 				} else {
 					optchr++;
+					arg_start++;
 				}
 				return(php_opt_error(argc, argv, errind, errchr, OPTERRNF, show_err));
 			} else if (argv[*optind][optchr] == opts[opts_idx].opt_char) {
@ -143,7 +145,7 @@ int php_getopt(int argc, char* const *argv, const opt_struct opts[], char **opta
 		}
 		return opts[opts_idx].opt_char;
 	} else {
-		if (arg_start == 2) {
+		if (arg_start >= 2) {
 			if (!argv[*optind][optchr+1])
 			{
 				dash = 0;