archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.3' into PHP-7.4

Browse source 
* PHP-7.3:
  Fix bug #78323: Code 0 is returned on invalid options
This commit is contained in:
Nikita Popov 2020-01-27 13:32:29 +01:00
commit 1cccbb8ff1
11 changed files with 177 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sapi/cli/php_cli.c
View file

@ -1228,7 +1228,7 @@ int main(int argc, char *argv[])
setmode(_fileno(stderr), O_BINARY); /* make the stdio mode be binary */
#endif
while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0, 2))!=-1) {
while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 1, 2))!=-1) {
switch (c) {
case 'c':
if (ini_path_override) {
@ -1280,6 +1280,10 @@ int main(int argc, char *argv[])
case '?':
php_cli_usage(argv[0]);
goto out;
case PHP_GETOPT_INVALID_ARG: /* print usage on bad options, exit 1 */
php_cli_usage(argv[0]);
exit_status = 1;
goto out;
case 'i': case 'v': case 'm':
sapi_module = &cli_sapi_module;
goto exit_loop;