CVS update: php3

Date: Friday July 2, 1999 @ 12:41 Author: markonen Update of /repository/php3 In directory php:/tmp/cvs-serv17085 Modified Files: ChangeLog configure.in control_structures_inline.h internal_functions.c language-scanner.lex main.c php.h stack.c stack.h variables.c Log Message: Added Chad Cunningham's patches for Mac OS X compatibility. Index: php3/ChangeLog diff -u php3/ChangeLog:1.713 php3/ChangeLog:1.714 --- php3/ChangeLog:1.713 Thu Jul 1 05:15:31 1999 +++ php3/ChangeLog Fri Jul 2 12:41:50 1999 @@ -1,6 +1,7 @@ PHP 3.0 CHANGE LOG ChangeLog ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ??, Version 3.0.12 +- added Chad Cunningham's patches for Mac OS X compatibility (markonen) - added ldap_error(), ldap_errno() and ldap_err2str() functions (kk) - fix --with-shared-apache (Sascha) NOTE: Use of this is deprecated. Refer to INSTALL.DSO instead. Index: php3/configure.in diff -u php3/configure.in:1.425 php3/configure.in:1.426 --- php3/configure.in:1.425 Fri Jul 2 09:25:19 1999 +++ php3/configure.in Fri Jul 2 12:41:50 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.425 1999/07/02 13:25:19 markonen Exp $ +dnl $Id: configure.in,v 1.426 1999/07/02 16:41:50 markonen Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -228,7 +228,8 @@ dnl Checks for library functions. AC_FUNC_VPRINTF -AC_CHECK_FUNCS(memcpy memmove strdup strerror strcasecmp strstr flock lockf putenv tempnam usleep setlocale gettimeofday setvbuf srand48 lrand48 srandom random link symlink regcomp getlogin cuserid vsnprintf snprintf gcvt utime crypt setitimer rint unsetenv strftime setsockopt tzset statvfs statfs inet_aton shutdown truncate getpgid getsid getrlimit) +AC_CHECK_FUNCS(memcpy memmove strdup strerror strcasecmp strstr flock lockf putenv tempnam usleep setlocale gettimeofday setvbuf srand48 lrand48 srandom random link symlink regcomp getlogin cuserid vsnprintf gcvt utime crypt setitimer rint unsetenv strftime setsockopt tzset statvfs statfs inet_aton shutdown truncate getpgid getsid getrlimit) +AC_CHECK_FUNC(snprintf, AC_DEFINE(HAVE_SNPRINTF,)) AC_FUNC_UTIME_NULL AC_FUNC_ALLOCA AC_BROKEN_SPRINTF Index: php3/control_structures_inline.h diff -u php3/control_structures_inline.h:1.198 php3/control_structures_inline.h:1.199 --- php3/control_structures_inline.h:1.198 Wed May 19 15:10:58 1999 +++ php3/control_structures_inline.h Fri Jul 2 12:41:50 1999 @@ -29,7 +29,7 @@ */ -/* $Id: control_structures_inline.h,v 1.198 1999/05/19 19:10:58 zeev Exp $ */ +/* $Id: control_structures_inline.h,v 1.199 1999/07/02 16:41:50 markonen Exp $ */ #ifdef THREAD_SAFE #include "tls.h" @@ -213,7 +213,7 @@ inline void cs_start_while(pval *while_token, pval *expr INLINE_TLS) { GLOBAL(function_state).loop_nest_level++; - stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); + php3i_stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); if (GLOBAL(Execute)) { tc_set_token(&GLOBAL(token_cache_manager), while_token->offset, WHILE); @@ -247,8 +247,8 @@ GLOBAL(function_state).loop_change_level = 0; } } - GLOBAL(ExecuteFlag) = stack_int_top(&GLOBAL(css)); - stack_del_top(&GLOBAL(css)); + GLOBAL(ExecuteFlag) = php3i_stack_int_top(&GLOBAL(css)); + php3i_stack_del_top(&GLOBAL(css)); GLOBAL(Execute) = SHOULD_EXECUTE; GLOBAL(function_state).loop_nest_level--; } @@ -257,7 +257,7 @@ inline void cs_start_do_while(pval *do_token INLINE_TLS) { GLOBAL(function_state).loop_nest_level++; - stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); + php3i_stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); if (GLOBAL(Execute)) { tc_set_token(&GLOBAL(token_cache_manager), do_token->offset, DO); } @@ -296,8 +296,8 @@ GLOBAL(function_state).loop_change_level = 0; } } - GLOBAL(ExecuteFlag) = stack_int_top(&GLOBAL(css)); - stack_del_top(&GLOBAL(css)); + GLOBAL(ExecuteFlag) = php3i_stack_int_top(&GLOBAL(css)); + php3i_stack_del_top(&GLOBAL(css)); GLOBAL(Execute) = SHOULD_EXECUTE; GLOBAL(function_state).loop_nest_level--; } @@ -305,7 +305,7 @@ inline void cs_start_if (pval *expr INLINE_TLS) { - stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); /* push current state to stack */ + php3i_stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); /* push current state to stack */ if (GLOBAL(Execute)) { /* we're in a code block that needs to be evaluated */ if (pval_is_true(expr)) { /* the IF expression is pval_is_true, execute IF code */ @@ -325,8 +325,8 @@ inline void cs_end_if ( INLINE_TLS_VOID) { /* restore previous status */ - GLOBAL(ExecuteFlag) = stack_int_top(&GLOBAL(css)); - stack_del_top(&GLOBAL(css)); + GLOBAL(ExecuteFlag) = php3i_stack_int_top(&GLOBAL(css)); + php3i_stack_del_top(&GLOBAL(css)); GLOBAL(Execute) = SHOULD_EXECUTE; } @@ -372,8 +372,8 @@ GLOBAL(ExecuteFlag) = DONT_EXECUTE; GLOBAL(Execute) = SHOULD_EXECUTE; } - local_stack_top = stack_int_top(&GLOBAL(css)); - stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); + local_stack_top = php3i_stack_int_top(&GLOBAL(css)); + php3i_stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); if (GLOBAL(ExecuteFlag) == BEFORE_EXECUTE && local_stack_top == EXECUTE) { GLOBAL(ExecuteFlag) = EXECUTE; GLOBAL(Execute) = SHOULD_EXECUTE; @@ -383,8 +383,8 @@ inline void cs_elseif_end_evaluate( INLINE_TLS_VOID) { - GLOBAL(ExecuteFlag) = stack_int_top(&GLOBAL(css)); - stack_del_top(&GLOBAL(css)); + GLOBAL(ExecuteFlag) = php3i_stack_int_top(&GLOBAL(css)); + php3i_stack_del_top(&GLOBAL(css)); GLOBAL(Execute) = SHOULD_EXECUTE; } @@ -495,7 +495,7 @@ inline void start_function_decleration(INLINE_TLS_VOID) { - stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); + php3i_stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); GLOBAL(ExecuteFlag) = DONT_EXECUTE; GLOBAL(Execute) = SHOULD_EXECUTE; } @@ -505,9 +505,9 @@ { HashTable *target_symbol_table; - GLOBAL(ExecuteFlag) = stack_int_top(&GLOBAL(css)); + GLOBAL(ExecuteFlag) = php3i_stack_int_top(&GLOBAL(css)); GLOBAL(Execute) = SHOULD_EXECUTE; - stack_del_top(&GLOBAL(css)); + php3i_stack_del_top(&GLOBAL(css)); if (GLOBAL(Execute)) { php3_str_tolower(function_name->value.str.val, function_name->value.str.len); @@ -538,10 +538,10 @@ inline void for_pre_expr1(pval *for_token INLINE_TLS) { GLOBAL(function_state).loop_nest_level++; - stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); + php3i_stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); if (GLOBAL(Execute)) { tc_set_token(&GLOBAL(token_cache_manager), for_token->offset, FOR); - if (stack_int_top(&GLOBAL(for_stack)) == (long) for_token->offset) { /* 2nd or later iteration */ + if (php3i_stack_int_top(&GLOBAL(for_stack)) == (long) for_token->offset) { /* 2nd or later iteration */ GLOBAL(ExecuteFlag) = DONT_EXECUTE; GLOBAL(Execute) = SHOULD_EXECUTE; } @@ -555,9 +555,9 @@ */ inline void for_pre_expr2(pval *for_token INLINE_TLS) { - GLOBAL(ExecuteFlag) = stack_int_top(&GLOBAL(css)); + GLOBAL(ExecuteFlag) = php3i_stack_int_top(&GLOBAL(css)); GLOBAL(Execute) = SHOULD_EXECUTE; - if (for_token->cs_data.switched && stack_int_top(&GLOBAL(for_stack)) != (long) for_token->offset) { + if (for_token->cs_data.switched && php3i_stack_int_top(&GLOBAL(for_stack)) != (long) for_token->offset) { GLOBAL(ExecuteFlag) = DONT_EXECUTE; GLOBAL(Execute) = SHOULD_EXECUTE; /* first iteration of already switched for */ } @@ -570,10 +570,10 @@ */ inline void for_pre_expr3(pval *for_token, pval *expr2 INLINE_TLS) { - if (for_token->cs_data.switched && stack_int_top(&GLOBAL(for_stack)) != (long) for_token->offset) { + if (for_token->cs_data.switched && php3i_stack_int_top(&GLOBAL(for_stack)) != (long) for_token->offset) { var_reset(expr2); } - GLOBAL(ExecuteFlag) = stack_int_top(&GLOBAL(css)); + GLOBAL(ExecuteFlag) = php3i_stack_int_top(&GLOBAL(css)); GLOBAL(Execute) = SHOULD_EXECUTE; if (GLOBAL(Execute) && !for_token->cs_data.switched) { GLOBAL(ExecuteFlag) = DONT_EXECUTE; @@ -584,7 +584,7 @@ inline void for_pre_statement(pval *for_token, pval *expr2, pval *expr3 INLINE_TLS) { - GLOBAL(ExecuteFlag) = stack_int_top(&GLOBAL(css)); + GLOBAL(ExecuteFlag) = php3i_stack_int_top(&GLOBAL(css)); GLOBAL(Execute) = SHOULD_EXECUTE; if (GLOBAL(Execute) && !for_token->cs_data.switched) { var_reset(expr3); @@ -612,8 +612,8 @@ inline void for_post_statement(pval *for_token, pval *first_semicolon, pval *second_semicolon, pval *close_parentheses, int *yychar INLINE_TLS) { - if (stack_int_top(&GLOBAL(for_stack)) != (long) for_token->offset) { /* first iteration */ - stack_push(&GLOBAL(for_stack), &for_token->offset, sizeof(int)); + if (php3i_stack_int_top(&GLOBAL(for_stack)) != (long) for_token->offset) { /* first iteration */ + php3i_stack_push(&GLOBAL(for_stack), &for_token->offset, sizeof(int)); } if (!for_token->cs_data.switched) { tc_switch(&GLOBAL(token_cache_manager), first_semicolon->offset + 1, close_parentheses->offset - 1, second_semicolon->offset); @@ -628,26 +628,26 @@ tc_set_token(&GLOBAL(token_cache_manager), for_token->offset, CONTINUED_FOR); seek_token(&GLOBAL(token_cache_manager), for_token->offset, yychar); } else { - if (stack_int_top(&GLOBAL(for_stack)) == (long) for_token->offset) { + if (php3i_stack_int_top(&GLOBAL(for_stack)) == (long) for_token->offset) { #if (_DEBUG_ & CONTROL_DEBUG) fprintf(stderr, "Deleting for addr=%d from for stack", for_token->offset); #endif - stack_del_top(&GLOBAL(for_stack)); + php3i_stack_del_top(&GLOBAL(for_stack)); } } GLOBAL(function_state).loop_change_type = DO_NOTHING; GLOBAL(function_state).loop_change_level = 0; } else { - if (stack_int_top(&GLOBAL(for_stack)) == (long) for_token->offset) { + if (php3i_stack_int_top(&GLOBAL(for_stack)) == (long) for_token->offset) { #if (_DEBUG_ & CONTROL_DEBUG) fprintf(stderr, "Deleting for addr=%d from for stack", for_token->offset); #endif - stack_del_top(&GLOBAL(for_stack)); + php3i_stack_del_top(&GLOBAL(for_stack)); } } } - GLOBAL(ExecuteFlag) = stack_int_top(&GLOBAL(css)); - stack_del_top(&GLOBAL(css)); + GLOBAL(ExecuteFlag) = php3i_stack_int_top(&GLOBAL(css)); + php3i_stack_del_top(&GLOBAL(css)); GLOBAL(Execute) = SHOULD_EXECUTE; GLOBAL(function_state).loop_nest_level--; @@ -692,7 +692,7 @@ return; } - stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); + php3i_stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); GLOBAL(php3g_function_state_for_require) = GLOBAL(function_state); if (!include_token->cs_data.included) { @@ -712,8 +712,8 @@ if (GLOBAL(php3_display_source)) { return; } - GLOBAL(ExecuteFlag) = stack_int_top(&GLOBAL(css)); - stack_del_top(&GLOBAL(css)); + GLOBAL(ExecuteFlag) = php3i_stack_int_top(&GLOBAL(css)); + php3i_stack_del_top(&GLOBAL(css)); GLOBAL(function_state) = GLOBAL(php3g_function_state_for_require); GLOBAL(Execute) = SHOULD_EXECUTE; @@ -731,7 +731,7 @@ inline void start_display_source(int start_in_php INLINE_TLS) { php3_header(); - stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); + php3i_stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); GLOBAL(ExecuteFlag) = DONT_EXECUTE; GLOBAL(Execute) = 0; GLOBAL(php3_display_source)=1; @@ -750,7 +750,7 @@ inline void cs_pre_boolean_or(pval *left_expr INLINE_TLS) { - stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); + php3i_stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); if (GLOBAL(Execute) && pval_is_true(left_expr)) { GLOBAL(ExecuteFlag) = DONT_EXECUTE; GLOBAL(Execute) = SHOULD_EXECUTE;; @@ -760,8 +760,8 @@ inline void cs_post_boolean_or(pval *result, pval *left_expr, pval *right_expr INLINE_TLS) { - GLOBAL(ExecuteFlag) = stack_int_top(&GLOBAL(css)); - stack_del_top(&GLOBAL(css)); + GLOBAL(ExecuteFlag) = php3i_stack_int_top(&GLOBAL(css)); + php3i_stack_del_top(&GLOBAL(css)); GLOBAL(Execute) = SHOULD_EXECUTE; if (GLOBAL(Execute)) { boolean_or_function(result, left_expr, right_expr); @@ -771,7 +771,7 @@ inline void cs_pre_boolean_and(pval *left_expr INLINE_TLS) { - stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); + php3i_stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); if (GLOBAL(Execute) && !pval_is_true(left_expr)) { GLOBAL(ExecuteFlag) = DONT_EXECUTE; GLOBAL(Execute) = SHOULD_EXECUTE; @@ -781,8 +781,8 @@ inline void cs_post_boolean_and(pval *result, pval *left_expr, pval *right_expr INLINE_TLS) { - GLOBAL(ExecuteFlag) = stack_int_top(&GLOBAL(css)); - stack_del_top(&GLOBAL(css)); + GLOBAL(ExecuteFlag) = php3i_stack_int_top(&GLOBAL(css)); + php3i_stack_del_top(&GLOBAL(css)); GLOBAL(Execute) = SHOULD_EXECUTE; if (GLOBAL(Execute)) { boolean_and_function(result, left_expr, right_expr); @@ -792,7 +792,7 @@ inline void cs_questionmark_op_pre_expr1(pval *truth_value INLINE_TLS) { - stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); + php3i_stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); if (GLOBAL(Execute) && !pval_is_true(truth_value)) { GLOBAL(ExecuteFlag) = DONT_EXECUTE; GLOBAL(Execute) = SHOULD_EXECUTE; @@ -802,7 +802,7 @@ inline void cs_questionmark_op_pre_expr2(pval *truth_value INLINE_TLS) { - GLOBAL(ExecuteFlag) = stack_int_top(&GLOBAL(css)); + GLOBAL(ExecuteFlag) = php3i_stack_int_top(&GLOBAL(css)); GLOBAL(Execute) = SHOULD_EXECUTE; if (GLOBAL(Execute) && pval_is_true(truth_value)) { GLOBAL(ExecuteFlag) = DONT_EXECUTE; @@ -813,8 +813,8 @@ inline void cs_questionmark_op_post_expr2(pval *result, pval *truth_value, pval *expr1, pval *expr2 INLINE_TLS) { - GLOBAL(ExecuteFlag) = stack_int_top(&GLOBAL(css)); - stack_del_top(&GLOBAL(css)); + GLOBAL(ExecuteFlag) = php3i_stack_int_top(&GLOBAL(css)); + php3i_stack_del_top(&GLOBAL(css)); GLOBAL(Execute) = SHOULD_EXECUTE; if (GLOBAL(Execute)) { if (pval_is_true(truth_value)) { @@ -865,8 +865,8 @@ return; } /* we're gonna call the function... */ - stack_push(&GLOBAL(for_stack), &minus_one, sizeof(int)); - stack_push(&GLOBAL(function_state_stack), &GLOBAL(function_state), sizeof(FunctionState)); /* save function state */ + php3i_stack_push(&GLOBAL(for_stack), &minus_one, sizeof(int)); + php3i_stack_push(&GLOBAL(function_state_stack), &GLOBAL(function_state), sizeof(FunctionState)); /* save function state */ function_name->cs_data.function_call_type = data->type; function_name->offset = data->offset; GLOBAL(function_state).function_symbol_table = (HashTable *) emalloc(sizeof(HashTable)); @@ -916,7 +916,7 @@ inline void cs_functioncall_post_variable_passing(pval *function_name, int *yychar INLINE_TLS) { if (function_name->cs_data.function_call_type) { - stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); + php3i_stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); /* prepare a new function state */ @@ -963,10 +963,10 @@ pval_destructor(function_name _INLINE_TLS); } - while (stack_int_top(&GLOBAL(for_stack)) != -1) { /* pop FOR stack */ - stack_del_top(&GLOBAL(for_stack)); + while (php3i_stack_int_top(&GLOBAL(for_stack)) != -1) { /* pop FOR stack */ + php3i_stack_del_top(&GLOBAL(for_stack)); } - stack_del_top(&GLOBAL(for_stack)); + php3i_stack_del_top(&GLOBAL(for_stack)); /* jump back */ if (GLOBAL(function_state).function_type == IS_USER_FUNCTION) { @@ -974,14 +974,14 @@ } /* get previous function state */ - stack_top(&GLOBAL(function_state_stack), (void **) &fs_ptr); + php3i_stack_top(&GLOBAL(function_state_stack), (void **) &fs_ptr); GLOBAL(function_state) = *fs_ptr; - stack_del_top(&GLOBAL(function_state_stack)); + php3i_stack_del_top(&GLOBAL(function_state_stack)); GLOBAL(active_symbol_table) = GLOBAL(function_state).symbol_table; /* restore execution state */ - GLOBAL(ExecuteFlag) = stack_int_top(&GLOBAL(css)); - stack_del_top(&GLOBAL(css)); + GLOBAL(ExecuteFlag) = php3i_stack_int_top(&GLOBAL(css)); + php3i_stack_del_top(&GLOBAL(css)); GLOBAL(Execute) = SHOULD_EXECUTE; } else { var_reset(result); @@ -994,12 +994,12 @@ switch_expr se; GLOBAL(function_state).loop_nest_level++; - stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); + php3i_stack_push(&GLOBAL(css), &GLOBAL(ExecuteFlag), sizeof(int)); se.expr = *expr; se.offset = switch_token->offset; se.Execute = GLOBAL(Execute); - stack_push(&GLOBAL(switch_stack), &se, sizeof(switch_expr)); + php3i_stack_push(&GLOBAL(switch_stack), &se, sizeof(switch_expr)); } @@ -1011,7 +1011,7 @@ pval expr, result; int is_equal = 0; - stack_top(&GLOBAL(switch_stack), (void **) &se); + php3i_stack_top(&GLOBAL(switch_stack), (void **) &se); if (se->offset != -1) { /* no matched case yet */ /* if case_expr is NULL, we're in the special 'default' case */ if (case_expr) { @@ -1038,7 +1038,7 @@ inline void cs_switch_case_post( INLINE_TLS_VOID) { - GLOBAL(ExecuteFlag) = stack_int_top(&GLOBAL(css)); + GLOBAL(ExecuteFlag) = php3i_stack_int_top(&GLOBAL(css)); GLOBAL(Execute) = SHOULD_EXECUTE; } @@ -1052,15 +1052,15 @@ GLOBAL(function_state).loop_change_type = DO_NOTHING; } } - GLOBAL(ExecuteFlag) = stack_int_top(&GLOBAL(css)); - stack_del_top(&GLOBAL(css)); + GLOBAL(ExecuteFlag) = php3i_stack_int_top(&GLOBAL(css)); + php3i_stack_del_top(&GLOBAL(css)); GLOBAL(Execute) = SHOULD_EXECUTE; - stack_top(&GLOBAL(switch_stack), (void **) &se); + php3i_stack_top(&GLOBAL(switch_stack), (void **) &se); if (se->Execute) { pval_destructor(expr _INLINE_TLS); } - stack_del_top(&GLOBAL(switch_stack)); + php3i_stack_del_top(&GLOBAL(switch_stack)); GLOBAL(function_state).loop_nest_level--; } @@ -1143,7 +1143,7 @@ vt.strlen = array_name->value.str.len; vt.strval = estrndup(array_name->value.str.val,vt.strlen); vt.ht = target_symbol_table; - stack_push(&GLOBAL(variable_unassign_stack),(void *) &vt, sizeof(variable_tracker)); + php3i_stack_push(&GLOBAL(variable_unassign_stack),(void *) &vt, sizeof(variable_tracker)); } else { GLOBAL(array_ptr)->cs_data.array_write=0; } @@ -1227,7 +1227,7 @@ vt.type = IS_LONG; vt.lval = expr->value.lval; vt.ht = arr_ptr->value.ht; - stack_push(&GLOBAL(variable_unassign_stack),(void *) &vt, sizeof(variable_tracker)); + php3i_stack_push(&GLOBAL(variable_unassign_stack),(void *) &vt, sizeof(variable_tracker)); } } else { result->value.varptr.pvalue = localdata; @@ -1250,7 +1250,7 @@ vt.strval = estrndup(expr->value.str.val,expr->value.str.len); vt.strlen = expr->value.str.len; vt.ht = arr_ptr->value.ht; - stack_push(&GLOBAL(variable_unassign_stack),(void *) &vt, sizeof(variable_tracker)); + php3i_stack_push(&GLOBAL(variable_unassign_stack),(void *) &vt, sizeof(variable_tracker)); } } else { result->value.varptr.pvalue = localdata; @@ -1274,7 +1274,7 @@ vt.type = IS_LONG; vt.lval = new_index; vt.ht = arr_ptr->value.ht; - stack_push(&GLOBAL(variable_unassign_stack),(void *) &vt, sizeof(variable_tracker)); + php3i_stack_push(&GLOBAL(variable_unassign_stack),(void *) &vt, sizeof(variable_tracker)); } } } else { @@ -1304,7 +1304,7 @@ { variable_tracker *vt; - if (stack_top(&GLOBAL(variable_unassign_stack),(void **) &vt)==SUCCESS) { + if (php3i_stack_top(&GLOBAL(variable_unassign_stack),(void **) &vt)==SUCCESS) { switch(vt->type) { case IS_LONG: if (delete_var) { @@ -1319,7 +1319,7 @@ break; } } - stack_del_top(&GLOBAL(variable_unassign_stack)); + php3i_stack_del_top(&GLOBAL(variable_unassign_stack)); } @@ -1352,7 +1352,7 @@ vt.strlen = varname->value.str.len; vt.strval = estrndup(varname->value.str.val,vt.strlen); vt.ht = object->value.ht; - stack_push(&GLOBAL(variable_unassign_stack),(void *) &vt, sizeof(variable_tracker)); + php3i_stack_push(&GLOBAL(variable_unassign_stack),(void *) &vt, sizeof(variable_tracker)); result->cs_data.array_write = 1; } else { result->cs_data.array_write = 0; Index: php3/internal_functions.c diff -u php3/internal_functions.c:1.352 php3/internal_functions.c:1.353 --- php3/internal_functions.c:1.352 Sat Jun 12 06:28:34 1999 +++ php3/internal_functions.c Fri Jul 2 12:41:50 1999 @@ -29,7 +29,7 @@ */ -/* $Id: internal_functions.c,v 1.352 1999/06/12 10:28:34 kk Exp $ */ +/* $Id: internal_functions.c,v 1.353 1999/07/02 16:41:50 markonen Exp $ */ #ifdef THREAD_SAFE #include "tls.h" @@ -641,7 +641,9 @@ { TLS_VARS; if (module->type == MODULE_TEMPORARY) { - _php3_hash_apply_with_argument(&GLOBAL(list_destructors), (int (*)(void *,void *)) clean_module_resource_destructors, (void *) &(module->module_number)); + void *mod; + mod = (void *) module->module_number; + _php3_hash_apply_with_argument(&GLOBAL(list_destructors), (int (*)(void *,void *)) clean_module_resource_destructors, &mod); clean_module_constants(module->module_number); } @@ -649,14 +651,14 @@ #if 0 php3_printf("%s: Request shutdown\n",module->name); #endif - module->request_shutdown_func(); + (php3_module_entry *) module->request_shutdown_func(); } module->request_started=0; if (module->module_started && module->module_shutdown_func) { #if 0 php3_printf("%s: Module shutdown\n",module->name); #endif - module->module_shutdown_func(); + (php3_module_entry *) module->module_shutdown_func(); } module->module_started=0; unregister_functions(module->functions,-1); @@ -676,7 +678,7 @@ #if 0 php3_printf("%s: Request startup\n",module->name); #endif - module->request_startup_func(module->type, module->module_number); + (php3_module_entry *) module->request_startup_func(module->type, module->module_number); } module->request_started=1; return 0; @@ -694,7 +696,7 @@ #if 0 php3_printf("%s: Request shutdown\n",module->name); #endif - module->request_shutdown_func(); + (php3_module_entry *) module->request_shutdown_func(); } module->request_started=0; return 0; Index: php3/language-scanner.lex diff -u php3/language-scanner.lex:1.180 php3/language-scanner.lex:1.181 --- php3/language-scanner.lex:1.180 Fri Jun 18 09:04:04 1999 +++ php3/language-scanner.lex Fri Jul 2 12:41:50 1999 @@ -177,7 +177,7 @@ lex_state.in = yyin; GLOBAL(in_eval)=0; - stack_push(&GLOBAL(input_source_stack),&lex_state,sizeof(PHPLexState)); + php3i_stack_push(&GLOBAL(input_source_stack),&lex_state,sizeof(PHPLexState)); oldcs = _php3_sock_set_def_chunk_size(1); tmp = php3_fopen_wrapper(file->value.str.val, "r", USE_PATH|IGNORE_URL_WIN, &issock, &socketd); @@ -188,7 +188,7 @@ if (!tmp) { php3_error(E_ERROR,"Failed opening required '%s'", php3_strip_url_passwd(file->value.str.val)); - stack_del_top(&GLOBAL(input_source_stack)); + php3i_stack_del_top(&GLOBAL(input_source_stack)); return FAILURE; } yyin = tmp; @@ -232,7 +232,7 @@ lex_state.in = yyin; GLOBAL(phplineno) = GLOBAL(current_lineno); GLOBAL(in_eval)=1; - stack_push(&GLOBAL(input_source_stack),&lex_state,sizeof(PHPLexState)); + php3i_stack_push(&GLOBAL(input_source_stack),&lex_state,sizeof(PHPLexState)); yyin=NULL; if (!display_source) { @@ -276,7 +276,7 @@ lex_state.in_eval = GLOBAL(in_eval); lex_state.in = yyin; GLOBAL(in_eval) = 0; - stack_push(&GLOBAL(input_source_stack),&lex_state,sizeof(PHPLexState)); + php3i_stack_push(&GLOBAL(input_source_stack),&lex_state,sizeof(PHPLexState)); oldcs = _php3_sock_set_def_chunk_size(1); tmp = php3_fopen_wrapper(file->value.str.val, "r", USE_PATH|IGNORE_URL_WIN, &issock, &socketd); @@ -287,7 +287,7 @@ if (!tmp) { php3_error(E_WARNING,"Failed opening '%s' for inclusion", php3_strip_url_passwd(file->value.str.val)); - stack_del_top(&GLOBAL(input_source_stack)); + php3i_stack_del_top(&GLOBAL(input_source_stack)); pval_destructor(file _INLINE_TLS); return FAILURE; } @@ -310,14 +310,14 @@ int end_current_file_execution(int *retval) { - if (stack_is_empty(&GLOBAL(input_source_stack))) { + if (php3i_stack_is_empty(&GLOBAL(input_source_stack))) { *retval = 0; return 1; } else { PHPLexState *lex_state; yy_delete_buffer(YY_CURRENT_BUFFER); - stack_top(&GLOBAL(input_source_stack),(void **) &lex_state); + php3i_stack_top(&GLOBAL(input_source_stack),(void **) &lex_state); GLOBAL(phplineno) = lex_state->lineno; GLOBAL(in_eval) = lex_state->in_eval; @@ -337,7 +337,7 @@ #endif BEGIN(lex_state->state); yy_switch_to_buffer(lex_state->buffer_state); - stack_del_top(&GLOBAL(input_source_stack)); + php3i_stack_del_top(&GLOBAL(input_source_stack)); *retval = DONE_EVAL; return 1; break; @@ -346,25 +346,25 @@ BEGIN(lex_state->state); yy_switch_to_buffer(lex_state->buffer_state); STR_FREE(lex_state->eval_string); - stack_del_top(&GLOBAL(input_source_stack)); + php3i_stack_del_top(&GLOBAL(input_source_stack)); *retval = DONE_EVAL; return 1; break; case LEX_STATE_HIGHLIGHT_STRING: GLOBAL(php3_display_source)=0; - GLOBAL(ExecuteFlag) = stack_int_top(&GLOBAL(css)); - stack_del_top(&GLOBAL(css)); + GLOBAL(ExecuteFlag) = php3i_stack_int_top(&GLOBAL(css)); + php3i_stack_del_top(&GLOBAL(css)); GLOBAL(Execute) = SHOULD_EXECUTE; END_COLOR(); BEGIN(lex_state->state); yy_switch_to_buffer(lex_state->buffer_state); STR_FREE(lex_state->eval_string); - stack_del_top(&GLOBAL(input_source_stack)); + php3i_stack_del_top(&GLOBAL(input_source_stack)); break; case LEX_STATE_HIGHLIGHT_FILE: GLOBAL(php3_display_source)=0; - GLOBAL(ExecuteFlag) = stack_int_top(&GLOBAL(css)); - stack_del_top(&GLOBAL(css)); + GLOBAL(ExecuteFlag) = php3i_stack_int_top(&GLOBAL(css)); + php3i_stack_del_top(&GLOBAL(css)); GLOBAL(Execute) = SHOULD_EXECUTE; END_COLOR(); /* break missing intentionally */ @@ -381,7 +381,7 @@ #endif BEGIN(lex_state->state); yy_switch_to_buffer(lex_state->buffer_state); - stack_del_top(&GLOBAL(input_source_stack)); + php3i_stack_del_top(&GLOBAL(input_source_stack)); break; } } @@ -398,7 +398,7 @@ if (yyin) { fclose(yyin); } - while (stack_top(&GLOBAL(input_source_stack), (void **) &lex_state) != FAILURE) { + while (php3i_stack_top(&GLOBAL(input_source_stack), (void **) &lex_state) != FAILURE) { switch(lex_state->type) { case LEX_STATE_EVAL: case LEX_STATE_HIGHLIGHT_STRING: @@ -410,9 +410,9 @@ } yy_delete_buffer(YY_CURRENT_BUFFER); yy_switch_to_buffer(lex_state->buffer_state); - stack_del_top(&GLOBAL(input_source_stack)); + php3i_stack_del_top(&GLOBAL(input_source_stack)); } - stack_destroy(&GLOBAL(input_source_stack)); + php3i_stack_destroy(&GLOBAL(input_source_stack)); GLOBAL(initialized) &= ~INIT_INCLUDE_STACK; } Index: php3/main.c diff -u php3/main.c:1.501 php3/main.c:1.502 --- php3/main.c:1.501 Sat Jun 19 15:06:19 1999 +++ php3/main.c Fri Jul 2 12:41:50 1999 @@ -29,7 +29,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.501 1999/06/19 19:06:19 sas Exp $ */ +/* $Id: main.c,v 1.502 1999/07/02 16:41:50 markonen Exp $ */ /* #define CRASH_DETECTION */ @@ -691,37 +691,37 @@ GLOBAL(initialized) |= INIT_TOKEN_CACHE; /* initialize stacks */ - if (stack_init(&GLOBAL(css)) == FAILURE) { + if (php3i_stack_init(&GLOBAL(css)) == FAILURE) { php3_printf("Unable to initialize Control Structure stack.\n"); return FAILURE; } GLOBAL(initialized) |= INIT_CSS; - if (stack_init(&GLOBAL(for_stack)) == FAILURE) { + if (php3i_stack_init(&GLOBAL(for_stack)) == FAILURE) { php3_printf("Unable to initialize for stack.\n"); return FAILURE; } GLOBAL(initialized) |= INIT_FOR_STACK; - if (stack_init(&GLOBAL(switch_stack)) == FAILURE) { + if (php3i_stack_init(&GLOBAL(switch_stack)) == FAILURE) { php3_printf("Unable to initialize switch stack.\n"); return FAILURE; } GLOBAL(initialized) |= INIT_SWITCH_STACK; - if (stack_init(&GLOBAL(input_source_stack)) == FAILURE) { + if (php3i_stack_init(&GLOBAL(input_source_stack)) == FAILURE) { php3_printf("Unable to initialize include stack.\n"); return FAILURE; } GLOBAL(initialized) |= INIT_INCLUDE_STACK; - if (stack_init(&GLOBAL(function_state_stack)) == FAILURE) { + if (php3i_stack_init(&GLOBAL(function_state_stack)) == FAILURE) { php3_printf("Unable to initialize function state stack.\n"); return FAILURE; } GLOBAL(initialized) |= INIT_FUNCTION_STATE_STACK; - if (stack_init(&GLOBAL(variable_unassign_stack)) == FAILURE) { + if (php3i_stack_init(&GLOBAL(variable_unassign_stack)) == FAILURE) { php3_printf("Unable to initialize variable unassignment stack.\n"); return FAILURE; } @@ -804,23 +804,23 @@ } if (GLOBAL(initialized) & INIT_CSS) { SHUTDOWN_DEBUG("Control Structures Stack"); - stack_destroy(&GLOBAL(css)); + php3i_stack_destroy(&GLOBAL(css)); GLOBAL(initialized) &= ~INIT_CSS; } if (GLOBAL(initialized) & INIT_FOR_STACK) { SHUTDOWN_DEBUG("For stack"); - stack_destroy(&GLOBAL(for_stack)); + php3i_stack_destroy(&GLOBAL(for_stack)); GLOBAL(initialized) &= ~INIT_FOR_STACK; } if (GLOBAL(initialized) & INIT_SWITCH_STACK) { switch_expr *se; SHUTDOWN_DEBUG("Switch stack"); - while (stack_top(&GLOBAL(switch_stack), (void **) &se) != FAILURE) { + while (php3i_stack_top(&GLOBAL(switch_stack), (void **) &se) != FAILURE) { pval_destructor(&se->expr _INLINE_TLS); - stack_del_top(&GLOBAL(switch_stack)); + php3i_stack_del_top(&GLOBAL(switch_stack)); } - stack_destroy(&GLOBAL(switch_stack)); + php3i_stack_destroy(&GLOBAL(switch_stack)); GLOBAL(initialized) &= ~INIT_SWITCH_STACK; } @@ -835,7 +835,7 @@ */ SHUTDOWN_DEBUG("Function state stack"); - while (stack_top(&GLOBAL(function_state_stack), (void **) &tmp) != FAILURE) { + while (php3i_stack_top(&GLOBAL(function_state_stack), (void **) &tmp) != FAILURE) { if (tmp->function_name) { efree(tmp->function_name); if (tmp->symbol_table @@ -846,7 +846,7 @@ last_symbol_table = tmp->symbol_table; } } - stack_del_top(&GLOBAL(function_state_stack)); + php3i_stack_del_top(&GLOBAL(function_state_stack)); } if (GLOBAL(function_state).function_name) { efree(GLOBAL(function_state).function_name); @@ -857,7 +857,7 @@ efree(GLOBAL(function_state).symbol_table); } } - stack_destroy(&GLOBAL(function_state_stack)); + php3i_stack_destroy(&GLOBAL(function_state_stack)); GLOBAL(initialized) &= ~INIT_FUNCTION_STATE_STACK; } @@ -865,13 +865,13 @@ variable_tracker *tmp; SHUTDOWN_DEBUG("Variable unassign stack"); - while (stack_top(&GLOBAL(variable_unassign_stack), (void **) &tmp) != FAILURE) { + while (php3i_stack_top(&GLOBAL(variable_unassign_stack), (void **) &tmp) != FAILURE) { if (tmp->type == IS_STRING) { STR_FREE(tmp->strval); } - stack_del_top(&GLOBAL(variable_unassign_stack)); + php3i_stack_del_top(&GLOBAL(variable_unassign_stack)); } - stack_destroy(&GLOBAL(variable_unassign_stack)); + php3i_stack_destroy(&GLOBAL(variable_unassign_stack)); GLOBAL(initialized) &= ~INIT_VARIABLE_UNASSIGN_STACK; } Index: php3/php.h diff -u php3/php.h:1.57 php3/php.h:1.58 --- php3/php.h:1.57 Wed Jun 30 20:03:52 1999 +++ php3/php.h Fri Jul 2 12:41:51 1999 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.57 1999/07/01 00:03:52 sas Exp $ */ +/* $Id: php.h,v 1.58 1999/07/02 16:41:51 markonen Exp $ */ #ifndef _PHP_H #define _PHP_H @@ -259,7 +259,7 @@ #define UNBLOCK_INTERRUPTIONS #endif -#if (!HAVE_SNPRINTF) +#ifndef HAVE_SNPRINTF #define snprintf ap_snprintf #define vsnprintf ap_vsnprintf extern int ap_snprintf(char *, size_t, const char *, ...); Index: php3/stack.c diff -u php3/stack.c:1.17 php3/stack.c:1.18 --- php3/stack.c:1.17 Fri Jan 1 12:58:52 1999 +++ php3/stack.c Fri Jul 2 12:41:51 1999 @@ -29,12 +29,12 @@ */ -/* $Id: stack.c,v 1.17 1999/01/01 17:58:52 zeev Exp $ */ +/* $Id: stack.c,v 1.18 1999/07/02 16:41:51 markonen Exp $ */ #include "php.h" -int stack_init(Stack *stack) +int php3i_stack_init(Stack *stack) { stack->top = 0; stack->elements = (void **) emalloc(sizeof(void **) * STACK_BLOCK_SIZE); @@ -46,7 +46,7 @@ } } -int stack_push(Stack *stack, void *element, int size) +int php3i_stack_push(Stack *stack, void *element, int size) { if (stack->top >= stack->max) { /* we need to allocate more memory */ stack->elements = (void **) erealloc(stack->elements, @@ -61,7 +61,7 @@ } -int stack_top(Stack *stack, void **element) +int php3i_stack_top(Stack *stack, void **element) { if (stack->top > 0) { *element = stack->elements[stack->top - 1]; @@ -73,7 +73,7 @@ } -int stack_del_top(Stack *stack) +int php3i_stack_del_top(Stack *stack) { if (stack->top > 0) { efree(stack->elements[--stack->top]); @@ -81,11 +81,11 @@ return SUCCESS; } -int stack_int_top(Stack *stack) +int php3i_stack_int_top(Stack *stack) { int *e; - if (stack_top(stack, (void **) &e) == FAILURE) { + if (php3i_stack_top(stack, (void **) &e) == FAILURE) { return FAILURE; /* this must be a negative number, since negative numbers can't be address numbers */ } else { return *e; @@ -93,7 +93,7 @@ } -int stack_is_empty(Stack *stack) +int php3i_stack_is_empty(Stack *stack) { if (stack->top == 0) { return 1; @@ -103,7 +103,7 @@ } -int stack_destroy(Stack *stack) +int php3i_stack_destroy(Stack *stack) { register int i; Index: php3/stack.h diff -u php3/stack.h:1.14 php3/stack.h:1.15 --- php3/stack.h:1.14 Fri Jan 1 12:58:52 1999 +++ php3/stack.h Fri Jul 2 12:41:51 1999 @@ -29,7 +29,7 @@ */ -/* $Id: stack.h,v 1.14 1999/01/01 17:58:52 zeev Exp $ */ +/* $Id: stack.h,v 1.15 1999/07/02 16:41:51 markonen Exp $ */ #ifndef _STACK_H @@ -43,12 +43,12 @@ #define STACK_BLOCK_SIZE 64 -extern int stack_init(Stack *stack); -extern int stack_push(Stack *stack, void *element, int size); -extern int stack_top(Stack *stack, void **element); -extern int stack_del_top(Stack *stack); -extern int stack_int_top(Stack *stack); -extern int stack_is_empty(Stack *stack); -extern int stack_destroy(Stack *stack); +extern int php3i_stack_init(Stack *stack); +extern int php3i_stack_push(Stack *stack, void *element, int size); +extern int php3i_stack_top(Stack *stack, void **element); +extern int php3i_stack_del_top(Stack *stack); +extern int php3i_stack_int_top(Stack *stack); +extern int php3i_stack_is_empty(Stack *stack); +extern int php3i_stack_destroy(Stack *stack); #endif Index: php3/variables.c diff -u php3/variables.c:1.160 php3/variables.c:1.161 --- php3/variables.c:1.160 Fri Jan 1 12:58:52 1999 +++ php3/variables.c Fri Jul 2 12:41:51 1999 @@ -29,7 +29,7 @@ */ -/* $Id: variables.c,v 1.160 1999/01/01 17:58:52 zeev Exp $ */ +/* $Id: variables.c,v 1.161 1999/07/02 16:41:51 markonen Exp $ */ #ifdef THREAD_SAFE #include "tls.h" @@ -216,7 +216,7 @@ if (func && (var_ptr->cs_data.array_write || (var->type==IS_STRING && var->value.str.val==undefined_variable_string))) { variable_tracker *vt; - if (stack_top(&GLOBAL(variable_unassign_stack),(void **) &vt)==SUCCESS) { + if (php3i_stack_top(&GLOBAL(variable_unassign_stack),(void **) &vt)==SUCCESS) { switch(vt->type) { case IS_STRING: php3_error(E_NOTICE,"Uninitialized variable or array index or property (%s)",vt->strval); @@ -368,7 +368,7 @@ if (var_ptr->cs_data.array_write || (var->type==IS_STRING && var->value.str.val==undefined_variable_string)) { variable_tracker *vt; - if (stack_top(&GLOBAL(variable_unassign_stack),(void **) &vt)==SUCCESS) { + if (php3i_stack_top(&GLOBAL(variable_unassign_stack),(void **) &vt)==SUCCESS) { switch(vt->type) { case IS_STRING: php3_error(E_NOTICE,"Uninitialized variable or array index or property (%s)",vt->strval); @@ -637,7 +637,7 @@ if (var_ptr->cs_data.array_write || (var->type==IS_STRING && var->value.str.val==undefined_variable_string)) { variable_tracker *vt; - if (stack_top(&GLOBAL(variable_unassign_stack),(void **) &vt)==SUCCESS) { + if (php3i_stack_top(&GLOBAL(variable_unassign_stack),(void **) &vt)==SUCCESS) { switch(vt->type) { case IS_STRING: php3_error(E_NOTICE,"Uninitialized variable or array index or property (%s)",vt->strval); @@ -692,7 +692,7 @@ vt.strlen = varname->value.str.len; vt.strval = estrndup(varname->value.str.val,vt.strlen); vt.ht = GLOBAL(active_symbol_table); - stack_push(&GLOBAL(variable_unassign_stack),(void *) &vt, sizeof(variable_tracker)); + php3i_stack_push(&GLOBAL(variable_unassign_stack),(void *) &vt, sizeof(variable_tracker)); result->cs_data.array_write = 1; } else { result->cs_data.array_write = 0;