cvs: php4 / NEWS /ext/standard basic_functions.c dir.c php_dir.h

zeev Thu Jun 29 14:51:40 2000 EDT Modified files: /php4 NEWS /php4/ext/standard basic_functions.c dir.c php_dir.h Log: Fixed opendir() thoroughly Index: php4/NEWS diff -u php4/NEWS:1.333 php4/NEWS:1.334 --- php4/NEWS:1.333 Thu Jun 29 06:16:46 2000 +++ php4/NEWS Thu Jun 29 14:51:39 2000 @@ -2,6 +2,12 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2000, Version 4.0.2 +- Fixed opendir() again. It should actually work well continuously now (Zeev) +- Added three additional arguments to be sent to a user-defined error handler - + the filename and line number in which the error occured, and the context + (the local variables) of the error (Zeev, Zend Engine) +- Improved the error handling code to handle an error in a user-defined error + handling function (Zeev, Zend Engine) - Added an optional parameter to preg_replace() that can be used to specify how many replacements to make. (Andrei) Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.224 php4/ext/standard/basic_functions.c:1.225 --- php4/ext/standard/basic_functions.c:1.224 Thu Jun 29 07:07:10 2000 +++ php4/ext/standard/basic_functions.c Thu Jun 29 14:51:39 2000 @@ -725,6 +725,7 @@ PHP_RINIT(filestat)(INIT_FUNC_ARGS_PASSTHRU); PHP_RINIT(syslog)(INIT_FUNC_ARGS_PASSTHRU); PHP_RINIT(assert)(INIT_FUNC_ARGS_PASSTHRU); + PHP_RINIT(dir)(INIT_FUNC_ARGS_PASSTHRU); return SUCCESS; } Index: php4/ext/standard/dir.c diff -u php4/ext/standard/dir.c:1.40 php4/ext/standard/dir.c:1.41 --- php4/ext/standard/dir.c:1.40 Tue Jun 27 11:44:30 2000 +++ php4/ext/standard/dir.c Thu Jun 29 14:51:39 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dir.c,v 1.40 2000/06/27 18:44:30 zeev Exp $ */ +/* $Id: dir.c,v 1.41 2000/06/29 21:51:39 zeev Exp $ */ /* {{{ includes/startup/misc */ @@ -113,9 +113,12 @@ efree(dirp); } -static void php_dir_init_globals(DIRLS_D) +PHP_RINIT_FUNCTION(dir) { + DIRLS_FETCH(); + DIRG(default_dir) = -1; + return SUCCESS; } PHP_MINIT_FUNCTION(dir) @@ -128,9 +131,7 @@ dir_class_entry_ptr = zend_register_internal_class(&dir_class_entry); #ifdef ZTS - dir_globals_id = ts_allocate_id(sizeof(php_dir_globals), (ts_allocate_ctor) php_dir_init_globals, NULL); -#else - php_dir_init_globals(DIRLS_C); + dir_globals_id = ts_allocate_id(sizeof(php_dir_globals), NULL, NULL); #endif return SUCCESS; Index: php4/ext/standard/php_dir.h diff -u php4/ext/standard/php_dir.h:1.7 php4/ext/standard/php_dir.h:1.8 --- php4/ext/standard/php_dir.h:1.7 Thu May 18 08:34:35 2000 +++ php4/ext/standard/php_dir.h Thu Jun 29 14:51:40 2000 @@ -17,13 +17,14 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dir.h,v 1.7 2000/05/18 15:34:35 zeev Exp $ */ +/* $Id: php_dir.h,v 1.8 2000/06/29 21:51:40 zeev Exp $ */ #ifndef _PHP_DIR_H #define _PHP_DIR_H /* directory functions */ -extern PHP_MINIT_FUNCTION(dir); +PHP_MINIT_FUNCTION(dir); +PHP_RINIT_FUNCTION(dir); PHP_FUNCTION(opendir); PHP_FUNCTION(closedir); PHP_FUNCTION(chdir);