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

Return the exit status from php_execute_script()

Browse source
This commit is contained in:
Sascha Schumann 2000-11-22 04:23:26 +00:00
parent 939b72c771
commit 0222f92358
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
main/main.c
View file

@ -1167,15 +1167,16 @@ PHPAPI int php_handle_special_queries(SLS_D PLS_DC)
return 0; return 0;
} }
PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_DC) PHPAPI int php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_DC)
{ {
zend_file_handle *prepend_file_p, *append_file_p; zend_file_handle *prepend_file_p, *append_file_p;
zend_file_handle prepend_file, append_file; zend_file_handle prepend_file, append_file;
char *old_cwd; char *old_cwd;
SLS_FETCH(); SLS_FETCH();
EG(exit_status) = 0;
if (php_handle_special_queries(SLS_C PLS_CC)) if (php_handle_special_queries(SLS_C PLS_CC))
return; return 0;
#define OLD_CWD_SIZE 4096 #define OLD_CWD_SIZE 4096
old_cwd = do_alloca(OLD_CWD_SIZE); old_cwd = do_alloca(OLD_CWD_SIZE);
old_cwd[0] = '\0'; old_cwd[0] = '\0';
@ -1184,7 +1185,7 @@ PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_
if (old_cwd[0] != '\0') if (old_cwd[0] != '\0')
V_CHDIR(old_cwd); V_CHDIR(old_cwd);
free_alloca(old_cwd); free_alloca(old_cwd);
return; return EG(exit_status);
} }
#ifdef PHP_WIN32 #ifdef PHP_WIN32
@ -1222,6 +1223,8 @@ PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_
if (old_cwd[0] != '\0') if (old_cwd[0] != '\0')
V_CHDIR(old_cwd); V_CHDIR(old_cwd);
free_alloca(old_cwd); free_alloca(old_cwd);
return EG(exit_status);
} }
PHPAPI void php_handle_aborted_connection(void) PHPAPI void php_handle_aborted_connection(void)

2
main/php_main.h
View file

@ -40,7 +40,7 @@ PHPAPI int php_startup_extensions(zend_module_entry **ptr, int count);
PHPAPI int php_global_startup_extensions(zend_module_entry **ptr, int count); PHPAPI int php_global_startup_extensions(zend_module_entry **ptr, int count);
PHPAPI int php_global_shutdown_extensions(zend_module_entry **ptr, int count); PHPAPI int php_global_shutdown_extensions(zend_module_entry **ptr, int count);
PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_DC); PHPAPI int php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_DC);
PHPAPI int php_handle_special_queries(SLS_D PLS_DC); PHPAPI int php_handle_special_queries(SLS_D PLS_DC);
PHPAPI int php_lint_script(zend_file_handle *file CLS_DC ELS_DC PLS_DC); PHPAPI int php_lint_script(zend_file_handle *file CLS_DC ELS_DC PLS_DC);