cvs: php4 /sapi/cli php_cli.c

helly Fri Apr 18 20:02:50 2003 EDT Modified files: /php4/sapi/cli php_cli.c Log: Shutdown memleaks Index: php4/sapi/cli/php_cli.c diff -u php4/sapi/cli/php_cli.c:1.81 php4/sapi/cli/php_cli.c:1.82 --- php4/sapi/cli/php_cli.c:1.81 Tue Apr 15 22:34:57 2003 +++ php4/sapi/cli/php_cli.c Fri Apr 18 20:02:50 2003 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_cli.c,v 1.81 2003/04/16 02:34:57 sniper Exp $ */ +/* $Id: php_cli.c,v 1.82 2003/04/19 00:02:50 helly Exp $ */ #include "php.h" #include "php_globals.h" @@ -627,8 +627,8 @@ SG(headers_sent) = 1; php_cli_usage(argv[0]); php_end_ob_buffers(1 TSRMLS_CC); - exit(1); - break; + exit_status=1; + goto out_err; case 'a': /* interactive mode */ printf("Interactive mode enabled\n\n"); @@ -691,8 +691,8 @@ } php_print_info(0xFFFFFFFF TSRMLS_CC); php_end_ob_buffers(1 TSRMLS_CC); - exit(1); - break; + exit_status=1; + goto out; case 'l': /* syntax check mode */ if (behavior != PHP_MODE_STANDARD) { @@ -712,8 +712,8 @@ print_extensions(TSRMLS_C); php_printf("\n"); php_end_ob_buffers(1 TSRMLS_CC); - exit(1); - break; + exit_status=1; + goto out_err; #if 0 /* not yet operational, see also below ... */ case '': /* generate indented source mode*/ @@ -805,8 +805,8 @@ } php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2003 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); php_end_ob_buffers(1 TSRMLS_CC); - exit(1); - break; + exit_status=1; + goto out; case 'w': if (behavior == PHP_MODE_CLI_DIRECT || behavior == PHP_MODE_PROCESS_STDIN) { @@ -832,7 +832,8 @@ SG(headers_sent) = 1; SG(request_info).no_headers = 1; PUTS(param_error); - exit(1); + exit_status=1; + goto out_err; } CG(interactive) = interactive;