cvs: ZendEngine2 / zend.c zend.h zend_ini_parser.y

zeev Sun Sep 5 18:39:59 2004 EDT Modified files: /ZendEngine2 zend.c zend.h zend_ini_parser.y Log: Fix reverse dependency http://cvs.php.net/diff.php/ZendEngine2/zend.c?r1=1.290&r2=1.291&ty=u Index: ZendEngine2/zend.c diff -u ZendEngine2/zend.c:1.290 ZendEngine2/zend.c:1.291 --- ZendEngine2/zend.c:1.290 Thu Aug 19 16:29:04 2004 +++ ZendEngine2/zend.c Sun Sep 5 18:39:58 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.c,v 1.290 2004/08/19 20:29:04 andi Exp $ */ +/* $Id: zend.c,v 1.291 2004/09/05 22:39:58 zeev Exp $ */ #include "zend.h" #include "zend_extensions.h" @@ -55,6 +55,7 @@ ZEND_API void (*zend_ticks_function)(int ticks); ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args); int (*zend_vspprintf)(char **pbuf, size_t max_len, const char *format, va_list ap); +ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC); void (*zend_on_timeout)(int seconds TSRMLS_DC); @@ -577,6 +578,7 @@ zend_ticks_function = utility_functions->ticks_function; zend_on_timeout = utility_functions->on_timeout; zend_vspprintf = utility_functions->vspprintf_function; + zend_getenv = utility_functions->getenv_function; zend_compile_file = compile_file; zend_execute = execute; http://cvs.php.net/diff.php/ZendEngine2/zend.h?r1=1.260&r2=1.261&ty=u Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.260 ZendEngine2/zend.h:1.261 --- ZendEngine2/zend.h:1.260 Wed Jul 28 15:05:40 2004 +++ ZendEngine2/zend.h Sun Sep 5 18:39:58 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.h,v 1.260 2004/07/28 19:05:40 andi Exp $ */ +/* $Id: zend.h,v 1.261 2004/09/05 22:39:58 zeev Exp $ */ #ifndef ZEND_H #define ZEND_H @@ -357,6 +357,7 @@ void (*on_timeout)(int seconds TSRMLS_DC); int (*stream_open_function)(const char *filename, zend_file_handle *handle TSRMLS_DC); int (*vspprintf_function)(char **pbuf, size_t max_len, const char *format, va_list ap); + char *(*getenv_function)(char *name, size_t name_len TSRMLS_DC); } zend_utility_functions; @@ -492,6 +493,7 @@ extern void (*zend_on_timeout)(int seconds TSRMLS_DC); extern ZEND_API int (*zend_stream_open_function)(const char *filename, zend_file_handle *handle TSRMLS_DC); extern int (*zend_vspprintf)(char **pbuf, size_t max_len, const char *format, va_list ap); +extern ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC); ZEND_API void zend_error(int type, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3); http://cvs.php.net/diff.php/ZendEngine2/zend_ini_parser.y?r1=1.36&r2=1.37&ty=u Index: ZendEngine2/zend_ini_parser.y diff -u ZendEngine2/zend_ini_parser.y:1.36 ZendEngine2/zend_ini_parser.y:1.37 --- ZendEngine2/zend_ini_parser.y:1.36 Fri Aug 20 19:53:59 2004 +++ ZendEngine2/zend_ini_parser.y Sun Sep 5 18:39:58 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_ini_parser.y,v 1.36 2004/08/20 23:53:59 pollita Exp $ */ +/* $Id: zend_ini_parser.y,v 1.37 2004/09/05 22:39:58 zeev Exp $ */ #define DEBUG_CFG_PARSER 0 #include "zend.h" @@ -26,7 +26,6 @@ #include "zend_constants.h" #include "zend_ini_scanner.h" #include "zend_extensions.h" -#include "SAPI.h" #define YYSTYPE zval @@ -140,7 +139,7 @@ if (zend_get_configuration_directive(name->value.str.val, name->value.str.len+1, &curval) == SUCCESS) { result->value.str.val = zend_strndup(curval.value.str.val, curval.value.str.len); result->value.str.len = curval.value.str.len; - } else if ((envvar = sapi_getenv(name->value.str.val, name->value.str.len TSRMLS_CC)) != NULL || + } else if ((envvar = zend_getenv(name->value.str.val, name->value.str.len TSRMLS_CC)) != NULL || (envvar = getenv(name->value.str.val)) != NULL) { result->value.str.val = strdup(envvar); result->value.str.len = strlen(envvar);