Use goto instead of an if around the options parsing

Author: nielsdos

sapi/cgi/cgi_main.c

@@ -2268,112 +2268,111 @@ consult the installation file that came with this distribution, or visit \n\
 			init_request_info(request);
 
 			if (!cgi && !fastcgi) {
-				if (behavior != PHP_MODE_LINT) {
-					while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0, 2)) != -1) {
-						switch (c) {
-
-							case 'a':	/* interactive mode */
-								printf("Interactive mode enabled\n\n");
-								fflush(stdout);
-								break;
-
-							case 'C': /* don't chdir to the script directory */
-								SG(options) |= SAPI_OPTION_NO_CHDIR;
-								break;
-
-							case 'e': /* enable extended info output */
-								CG(compiler_options) |= ZEND_COMPILE_EXTENDED_INFO;
-								break;
-
-							case 'f': /* parse file */
-								if (script_file) {
-									efree(script_file);
-								}
-								script_file = estrdup(php_optarg);
-								no_headers = 1;
-								break;
+				while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0, 2)) != -1) {
+					switch (c) {
 
-							case 'i': /* php info & quit */
-								if (script_file) {
-									efree(script_file);
-								}
-								if (php_request_startup() == FAILURE) {
-									SG(server_context) = NULL;
-									php_module_shutdown();
-									free(bindpath);
-									return FAILURE;
-								}
-								if (no_headers) {
-									SG(headers_sent) = 1;
-									SG(request_info).no_headers = 1;
-								}
-								php_print_info(0xFFFFFFFF);
-								php_request_shutdown((void *) 0);
-								fcgi_shutdown();
-								exit_status = 0;
-								goto out;
-
-							case 'l': /* syntax check mode */
-								no_headers = 1;
-								behavior = PHP_MODE_LINT;
-								break;
-
-							case 'm': /* list compiled in modules */
-								if (script_file) {
-									efree(script_file);
-								}
-								SG(headers_sent) = 1;
-								php_printf("[PHP Modules]\n");
-								print_modules();
-								php_printf("\n[Zend Modules]\n");
-								print_extensions();
-								php_printf("\n");
-								php_output_end_all();
-								fcgi_shutdown();
-								exit_status = 0;
-								goto out;
-
-							case 'q': /* do not generate HTTP headers */
-								no_headers = 1;
-								break;
-
-							case 'v': /* show php version & quit */
-								if (script_file) {
-									efree(script_file);
-								}
-								no_headers = 1;
-								if (php_request_startup() == FAILURE) {
-									SG(server_context) = NULL;
-									php_module_shutdown();
-									free(bindpath);
-									return FAILURE;
-								}
+						case 'a':	/* interactive mode */
+							printf("Interactive mode enabled\n\n");
+							fflush(stdout);
+							break;
+
+						case 'C': /* don't chdir to the script directory */
+							SG(options) |= SAPI_OPTION_NO_CHDIR;
+							break;
+
+						case 'e': /* enable extended info output */
+							CG(compiler_options) |= ZEND_COMPILE_EXTENDED_INFO;
+							break;
+
+						case 'f': /* parse file */
+							if (script_file) {
+								efree(script_file);
+							}
+							script_file = estrdup(php_optarg);
+							no_headers = 1;
+							break;
+
+						case 'i': /* php info & quit */
+							if (script_file) {
+								efree(script_file);
+							}
+							if (php_request_startup() == FAILURE) {
+								SG(server_context) = NULL;
+								php_module_shutdown();
+								free(bindpath);
+								return FAILURE;
+							}
+							if (no_headers) {
 								SG(headers_sent) = 1;
 								SG(request_info).no_headers = 1;
-	#if ZEND_DEBUG
-								php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
-	#else
-								php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
-	#endif
-								php_request_shutdown((void *) 0);
-								fcgi_shutdown();
-								exit_status = 0;
-								goto out;
-
-							case 'w':
-								behavior = PHP_MODE_STRIP;
-								break;
-
-							case 'z': /* load extension file */
-								zend_load_extension(php_optarg);
-								break;
-
-							default:
-								break;
-						}
+							}
+							php_print_info(0xFFFFFFFF);
+							php_request_shutdown((void *) 0);
+							fcgi_shutdown();
+							exit_status = 0;
+							goto out;
+
+						case 'l': /* syntax check mode */
+							no_headers = 1;
+							behavior = PHP_MODE_LINT;
+							break;
+
+						case 'm': /* list compiled in modules */
+							if (script_file) {
+								efree(script_file);
+							}
+							SG(headers_sent) = 1;
+							php_printf("[PHP Modules]\n");
+							print_modules();
+							php_printf("\n[Zend Modules]\n");
+							print_extensions();
+							php_printf("\n");
+							php_output_end_all();
+							fcgi_shutdown();
+							exit_status = 0;
+							goto out;
+
+						case 'q': /* do not generate HTTP headers */
+							no_headers = 1;
+							break;
+
+						case 'v': /* show php version & quit */
+							if (script_file) {
+								efree(script_file);
+							}
+							no_headers = 1;
+							if (php_request_startup() == FAILURE) {
+								SG(server_context) = NULL;
+								php_module_shutdown();
+								free(bindpath);
+								return FAILURE;
+							}
+							SG(headers_sent) = 1;
+							SG(request_info).no_headers = 1;
+#if ZEND_DEBUG
+							php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+#else
+							php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+#endif
+							php_request_shutdown((void *) 0);
+							fcgi_shutdown();
+							exit_status = 0;
+							goto out;
+
+						case 'w':
+							behavior = PHP_MODE_STRIP;
+							break;
+
+						case 'z': /* load extension file */
+							zend_load_extension(php_optarg);
+							break;
+
+						default:
+							break;
 					}
 				}
 
+do_repeat:
 				if (script_file) {
 					/* override path_translated if -f on command line */
 					if (SG(request_info).path_translated) efree(SG(request_info).path_translated);
@@ -2585,7 +2584,7 @@ consult the installation file that came with this distribution, or visit \n\
 				if (behavior == PHP_MODE_LINT && argc - 1 > php_optind) {
 					php_optind++;
 					script_file = NULL;
-					continue;
+					goto do_repeat;
 				}
 				break;
 			}