summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main/getopt.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/main/getopt.c b/main/getopt.c
index f3e1f2ed9c..2fd52d8d5a 100644
--- a/main/getopt.c
+++ b/main/getopt.c
@@ -107,9 +107,15 @@ PHPAPI int php_getopt(int argc, char* const *argv, const opt_struct opts[], char
break;
}
}
- optchr = 0;
- dash = 0;
- arg_start += strlen(opts[php_optidx].opt_name);
+
+ if (arg_end == strlen(opts[php_optidx].opt_name)) {
+ optchr = 0;
+ dash = 0;
+ arg_start += strlen(opts[php_optidx].opt_name);
+ } else {
+ (*optind)++;
+ return (php_opt_error(argc, argv, *optind-1, optchr, OPTERRNF, show_err));
+ }
} else {
if (!dash) {
dash = 1;