cvs: /php4 Makefile.in internal_functions.c.in php.h /php4/ext/standard array.c assert.c basic_functions.c basic_functions.h browscap.c crypt.c dir.c
dl.c dl.h file.c file.h filestat.c fsock.c fsock.h head.c head.h lcg.c mail.c metaphone.c output.c pack.c pack.h php_array.h php_assert.h
php_browscap.h php_crypt.h php_dir.h php_filestat.h php_lcg.h php_mail.h php_metaphone.h php_output.h php_standard.h php_syslog.h reg.c reg.h syslog.c

ssb Mon Mar 6 12:37:12 2000 EDT Modified files: /php4 Makefile.in internal_functions.c.in php.h /php4/ext/standard array.c assert.c basic_functions.c basic_functions.h browscap.c crypt.c dir.c dl.c dl.h file.c file.h filestat.c fsock.c fsock.h head.c head.h lcg.c mail.c metaphone.c output.c pack.c pack.h php_array.h php_assert.h php_browscap.h php_crypt.h php_dir.h php_filestat.h php_lcg.h php_mail.h php_metaphone.h php_output.h php_standard.h php_syslog.h reg.c reg.h syslog.c Log: @Cleaned up extension namespace (Stig) Cleaned up extension namespace, and changed ext/standard into one single extension. Index: php4/Makefile.in diff -u php4/Makefile.in:1.75 php4/Makefile.in:1.76 --- php4/Makefile.in:1.75 Fri Feb 25 13:27:02 2000 +++ php4/Makefile.in Mon Mar 6 12:37:11 2000 @@ -51,4 +51,7 @@ configuration-scanner.c: configuration-scanner.l $(LEX) -Pcfg -o$@ -i $< +internal_functions.c: internal_functions.c.in config.status + CONFIG_FILES= CONFIG_HEADERS= ./config.status + .NOEXPORT: Index: php4/internal_functions.c.in diff -u php4/internal_functions.c.in:1.12 php4/internal_functions.c.in:1.13 --- php4/internal_functions.c.in:1.12 Fri Dec 31 17:31:27 1999 +++ php4/internal_functions.c.in Mon Mar 6 12:37:11 2000 @@ -1,4 +1,4 @@ -/* +/* -*- C -*- +----------------------------------------------------------------------+ | PHP version 4.0 | +----------------------------------------------------------------------+ @@ -18,7 +18,7 @@ */ -/* $Id: internal_functions.c.in,v 1.12 2000/01/01 01:31:27 sas Exp $ */ +/* $Id: internal_functions.c.in,v 1.13 2000/03/06 20:37:11 ssb Exp $ */ #include "php.h" #include "main.h" @@ -40,23 +40,6 @@ unsigned char second_arg_allow_ref[] = { 2, BYREF_NONE, BYREF_ALLOW }; zend_module_entry *php_builtin_extensions[] = { - phpext_regex_ptr, - phpext_dl_ptr, - phpext_file_ptr, - phpext_fsock_ptr, - phpext_head_ptr, - phpext_pack_ptr, - phpext_browscap_ptr, - phpext_crypt_ptr, - phpext_dir_ptr, - phpext_filestat_ptr, - phpext_mail_ptr, - phpext_syslog_ptr, - phpext_lcg_ptr, - phpext_metaphone_ptr, - phpext_output_ptr, - phpext_array_ptr, - phpext_assert_ptr, @EXT_MODULE_PTRS@ }; Index: php4/php.h diff -u php4/php.h:1.67 php4/php.h:1.68 --- php4/php.h:1.67 Sat Mar 4 11:58:59 2000 +++ php4/php.h Mon Mar 6 12:37:11 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.67 2000/03/04 19:58:59 andi Exp $ */ +/* $Id: php.h,v 1.68 2000/03/06 20:37:11 ssb Exp $ */ #ifndef _PHP_H #define _PHP_H @@ -233,8 +233,8 @@ #define PHP_RINIT_FUNCTION(module) int PHP_RINIT(module)(INIT_FUNC_ARGS) #define PHP_RSHUTDOWN_FUNCTION(module) int PHP_RSHUTDOWN(module)(SHUTDOWN_FUNC_ARGS) #define PHP_MINFO_FUNCTION(module) void PHP_MINFO(module)(ZEND_MODULE_INFO_FUNC_ARGS) -#define PHP_GINIT_FUNCTION(module) static int PHP_GINIT(module)(void) -#define PHP_GSHUTDOWN_FUNCTION(module) static int PHP_GSHUTDOWN(module)(void) +#define PHP_GINIT_FUNCTION(module) int PHP_GINIT(module)(GINIT_FUNC_ARGS) +#define PHP_GSHUTDOWN_FUNCTION(module) int PHP_GSHUTDOWN(module)(void) /* global variables */ Index: php4/ext/standard/array.c diff -u php4/ext/standard/array.c:1.32 php4/ext/standard/array.c:1.33 --- php4/ext/standard/array.c:1.32 Fri Feb 25 13:27:03 2000 +++ php4/ext/standard/array.c Mon Mar 6 12:37:11 2000 @@ -14,6 +14,8 @@ +----------------------------------------------------------------------+ | Authors: Andi Gutmans <andi@zend.com> | | Zeev Suraski <zeev@zend.com> | + | Rasmus Lerdorf <rasmus@php.net> | + | Andrei Zmievski <andrei@ispi.net> | +----------------------------------------------------------------------+ */ @@ -51,64 +53,6 @@ #define SORT_DESC -1 #define SORT_ASC 1 - -function_entry array_functions[] = { - PHP_FE(ksort, first_arg_force_ref) - PHP_FE(krsort, first_arg_force_ref) - PHP_FE(asort, first_arg_force_ref) - PHP_FE(arsort, first_arg_force_ref) - PHP_FE(sort, first_arg_force_ref) - PHP_FE(rsort, first_arg_force_ref) - PHP_FE(usort, first_arg_force_ref) - PHP_FE(uasort, first_arg_force_ref) - PHP_FE(uksort, first_arg_force_ref) - PHP_FE(shuffle, first_arg_force_ref) - PHP_FE(array_walk, first_arg_force_ref) - PHP_FE(count, first_arg_allow_ref) - PHP_FE(end, first_arg_force_ref) - PHP_FE(prev, first_arg_force_ref) - PHP_FE(next, first_arg_force_ref) - PHP_FE(reset, first_arg_force_ref) - PHP_FE(current, first_arg_force_ref) - PHP_FE(key, first_arg_force_ref) - PHP_FE(min, NULL) - PHP_FE(max, NULL) - PHP_FE(in_array, NULL) - PHP_FE(extract, NULL) - PHP_FE(compact, NULL) - PHP_FE(range, NULL) - PHP_FE(array_multisort, NULL) - PHP_FE(array_push, first_arg_force_ref) - PHP_FE(array_pop, first_arg_force_ref) - PHP_FE(array_shift, first_arg_force_ref) - PHP_FE(array_unshift, first_arg_force_ref) - PHP_FE(array_splice, first_arg_force_ref) - PHP_FE(array_slice, NULL) - PHP_FE(array_merge, NULL) - PHP_FE(array_keys, NULL) - PHP_FE(array_values, NULL) - PHP_FE(array_count_values, NULL) - PHP_FE(array_reverse, NULL) - PHP_FE(array_pad, NULL) - PHP_FE(array_flip, NULL) - - /* Aliases */ - PHP_FALIAS(pos, current, first_arg_force_ref) - PHP_FALIAS(sizeof, count, first_arg_allow_ref) - - {NULL, NULL, NULL} -}; - -zend_module_entry array_module_entry = { - "Array Functions", /* extension name */ - array_functions, /* function list */ - PHP_MINIT(array), /* process startup */ - PHP_MSHUTDOWN(array), /* process shutdown */ - NULL, /* request startup */ - NULL, /* request shutdown */ - NULL, /* extension info */ - STANDARD_MODULE_PROPERTIES -}; PHP_MINIT_FUNCTION(array) { Index: php4/ext/standard/assert.c diff -u php4/ext/standard/assert.c:1.16 php4/ext/standard/assert.c:1.17 --- php4/ext/standard/assert.c:1.16 Thu Feb 24 06:26:51 2000 +++ php4/ext/standard/assert.c Mon Mar 6 12:37:11 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: assert.c,v 1.16 2000/02/24 14:26:51 eschmid Exp $ */ +/* $Id: assert.c,v 1.17 2000/03/06 20:37:11 ssb Exp $ */ /* {{{ includes/startup/misc */ @@ -52,33 +52,6 @@ #endif #define SAFE_STRING(s) ((s)?(s):"") - -PHP_MINIT_FUNCTION(assert); -PHP_MSHUTDOWN_FUNCTION(assert); -PHP_RINIT_FUNCTION(assert); -PHP_RSHUTDOWN_FUNCTION(assert); -PHP_MINFO_FUNCTION(assert); - -PHP_FUNCTION(assert); -PHP_FUNCTION(assert_options); - -static zend_function_entry php_assert_functions[] = { - PHP_FE(assert, NULL) - PHP_FE(assert_options, NULL) - {NULL, NULL, NULL} -}; - - -zend_module_entry assert_module_entry = { - "Assertion", - php_assert_functions, - PHP_MINIT(assert), - PHP_MSHUTDOWN(assert), - PHP_RINIT(assert), - PHP_RSHUTDOWN(assert), - PHP_MINFO(assert), - STANDARD_MODULE_PROPERTIES -}; #define ASSERT_ACTIVE 1 #define ASSERT_CALLBACK 2 Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.172 php4/ext/standard/basic_functions.c:1.173 --- php4/ext/standard/basic_functions.c:1.172 Mon Mar 6 10:41:17 2000 +++ php4/ext/standard/basic_functions.c Mon Mar 6 12:37:11 2000 @@ -59,9 +59,8 @@ #endif static unsigned char second_and_third_args_force_ref[] = { 3, BYREF_NONE, BYREF_FORCE, BYREF_FORCE }; -/* uncomment this if/when we actually need it - tired of seeing the warning +static unsigned char third_argument_force_ref[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE }; static unsigned char third_and_fourth_args_force_ref[] = { 4, BYREF_NONE, BYREF_NONE, BYREF_FORCE, BYREF_FORCE }; -*/ ; typedef struct _php_shutdown_function_entry { @@ -311,6 +310,177 @@ PHP_FE(parse_ini_file, NULL) + /* functions from reg.c */ + PHP_FE(ereg, third_argument_force_ref) + PHP_FE(ereg_replace, NULL) + PHP_FE(eregi, third_argument_force_ref) + PHP_FE(eregi_replace, NULL) + PHP_FE(split, NULL) + PHP_FALIAS(join, implode, NULL) + PHP_FE(sql_regcase, NULL) + + /* functions from dl.c */ + PHP_FE(dl, NULL) + + /* functions from file.c */ + PHP_FE(pclose, NULL) + PHP_FE(popen, NULL) + PHP_FE(readfile, NULL) + PHP_FE(rewind, NULL) + PHP_FE(rmdir, NULL) + PHP_FE(umask, NULL) + PHP_FE(fclose, NULL) + PHP_FE(feof, NULL) + PHP_FE(fgetc, NULL) + PHP_FE(fgets, NULL) + PHP_FE(fgetss, NULL) + PHP_FE(fread, NULL) + PHP_FE(fopen, NULL) + PHP_FE(fpassthru, NULL) + PHP_FE(ftruncate, NULL) + PHP_FE(fstat, NULL) + PHP_FE(fseek, NULL) + PHP_FE(ftell, NULL) + PHP_FE(fwrite, NULL) + PHP_FALIAS(fputs, fwrite, NULL) + PHP_FE(mkdir, NULL) + PHP_FE(rename, NULL) + PHP_FE(copy, NULL) + PHP_FE(tempnam, NULL) + PHP_FE(tmpfile, NULL) + PHP_FE(file, NULL) + PHP_FE(fgetcsv, NULL) + PHP_FE(flock, NULL) + PHP_FE(get_meta_tags, NULL) + /* set_socket_blocking() is deprecated, + use socket_set_blocking() instead */ + PHP_FE(set_socket_blocking, NULL) + PHP_FE(socket_set_blocking, NULL) +#if HAVE_SYS_TIME_H + PHP_FE(socket_set_timeout, NULL) +#endif + PHP_FE(socket_get_status, NULL) + PHP_FE(realpath, NULL) + + /* functions from fsock.c */ + PHP_FE(fsockopen, third_and_fourth_args_force_ref) + PHP_FE(pfsockopen, third_and_fourth_args_force_ref) + + /* functions from pack.c */ + PHP_FE(pack, NULL) + PHP_FE(unpack, NULL) + + /* functions from browscap.c */ + PHP_FE(get_browser, NULL) + + /* functions from crypt.c */ + PHP_FE(crypt, NULL) + + /* functions from dir.c */ + PHP_FE(opendir, NULL) + PHP_FE(closedir, NULL) + PHP_FE(chdir, NULL) + PHP_FE(getcwd, NULL) + PHP_FE(rewinddir, NULL) + PHP_FE(readdir, NULL) + PHP_FALIAS(dir, getdir, NULL) + + /* functions from filestat.c */ + PHP_FE(fileatime, NULL) + PHP_FE(filectime, NULL) + PHP_FE(filegroup, NULL) + PHP_FE(fileinode, NULL) + PHP_FE(filemtime, NULL) + PHP_FE(fileowner, NULL) + PHP_FE(fileperms, NULL) + PHP_FE(filesize, NULL) + PHP_FE(filetype, NULL) + PHP_FE(file_exists, NULL) + PHP_FE(is_writable, NULL) + PHP_FALIAS(is_writeable, is_writable, NULL) + PHP_FE(is_readable, NULL) + PHP_FE(is_executable, NULL) + PHP_FE(is_file, NULL) + PHP_FE(is_dir, NULL) + PHP_FE(is_link, NULL) + PHP_FE(stat, NULL) + PHP_FE(lstat, NULL) + PHP_FE(chown, NULL) + PHP_FE(chgrp, NULL) + PHP_FE(chmod, NULL) + PHP_FE(touch, NULL) + PHP_FE(clearstatcache, NULL) + PHP_FE(diskfreespace, NULL) + + /* functions from mail.c */ + PHP_FE(mail, NULL) + + /* functions from syslog.c */ + PHP_FE(openlog, NULL) + PHP_FE(syslog, NULL) + PHP_FE(closelog, NULL) + PHP_FE(define_syslog_variables, NULL) + + /* functions from lcg.c */ + PHP_FE(lcg_value, NULL) + + /* functions from metaphone.c */ + PHP_FE(metaphone, NULL) + + /* functions from output.c */ + PHP_FE(ob_start, NULL) + PHP_FE(ob_end_flush, NULL) + PHP_FE(ob_end_clean, NULL) + PHP_FE(ob_get_contents, NULL) + PHP_FE(ob_implicit_flush, NULL) + + /* functions from array.c */ + PHP_FE(ksort, first_arg_force_ref) + PHP_FE(krsort, first_arg_force_ref) + PHP_FE(asort, first_arg_force_ref) + PHP_FE(arsort, first_arg_force_ref) + PHP_FE(sort, first_arg_force_ref) + PHP_FE(rsort, first_arg_force_ref) + PHP_FE(usort, first_arg_force_ref) + PHP_FE(uasort, first_arg_force_ref) + PHP_FE(uksort, first_arg_force_ref) + PHP_FE(shuffle, first_arg_force_ref) + PHP_FE(array_walk, first_arg_force_ref) + PHP_FE(count, first_arg_allow_ref) + PHP_FE(end, first_arg_force_ref) + PHP_FE(prev, first_arg_force_ref) + PHP_FE(next, first_arg_force_ref) + PHP_FE(reset, first_arg_force_ref) + PHP_FE(current, first_arg_force_ref) + PHP_FE(key, first_arg_force_ref) + PHP_FE(min, NULL) + PHP_FE(max, NULL) + PHP_FE(in_array, NULL) + PHP_FE(extract, NULL) + PHP_FE(compact, NULL) + PHP_FE(range, NULL) + PHP_FE(array_multisort, NULL) + PHP_FE(array_push, first_arg_force_ref) + PHP_FE(array_pop, first_arg_force_ref) + PHP_FE(array_shift, first_arg_force_ref) + PHP_FE(array_unshift, first_arg_force_ref) + PHP_FE(array_splice, first_arg_force_ref) + PHP_FE(array_slice, NULL) + PHP_FE(array_merge, NULL) + PHP_FE(array_keys, NULL) + PHP_FE(array_values, NULL) + PHP_FE(array_count_values, NULL) + PHP_FE(array_reverse, NULL) + PHP_FE(array_pad, NULL) + PHP_FE(array_flip, NULL) + /* aliases from array.c */ + PHP_FALIAS(pos, current, first_arg_force_ref) + PHP_FALIAS(sizeof, count, first_arg_allow_ref) + + /* functions from assert.c */ + PHP_FE(assert, NULL) + PHP_FE(assert_options, NULL) + {NULL, NULL, NULL} }; @@ -359,8 +529,10 @@ PHP_MSHUTDOWN(basic), /* process shutdown */ PHP_RINIT(basic), /* request startup */ PHP_RSHUTDOWN(basic), /* request shutdown */ - NULL, /* extension info */ - STANDARD_MODULE_PROPERTIES + PHP_MINFO(basic), /* extension info */ + PHP_GINIT(basic), /* global startup function */ + NULL, /* global shutdown function */ + STANDARD_MODULE_PROPERTIES_EX }; #if defined(HAVE_PUTENV) @@ -426,6 +598,18 @@ register_phpinfo_constants(INIT_FUNC_ARGS_PASSTHRU); register_html_constants(INIT_FUNC_ARGS_PASSTHRU); + + PHP_MINIT(regex)(INIT_FUNC_ARGS_PASSTHRU); + PHP_MINIT(file)(INIT_FUNC_ARGS_PASSTHRU); + PHP_MINIT(fsock)(INIT_FUNC_ARGS_PASSTHRU); + PHP_MINIT(pack)(INIT_FUNC_ARGS_PASSTHRU); + PHP_MINIT(browscap)(INIT_FUNC_ARGS_PASSTHRU); + PHP_MINIT(crypt)(INIT_FUNC_ARGS_PASSTHRU); + PHP_MINIT(dir)(INIT_FUNC_ARGS_PASSTHRU); + PHP_MINIT(syslog)(INIT_FUNC_ARGS_PASSTHRU); + PHP_MINIT(array)(INIT_FUNC_ARGS_PASSTHRU); + PHP_MINIT(assert)(INIT_FUNC_ARGS_PASSTHRU); + return SUCCESS; } @@ -441,6 +625,13 @@ #endif UNREGISTER_INI_ENTRIES(); + + PHP_MSHUTDOWN(regex)(SHUTDOWN_FUNC_ARGS_PASSTHRU); + PHP_MSHUTDOWN(fsock)(SHUTDOWN_FUNC_ARGS_PASSTHRU); + PHP_MSHUTDOWN(browscap)(SHUTDOWN_FUNC_ARGS_PASSTHRU); + PHP_MSHUTDOWN(array)(SHUTDOWN_FUNC_ARGS_PASSTHRU); + PHP_MSHUTDOWN(assert)(SHUTDOWN_FUNC_ARGS_PASSTHRU); + return SUCCESS; } @@ -462,6 +653,12 @@ } #endif BG(user_shutdown_function_names)=NULL; + + PHP_RINIT(head)(INIT_FUNC_ARGS_PASSTHRU); + PHP_RINIT(filestat)(INIT_FUNC_ARGS_PASSTHRU); + PHP_RINIT(syslog)(INIT_FUNC_ARGS_PASSTHRU); + PHP_RINIT(assert)(INIT_FUNC_ARGS_PASSTHRU); + return SUCCESS; } @@ -481,9 +678,30 @@ } STR_FREE(BG(locale_string)); + PHP_RSHUTDOWN(fsock)(SHUTDOWN_FUNC_ARGS_PASSTHRU); + PHP_RSHUTDOWN(filestat)(SHUTDOWN_FUNC_ARGS_PASSTHRU); + PHP_RSHUTDOWN(syslog)(SHUTDOWN_FUNC_ARGS_PASSTHRU); + PHP_RSHUTDOWN(assert)(SHUTDOWN_FUNC_ARGS_PASSTHRU); + return SUCCESS; } + +PHP_GINIT_FUNCTION(basic) +{ + PHP_GINIT(output)(GINIT_FUNC_ARGS_PASSTHRU); + + return SUCCESS; +} + + +PHP_MINFO_FUNCTION(basic) +{ + PHP_MINFO(regex)(ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU); + PHP_MINFO(dl)(ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU); + PHP_MINFO(mail)(ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU); + PHP_MINFO(assert)(ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU); +} PHP_FUNCTION(ip2long) { Index: php4/ext/standard/basic_functions.h diff -u php4/ext/standard/basic_functions.h:1.49 php4/ext/standard/basic_functions.h:1.50 --- php4/ext/standard/basic_functions.h:1.49 Sat Mar 4 09:28:16 2000 +++ php4/ext/standard/basic_functions.h Mon Mar 6 12:37:11 2000 @@ -29,7 +29,7 @@ */ -/* $Id: basic_functions.h,v 1.49 2000/03/04 17:28:16 andrei Exp $ */ +/* $Id: basic_functions.h,v 1.50 2000/03/06 20:37:11 ssb Exp $ */ #ifndef _BASIC_FUNCTIONS_H #define _BASIC_FUNCTIONS_H @@ -45,6 +45,8 @@ PHP_MSHUTDOWN_FUNCTION(basic); PHP_RINIT_FUNCTION(basic); PHP_RSHUTDOWN_FUNCTION(basic); +PHP_MINFO_FUNCTION(basic); +PHP_GINIT_FUNCTION(basic); PHP_FUNCTION(intval); PHP_FUNCTION(doubleval); Index: php4/ext/standard/browscap.c diff -u php4/ext/standard/browscap.c:1.24 php4/ext/standard/browscap.c:1.25 --- php4/ext/standard/browscap.c:1.24 Sun Feb 27 12:23:31 2000 +++ php4/ext/standard/browscap.c Mon Mar 6 12:37:11 2000 @@ -29,17 +29,6 @@ static pval *found_browser_entry; #endif -function_entry browscap_functions[] = { - PHP_FE(get_browser, NULL) - {NULL, NULL, NULL} -}; - -zend_module_entry browscap_module_entry = { - "browscap", browscap_functions, PHP_MINIT(browscap), PHP_MSHUTDOWN(browscap), - NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES -}; - - static int browser_reg_compare(zval **browser) { pval *browser_name; Index: php4/ext/standard/crypt.c diff -u php4/ext/standard/crypt.c:1.20 php4/ext/standard/crypt.c:1.21 --- php4/ext/standard/crypt.c:1.20 Fri Feb 25 19:20:54 2000 +++ php4/ext/standard/crypt.c Mon Mar 6 12:37:11 2000 @@ -17,7 +17,7 @@ | Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: crypt.c,v 1.20 2000/02/26 03:20:54 zeev Exp $ */ +/* $Id: crypt.c,v 1.21 2000/03/06 20:37:11 ssb Exp $ */ #include <stdlib.h> #include "php.h" @@ -47,16 +47,6 @@ #endif #include "php_crypt.h" - -function_entry crypt_functions[] = { - PHP_FE(crypt, NULL) - {NULL, NULL, NULL} -}; - -zend_module_entry crypt_module_entry = { - "Crypt", crypt_functions, PHP_MINIT(crypt), NULL, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES -}; - /* The capabilities of the crypt() function is determined by the test programs Index: php4/ext/standard/dir.c diff -u php4/ext/standard/dir.c:1.29 php4/ext/standard/dir.c:1.30 --- php4/ext/standard/dir.c:1.29 Thu Feb 24 01:32:50 2000 +++ php4/ext/standard/dir.c Mon Mar 6 12:37:11 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dir.c,v 1.29 2000/02/24 09:32:50 thies Exp $ */ +/* $Id: dir.c,v 1.30 2000/03/06 20:37:11 ssb Exp $ */ /* {{{ includes/startup/misc */ @@ -82,18 +82,6 @@ ZEND_FETCH_RESOURCE(dirp,php_dir *,id,-1, "Directory", le_dirp); \ } -static zend_function_entry php_dir_functions[] = { - PHP_FE(opendir, NULL) - PHP_FE(closedir, NULL) - PHP_FE(chdir, NULL) - PHP_FE(getcwd, NULL) - PHP_FE(rewinddir, NULL) - PHP_FE(readdir, NULL) - PHP_FALIAS(dir, getdir, NULL) - {NULL, NULL, NULL} -}; - - static zend_function_entry php_dir_class_functions[] = { PHP_FALIAS(close, closedir, NULL) PHP_FALIAS(rewind, rewinddir, NULL) @@ -101,10 +89,6 @@ {NULL, NULL, NULL} }; - -zend_module_entry php_dir_module_entry = { - "PHP_dir", php_dir_functions, PHP_MINIT(dir), NULL, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES -}; static void _dir_dtor(php_dir *dirp) { Index: php4/ext/standard/dl.c diff -u php4/ext/standard/dl.c:1.25 php4/ext/standard/dl.c:1.26 --- php4/ext/standard/dl.c:1.25 Sat Feb 19 15:41:20 2000 +++ php4/ext/standard/dl.c Mon Mar 6 12:37:11 2000 @@ -40,21 +40,11 @@ #include <sys/param.h> #endif -function_entry dl_functions[] = { - {"dl", dl, NULL}, - {NULL, NULL, NULL} -}; - - -zend_module_entry dl_module_entry = { - "PHP_DL", dl_functions, NULL, NULL, NULL, NULL, PHP_MINFO(dl), STANDARD_MODULE_PROPERTIES -}; - #endif /* {{{ proto int dl(string extension_filename) Load a PHP extension at runtime */ -void dl(INTERNAL_FUNCTION_PARAMETERS) +PHP_FUNCTION(dl) { pval **file; PLS_FETCH(); @@ -161,7 +151,7 @@ PHP_MINFO_FUNCTION(dl) { - PUTS("Dynamic Library support enabled.\n"); + PUTS("Dynamic Library support enabled<br>.\n"); } #else @@ -170,6 +160,11 @@ { php_error(E_WARNING,"Cannot dynamically load %s - dynamic modules are not supported",file->value.str.val); RETURN_FALSE; +} + +PHP_MINFO_FUNCTION(dl) +{ + PUTS("Dynamic Library support not available<br>.\n"); } #endif Index: php4/ext/standard/dl.h diff -u php4/ext/standard/dl.h:1.8 php4/ext/standard/dl.h:1.9 --- php4/ext/standard/dl.h:1.8 Fri Dec 17 12:55:24 1999 +++ php4/ext/standard/dl.h Mon Mar 6 12:37:11 2000 @@ -30,32 +30,21 @@ */ -/* $Id: dl.h,v 1.8 1999/12/17 20:55:24 zeev Exp $ */ +/* $Id: dl.h,v 1.9 2000/03/06 20:37:11 ssb Exp $ */ #ifndef _DL_H #define _DL_H void php_dl(pval *file,int type,pval *return_value); - #ifdef HAVE_LIBDL -extern zend_module_entry dl_module_entry; -#define dl_module_ptr &dl_module_entry - /* dynamic loading functions */ -void dl(INTERNAL_FUNCTION_PARAMETERS); -extern PHP_MINIT_FUNCTION(dl); -extern PHP_MSHUTDOWN_FUNCTION(dl); -extern PHP_RSHUTDOWN_FUNCTION(dl); +PHP_FUNCTION(dl); PHP_MINFO_FUNCTION(dl); #else -#define dl_module_ptr NULL - #endif - -#define phpext_dl_ptr dl_module_ptr #endif /* _DL_H */ Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.68 php4/ext/standard/file.c:1.69 --- php4/ext/standard/file.c:1.68 Sat Mar 4 09:23:03 2000 +++ php4/ext/standard/file.c Mon Mar 6 12:37:11 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.68 2000/03/04 17:23:03 andrei Exp $ */ +/* $Id: file.c,v 1.69 2000/03/06 20:37:11 ssb Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -213,65 +213,6 @@ /* }}} */ /* {{{ Module-Stuff */ -function_entry file_functions[] = { - PHP_FE(pclose, NULL) - PHP_FE(popen, NULL) - PHP_FE(readfile, NULL) - PHP_FE(rewind, NULL) - PHP_FE(rmdir, NULL) - PHP_FE(umask, NULL) - PHP_FE(fclose, NULL) - PHP_FE(feof, NULL) - PHP_FE(fgetc, NULL) - PHP_FE(fgets, NULL) - PHP_FE(fgetss, NULL) - PHP_FE(fread, NULL) - PHP_FE(fopen, NULL) - PHP_FE(fpassthru, NULL) - PHP_FE(ftruncate, NULL) - PHP_FE(fstat, NULL) - PHP_FE(fseek, NULL) - PHP_FE(ftell, NULL) - PHP_FE(fwrite, NULL) - PHP_FALIAS(fputs, fwrite, NULL) - PHP_FE(mkdir, NULL) - PHP_FE(rename, NULL) - PHP_FE(copy, NULL) - PHP_FE(tempnam, NULL) - PHP_FE(tmpfile, NULL) - PHP_FE(file, NULL) - PHP_FE(fgetcsv, NULL) - PHP_FE(flock, NULL) - PHP_FE(get_meta_tags, NULL) - /* set_socket_blocking() is deprecated, - use socket_set_blocking() instead */ - PHP_FE(set_socket_blocking, NULL) - PHP_FE(socket_set_blocking, NULL) -#if HAVE_SYS_TIME_H - PHP_FE(socket_set_timeout, NULL) -#endif - PHP_FE(socket_get_status, NULL) - PHP_FE(realpath, NULL) -#if 0 /* needs to be rethought 991221 thies@digicol.de */ - PHP_FE(fd_set, NULL) - PHP_FE(fd_isset, NULL) - PHP_FE(select, NULL) -#endif - {NULL, NULL, NULL} -}; - -zend_module_entry file_module_entry = { - "File functions", - file_functions, - PHP_MINIT(file), - NULL, - NULL, - NULL, - NULL, - STANDARD_MODULE_PROPERTIES -}; - - static void _file_popen_dtor(FILE *pipe) { FIL_FETCH(); @@ -1931,3 +1872,10 @@ } #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + */ Index: php4/ext/standard/file.h diff -u php4/ext/standard/file.h:1.18 php4/ext/standard/file.h:1.19 --- php4/ext/standard/file.h:1.18 Sat Mar 4 09:23:03 2000 +++ php4/ext/standard/file.h Mon Mar 6 12:37:11 2000 @@ -27,16 +27,13 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.h,v 1.18 2000/03/04 17:23:03 andrei Exp $ */ +/* $Id: file.h,v 1.19 2000/03/06 20:37:11 ssb Exp $ */ /* Synced with php 3.0 revision 1.30 1999-06-16 [ssb] */ #ifndef _FILE_H #define _FILE_H -extern zend_module_entry file_module_entry; -#define file_module_ptr &file_module_entry - extern PHP_MINIT_FUNCTION(file); PHP_FUNCTION(tempnam); @@ -82,5 +79,4 @@ PHPAPI int php_file_le_socket(void); PHPAPI int php_file_le_uploads(void); -#define phpext_file_ptr file_module_ptr #endif /* _FILE_H */ Index: php4/ext/standard/filestat.c diff -u php4/ext/standard/filestat.c:1.25 php4/ext/standard/filestat.c:1.26 --- php4/ext/standard/filestat.c:1.25 Sat Feb 19 15:41:20 2000 +++ php4/ext/standard/filestat.c Mon Mar 6 12:37:11 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filestat.c,v 1.25 2000/02/19 23:41:20 zeev Exp $ */ +/* $Id: filestat.c,v 1.26 2000/03/06 20:37:11 ssb Exp $ */ #include "php.h" #include "safe_mode.h" @@ -69,7 +69,7 @@ # endif #endif -#include "ext/standard/basic_functions.h" +#include "basic_functions.h" #include "php_filestat.h" @@ -564,41 +564,6 @@ FileFunction(PHP_FN(file_exists),15) FileFunction(PHP_FN(lstat),16) FileFunction(PHP_FN(stat),17) - -function_entry php_filestat_functions[] = { - PHP_FE(fileatime, NULL) - PHP_FE(filectime, NULL) - PHP_FE(filegroup, NULL) - PHP_FE(fileinode, NULL) - PHP_FE(filemtime, NULL) - PHP_FE(fileowner, NULL) - PHP_FE(fileperms, NULL) - PHP_FE(filesize, NULL) - PHP_FE(filetype, NULL) - PHP_FE(file_exists, NULL) - PHP_FE(is_writable, NULL) - PHP_FALIAS(is_writeable, is_writable, NULL) - PHP_FE(is_readable, NULL) - PHP_FE(is_executable, NULL) - PHP_FE(is_file, NULL) - PHP_FE(is_dir, NULL) - PHP_FE(is_link, NULL) - PHP_FE(stat, NULL) - PHP_FE(lstat, NULL) - PHP_FE(chown, NULL) - PHP_FE(chgrp, NULL) - PHP_FE(chmod, NULL) - PHP_FE(touch, NULL) - PHP_FE(clearstatcache, NULL) - PHP_FE(diskfreespace, NULL) - {NULL, NULL, NULL} -}; - - -zend_module_entry php_filestat_module_entry = { - "PHP_filestat", php_filestat_functions, NULL, NULL, PHP_RINIT(filestat), - PHP_RSHUTDOWN(filestat), NULL, STANDARD_MODULE_PROPERTIES -}; /* * Local variables: Index: php4/ext/standard/fsock.c diff -u php4/ext/standard/fsock.c:1.47 php4/ext/standard/fsock.c:1.48 --- php4/ext/standard/fsock.c:1.47 Sat Feb 19 15:41:21 2000 +++ php4/ext/standard/fsock.c Mon Mar 6 12:37:11 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fsock.c,v 1.47 2000/02/19 23:41:21 zeev Exp $ */ +/* $Id: fsock.c,v 1.48 2000/03/06 20:37:11 ssb Exp $ */ /* Synced with php 3.0 revision 1.121 1999-06-18 [ssb] */ /* Synced with php 3.0 revision 1.133 1999-07-21 [sas] */ @@ -94,27 +94,6 @@ #else #include "build-defs.h" #endif - -static unsigned char third_and_fourth_args_force_ref[] = { 4, BYREF_NONE, BYREF_NONE, BYREF_FORCE, BYREF_FORCE }; - -function_entry fsock_functions[] = { - PHP_FE(fsockopen, third_and_fourth_args_force_ref) - PHP_FE(pfsockopen, third_and_fourth_args_force_ref) - {NULL, NULL, NULL} -}; - - -zend_module_entry fsock_module_entry = { - "Socket functions", - fsock_functions, - PHP_MINIT(fsock), - PHP_MSHUTDOWN(fsock), - NULL, - PHP_RSHUTDOWN(fsock), - NULL, - STANDARD_MODULE_PROPERTIES -}; - /* {{{ lookup_hostname */ Index: php4/ext/standard/fsock.h diff -u php4/ext/standard/fsock.h:1.26 php4/ext/standard/fsock.h:1.27 --- php4/ext/standard/fsock.h:1.26 Fri Feb 11 07:59:29 2000 +++ php4/ext/standard/fsock.h Mon Mar 6 12:37:11 2000 @@ -27,7 +27,7 @@ | Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: fsock.h,v 1.26 2000/02/11 15:59:29 zeev Exp $ */ +/* $Id: fsock.h,v 1.27 2000/03/06 20:37:11 ssb Exp $ */ /* Synced with php 3.0 revision 1.24 1999-06-18 [ssb] */ @@ -54,9 +54,6 @@ #ifdef HAVE_SYS_TIME_H #include <sys/time.h> #endif - -extern zend_module_entry fsock_module_entry; -#define phpext_fsock_ptr &fsock_module_entry struct php_sockbuf { int socket; Index: php4/ext/standard/head.c diff -u php4/ext/standard/head.c:1.29 php4/ext/standard/head.c:1.30 --- php4/ext/standard/head.c:1.29 Sat Feb 19 15:41:21 2000 +++ php4/ext/standard/head.c Mon Mar 6 12:37:11 2000 @@ -15,7 +15,7 @@ | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: head.c,v 1.29 2000/02/19 23:41:21 zeev Exp $ */ +/* $Id: head.c,v 1.30 2000/03/06 20:37:11 ssb Exp $ */ #include <stdio.h> #include "php.h" @@ -267,15 +267,6 @@ RETURN_FALSE; } } - -function_entry php_header_functions[] = { - {NULL, NULL, NULL} -}; - - -zend_module_entry php_header_module_entry = { - "PHP_head", php_header_functions, NULL, NULL, PHP_RINIT(head), NULL, NULL, STANDARD_MODULE_PROPERTIES -}; /* * Local variables: Index: php4/ext/standard/head.h diff -u php4/ext/standard/head.h:1.12 php4/ext/standard/head.h:1.13 --- php4/ext/standard/head.h:1.12 Fri Feb 25 19:20:54 2000 +++ php4/ext/standard/head.h Mon Mar 6 12:37:11 2000 @@ -49,9 +49,6 @@ struct CookieList *next; } CookieList; -extern zend_module_entry php_header_module_entry; -#define php_header_module_ptr &php_header_module_entry - extern PHP_RINIT_FUNCTION(head); PHP_FUNCTION(Header); PHP_FUNCTION(setcookie); @@ -61,7 +58,5 @@ PHPAPI int php_header(void); int php_headers_unsent(void); - -#define phpext_head_ptr php_header_module_ptr #endif Index: php4/ext/standard/lcg.c diff -u php4/ext/standard/lcg.c:1.10 php4/ext/standard/lcg.c:1.11 --- php4/ext/standard/lcg.c:1.10 Thu Feb 24 00:07:29 2000 +++ php4/ext/standard/lcg.c Mon Mar 6 12:37:11 2000 @@ -69,7 +69,7 @@ #endif } -static int php_minit_lcg(INIT_FUNC_ARGS) +PHP_MINIT_FUNCTION(lcg) { #ifdef ZTS lcg_globals_id = ts_allocate_id(sizeof(php_lcg_globals), (ts_allocate_ctor) lcg_init_globals, NULL); @@ -86,17 +86,3 @@ RETURN_DOUBLE(php_combined_lcg()); } /* }}} */ - -static function_entry lcg_functions[] = { - PHP_FE(lcg_value, NULL) - {0} -}; - -zend_module_entry lcg_module_entry = { - "LCG", - lcg_functions, - php_minit_lcg, NULL, - NULL, NULL, - NULL, - STANDARD_MODULE_PROPERTIES -}; Index: php4/ext/standard/mail.c diff -u php4/ext/standard/mail.c:1.19 php4/ext/standard/mail.c:1.20 --- php4/ext/standard/mail.c:1.19 Sat Feb 19 15:41:21 2000 +++ php4/ext/standard/mail.c Mon Mar 6 12:37:11 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mail.c,v 1.19 2000/02/19 23:41:21 zeev Exp $ */ +/* $Id: mail.c,v 1.20 2000/03/06 20:37:11 ssb Exp $ */ #include <stdlib.h> #include <ctype.h> @@ -32,16 +32,6 @@ #ifdef PHP_WIN32 #include "win32/sendmail.h" #endif - -function_entry mail_functions[] = { - PHP_FE(mail, NULL) - {NULL, NULL, NULL} -}; - -zend_module_entry mail_module_entry = { - "Sendmail", mail_functions, NULL, NULL, NULL, NULL, PHP_MINFO(mail), STANDARD_MODULE_PROPERTIES -}; - #if COMPILE_DL DLEXPORT zend_module_entry *get_module(void) { return &odbc_module_entry; } Index: php4/ext/standard/metaphone.c diff -u php4/ext/standard/metaphone.c:1.7 php4/ext/standard/metaphone.c:1.8 --- php4/ext/standard/metaphone.c:1.7 Sat Mar 4 06:22:15 2000 +++ php4/ext/standard/metaphone.c Mon Mar 6 12:37:11 2000 @@ -26,23 +26,6 @@ PHP_FUNCTION(metaphone); -function_entry metaphone_functions[] = { - PHP_FE(metaphone, NULL) - {0}, -}; - -zend_module_entry metaphone_module_entry = -{ - "Metaphone", - metaphone_functions, - NULL, - NULL, - NULL, - NULL, - NULL, - STANDARD_MODULE_PROPERTIES, -}; - /* metaphone -- Breaks english phrases down into their phonemes. */ PHP_FUNCTION(metaphone) { @@ -472,3 +455,10 @@ return 0; } /* END metaphone */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + */ Index: php4/ext/standard/output.c diff -u php4/ext/standard/output.c:1.17 php4/ext/standard/output.c:1.18 --- php4/ext/standard/output.c:1.17 Sat Feb 19 15:41:21 2000 +++ php4/ext/standard/output.c Mon Mar 6 12:37:11 2000 @@ -64,14 +64,6 @@ php_output_globals output_globals; #endif - -PHP_FUNCTION(ob_start); -PHP_FUNCTION(ob_end_flush); -PHP_FUNCTION(ob_end_clean); -PHP_FUNCTION(ob_get_contents); -PHP_FUNCTION(ob_implicit_flush); - - static void php_output_init_globals(OLS_D) { OG(php_body_write) = NULL; @@ -96,32 +88,6 @@ return SUCCESS; } - -static zend_function_entry php_output_functions[] = { - PHP_FE(ob_start, NULL) - PHP_FE(ob_end_flush, NULL) - PHP_FE(ob_end_clean, NULL) - PHP_FE(ob_get_contents, NULL) - PHP_FE(ob_implicit_flush, NULL) - {NULL, NULL, NULL} -}; - -PHP_RINIT_FUNCTION(output); -PHP_RSHUTDOWN_FUNCTION(output); - -zend_module_entry output_module_entry = { - "PHP_output", - php_output_functions, - NULL, /* extension-wide startup function */ - NULL, /* extension-wide shutdown function */ - NULL, /* per-request startup function */ - NULL, /* per-request shutdown function */ - NULL, /* information function */ - PHP_GINIT(output), /* global startup function */ - NULL, /* global shutdown function */ - STANDARD_MODULE_PROPERTIES_EX -}; - /* Start output layer */ PHPAPI void php_output_startup() Index: php4/ext/standard/pack.c diff -u php4/ext/standard/pack.c:1.18 php4/ext/standard/pack.c:1.19 --- php4/ext/standard/pack.c:1.18 Thu Feb 24 02:11:42 2000 +++ php4/ext/standard/pack.c Mon Mar 6 12:37:11 2000 @@ -15,7 +15,7 @@ | Authors: Chris Schneider <cschneid@relog.ch> | +----------------------------------------------------------------------+ */ -/* $Id: pack.c,v 1.18 2000/02/24 10:11:42 eschmid Exp $ */ +/* $Id: pack.c,v 1.19 2000/03/06 20:37:11 ssb Exp $ */ #include "php.h" @@ -49,16 +49,6 @@ #if HAVE_NETINET_IN_H #include <netinet/in.h> #endif - -function_entry pack_functions[] = { - PHP_FE(pack, NULL) - PHP_FE(unpack, NULL) - {NULL, NULL, NULL} -}; - -zend_module_entry pack_module_entry = { - "PHP_pack", pack_functions, PHP_MINIT(pack), NULL, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES -}; /* Whether machine is little endian */ char machine_little_endian; Index: php4/ext/standard/pack.h diff -u php4/ext/standard/pack.h:1.5 php4/ext/standard/pack.h:1.6 --- php4/ext/standard/pack.h:1.5 Fri Dec 17 12:55:24 1999 +++ php4/ext/standard/pack.h Mon Mar 6 12:37:11 2000 @@ -27,18 +27,13 @@ +----------------------------------------------------------------------+ */ -/* $Id: pack.h,v 1.5 1999/12/17 20:55:24 zeev Exp $ */ +/* $Id: pack.h,v 1.6 2000/03/06 20:37:11 ssb Exp $ */ #ifndef _PACK_H #define _PACK_H -extern zend_module_entry pack_module_entry; -#define pack_module_ptr &pack_module_entry - extern PHP_MINIT_FUNCTION(pack); PHP_FUNCTION(pack); PHP_FUNCTION(unpack); - -#define phpext_pack_ptr pack_module_ptr #endif /* _PACK_H */ Index: php4/ext/standard/php_array.h diff -u php4/ext/standard/php_array.h:1.5 php4/ext/standard/php_array.h:1.6 --- php4/ext/standard/php_array.h:1.5 Mon Dec 13 11:42:26 1999 +++ php4/ext/standard/php_array.h Mon Mar 6 12:37:11 2000 @@ -1,40 +1,29 @@ -/* +/* +----------------------------------------------------------------------+ - | PHP HTML Embedded Scripting Language Version 3.0 | + | PHP version 4.0 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-1999 PHP Development Team (See Credits file) | + | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group | +----------------------------------------------------------------------+ - | This program is free software; you can redistribute it and/or modify | - | it under the terms of one of the following licenses: | - | | - | A) the GNU General Public License as published by the Free Software | - | Foundation; either version 2 of the License, or (at your option) | - | any later version. | - | | - | B) the PHP License as published by the PHP Development Team and | - | included in the distribution in the file: LICENSE | - | | - | This program is distributed in the hope that it will be useful, | - | but WITHOUT ANY WARRANTY; without even the implied warranty of | - | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | - | GNU General Public License for more details. | - | | - | You should have received a copy of both licenses referred to here. | - | If you did not, or have any questions about PHP licensing, please | - | contact core@php.net. | + | This source file is subject to version 2.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available at through the world-wide-web at | + | http://www.php.net/license/2_01.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Rasmus Lerdorf <rasmus@lerdorf.on.ca> | + | Authors: Andi Gutmans <andi@zend.com> | + | Zeev Suraski <zeev@zend.com> | + | Rasmus Lerdorf <rasmus@php.net> | + | Andrei Zmievski <andrei@ispi.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_array.h,v 1.5 1999/12/13 19:42:26 andrei Exp $ */ +/* $Id: php_array.h,v 1.6 2000/03/06 20:37:11 ssb Exp $ */ #ifndef _PHP_ARRAY_H #define _PHP_ARRAY_H -extern zend_module_entry array_module_entry; -#define array_module_ptr &array_module_entry - PHP_MINIT_FUNCTION(array); PHP_MSHUTDOWN_FUNCTION(array); @@ -102,5 +91,4 @@ extern php_array_globals array_globals; #endif -#define phpext_array_ptr array_module_ptr #endif /* _PHP_ARRAY_H */ Index: php4/ext/standard/php_assert.h diff -u php4/ext/standard/php_assert.h:1.3 php4/ext/standard/php_assert.h:1.4 --- php4/ext/standard/php_assert.h:1.3 Sat Feb 19 15:41:21 2000 +++ php4/ext/standard/php_assert.h Mon Mar 6 12:37:11 2000 @@ -16,13 +16,17 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_assert.h,v 1.3 2000/02/19 23:41:21 zeev Exp $ */ +/* $Id: php_assert.h,v 1.4 2000/03/06 20:37:11 ssb Exp $ */ #ifndef _PHP_ASSERT_H #define _PHP_ASSERT_H -extern zend_module_entry assert_module_entry; -#define phpext_assert_ptr &assert_module_entry - +PHP_MINIT_FUNCTION(assert); +PHP_MSHUTDOWN_FUNCTION(assert); +PHP_RINIT_FUNCTION(assert); +PHP_RSHUTDOWN_FUNCTION(assert); +PHP_MINFO_FUNCTION(assert); +PHP_FUNCTION(assert); +PHP_FUNCTION(assert_options); #endif /* _PHP_ASSERT_H */ Index: php4/ext/standard/php_browscap.h diff -u php4/ext/standard/php_browscap.h:1.2 php4/ext/standard/php_browscap.h:1.3 --- php4/ext/standard/php_browscap.h:1.2 Fri Dec 17 12:55:24 1999 +++ php4/ext/standard/php_browscap.h Mon Mar 6 12:37:11 2000 @@ -31,15 +31,9 @@ #ifndef _PHP_BROWSCAP_H #define _PHP_BROWSCAP_H -extern zend_module_entry browscap_module_entry; -#define browscap_module_ptr &browscap_module_entry - extern PHP_MINIT_FUNCTION(browscap); extern PHP_MSHUTDOWN_FUNCTION(browscap); PHP_FUNCTION(get_browser); - - -#define phpext_browscap_ptr browscap_module_ptr #endif /* _PHP_BROWSCAP_H */ Index: php4/ext/standard/php_crypt.h diff -u php4/ext/standard/php_crypt.h:1.2 php4/ext/standard/php_crypt.h:1.3 --- php4/ext/standard/php_crypt.h:1.2 Fri Dec 17 12:55:24 1999 +++ php4/ext/standard/php_crypt.h Mon Mar 6 12:37:11 2000 @@ -1,15 +1,36 @@ +/* + +----------------------------------------------------------------------+ + | PHP version 4.0 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 2.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available at through the world-wide-web at | + | http://www.php.net/license/2_01.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Authors: Stig Bakken <ssb@gaurdian.no> | + | Zeev Suraski <zeev@zend.com> | + | Rasmus Lerdorf <rasmus@lerdorf.on.ca> | + +----------------------------------------------------------------------+ + */ + #ifndef PHP_CRYPT_H #define PHP_CRYPT_H #if HAVE_CRYPT -extern zend_module_entry crypt_module_entry; -#define crypt_module_ptr &crypt_module_entry PHP_FUNCTION(crypt); extern PHP_MINIT_FUNCTION(crypt); -#else -#define crypt_module_ptr NULL #endif -#define phpext_crypt_ptr crypt_module_ptr - #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + */ Index: php4/ext/standard/php_dir.h diff -u php4/ext/standard/php_dir.h:1.5 php4/ext/standard/php_dir.h:1.6 --- php4/ext/standard/php_dir.h:1.5 Sat Feb 19 15:41:21 2000 +++ php4/ext/standard/php_dir.h Mon Mar 6 12:37:11 2000 @@ -17,12 +17,10 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dir.h,v 1.5 2000/02/19 23:41:21 zeev Exp $ */ +/* $Id: php_dir.h,v 1.6 2000/03/06 20:37:11 ssb Exp $ */ #ifndef _PHP_DIR_H #define _PHP_DIR_H -extern zend_module_entry php_dir_module_entry; -#define php_dir_module_ptr &php_dir_module_entry /* directory functions */ extern PHP_MINIT_FUNCTION(dir); @@ -33,7 +31,5 @@ PHP_FUNCTION(rewinddir); PHP_FUNCTION(readdir); PHP_FUNCTION(getdir); - -#define phpext_dir_ptr php_dir_module_ptr #endif /* _PHP_DIR_H */ Index: php4/ext/standard/php_filestat.h diff -u php4/ext/standard/php_filestat.h:1.4 php4/ext/standard/php_filestat.h:1.5 --- php4/ext/standard/php_filestat.h:1.4 Fri Dec 17 20:01:14 1999 +++ php4/ext/standard/php_filestat.h Mon Mar 6 12:37:11 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_filestat.h,v 1.4 1999/12/18 04:01:14 zeev Exp $ */ +/* $Id: php_filestat.h,v 1.5 2000/03/06 20:37:11 ssb Exp $ */ #ifndef _FILESTAT_H #define _FILESTAT_H @@ -60,10 +60,5 @@ PHP_FUNCTION(chmod); PHP_FUNCTION(touch); PHP_FUNCTION(clearstatcache); - -extern zend_module_entry php_filestat_module_entry; -#define php_filestat_module_ptr &php_filestat_module_entry - -#define phpext_filestat_ptr php_filestat_module_ptr #endif /* _FILESTAT_H */ Index: php4/ext/standard/php_lcg.h diff -u php4/ext/standard/php_lcg.h:1.4 php4/ext/standard/php_lcg.h:1.5 --- php4/ext/standard/php_lcg.h:1.4 Sat Feb 19 15:41:21 2000 +++ php4/ext/standard/php_lcg.h Mon Mar 6 12:37:11 2000 @@ -26,6 +26,7 @@ double php_combined_lcg(void); PHP_FUNCTION(lcg_value); +PHP_MINIT_FUNCTION(lcg); #ifdef ZTS #define LCGLS_D php_lcg_globals *lcg_globals @@ -36,8 +37,5 @@ #define LCG(v) (lcg_globals.v) #define LCGLS_FETCH() #endif - -extern zend_module_entry lcg_module_entry; -#define phpext_lcg_ptr &lcg_module_entry #endif Index: php4/ext/standard/php_mail.h diff -u php4/ext/standard/php_mail.h:1.3 php4/ext/standard/php_mail.h:1.4 --- php4/ext/standard/php_mail.h:1.3 Fri Dec 17 20:01:14 1999 +++ php4/ext/standard/php_mail.h Mon Mar 6 12:37:11 2000 @@ -28,22 +28,17 @@ */ -/* $Id: php_mail.h,v 1.3 1999/12/18 04:01:14 zeev Exp $ */ +/* $Id: php_mail.h,v 1.4 2000/03/06 20:37:11 ssb Exp $ */ #ifndef _MAIL_H #define _MAIL_H + #if HAVE_SENDMAIL -extern zend_module_entry mail_module_entry; -#define mail_module_ptr &mail_module_entry PHP_FUNCTION(mail); PHP_MINFO_FUNCTION(mail); extern int php_mail(char *to, char *subject, char *message, char *headers); -#else -#define mail_module_ptr NULL #endif - -#define phpext_mail_ptr mail_module_ptr #endif /* _MAIL_H */ Index: php4/ext/standard/php_metaphone.h diff -u php4/ext/standard/php_metaphone.h:1.5 php4/ext/standard/php_metaphone.h:1.6 --- php4/ext/standard/php_metaphone.h:1.5 Sat Mar 4 20:25:12 2000 +++ php4/ext/standard/php_metaphone.h Mon Mar 6 12:37:11 2000 @@ -12,16 +12,15 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Thies C. Arntzen <thies@digicol.de> | + | Authors: Thies C. Arntzen <thies@digicol.de> | +----------------------------------------------------------------------+ */ -/* $Id: php_metaphone.h,v 1.5 2000/03/05 04:25:12 andrei Exp $ */ +/* $Id: php_metaphone.h,v 1.6 2000/03/06 20:37:11 ssb Exp $ */ #ifndef _php_metaphone_h #define _php_metaphone_h -extern zend_module_entry metaphone_module_entry; -#define phpext_metaphone_ptr &metaphone_module_entry +PHP_FUNCTION(metaphone); #endif Index: php4/ext/standard/php_output.h diff -u php4/ext/standard/php_output.h:1.6 php4/ext/standard/php_output.h:1.7 --- php4/ext/standard/php_output.h:1.6 Sat Feb 19 15:41:21 2000 +++ php4/ext/standard/php_output.h Mon Mar 6 12:37:11 2000 @@ -33,7 +33,12 @@ PHPAPI char *php_get_output_start_filename(); PHPAPI int php_get_output_start_lineno(); -extern zend_module_entry output_module_entry; -#define phpext_output_ptr &output_module_entry +PHP_FUNCTION(ob_start); +PHP_FUNCTION(ob_end_flush); +PHP_FUNCTION(ob_end_clean); +PHP_FUNCTION(ob_get_contents); +PHP_FUNCTION(ob_implicit_flush); + +PHP_GINIT_FUNCTION(output); #endif /* _OUTPUT_BUFFER */ Index: php4/ext/standard/php_standard.h diff -u php4/ext/standard/php_standard.h:1.2 php4/ext/standard/php_standard.h:1.3 --- php4/ext/standard/php_standard.h:1.2 Fri Jan 28 05:31:12 2000 +++ php4/ext/standard/php_standard.h Mon Mar 6 12:37:11 2000 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_standard.h,v 1.2 2000/01/28 13:31:12 zeev Exp $ */ +/* $Id: php_standard.h,v 1.3 2000/03/06 20:37:11 ssb Exp $ */ #include "basic_functions.h" #include "phpmath.h" @@ -63,6 +63,11 @@ #include "dl.h" #include "php_crypt.h" #include "head.h" +#include "php_lcg.h" +#include "php_metaphone.h" +#include "php_output.h" +#include "php_array.h" +#include "php_assert.h" #define phpext_standard_ptr basic_functions_module_ptr Index: php4/ext/standard/php_syslog.h diff -u php4/ext/standard/php_syslog.h:1.2 php4/ext/standard/php_syslog.h:1.3 --- php4/ext/standard/php_syslog.h:1.2 Fri Dec 17 12:55:24 1999 +++ php4/ext/standard/php_syslog.h Mon Mar 6 12:37:11 2000 @@ -23,8 +23,7 @@ | If you did not, or have any questions about PHP licensing, please | | contact core@php.net. | +----------------------------------------------------------------------+ - | Authors: | - | | + | Authors: Stig Sæther Bakken <ssb@fast.no> | +----------------------------------------------------------------------+ */ @@ -32,8 +31,6 @@ #define _PHP_SYSLOG_H #if HAVE_SYSLOG_H -extern zend_module_entry syslog_module_entry; -#define syslog_module_ptr &syslog_module_entry extern PHP_MINIT_FUNCTION(syslog); extern PHP_RINIT_FUNCTION(syslog); @@ -44,10 +41,6 @@ PHP_FUNCTION(closelog); PHP_FUNCTION(define_syslog_variables); -#else -#define syslog_module_ptr NULL #endif - -#define phpext_syslog_ptr syslog_module_ptr #endif /* _PHP_SYSLOG_H */ Index: php4/ext/standard/reg.c diff -u php4/ext/standard/reg.c:1.32 php4/ext/standard/reg.c:1.33 --- php4/ext/standard/reg.c:1.32 Thu Feb 24 02:11:42 2000 +++ php4/ext/standard/reg.c Mon Mar 6 12:37:11 2000 @@ -17,31 +17,14 @@ | Jaakko Hyvätti <jaakko@hyvatti.iki.fi> | +----------------------------------------------------------------------+ */ -/* $Id: reg.c,v 1.32 2000/02/24 10:11:42 eschmid Exp $ */ +/* $Id: reg.c,v 1.33 2000/03/06 20:37:11 ssb Exp $ */ #include <stdio.h> #include "php.h" #include "php_string.h" #include "reg.h" -unsigned char third_argument_force_ref[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE }; - -function_entry reg_functions[] = { - PHP_FE(ereg, third_argument_force_ref) - PHP_FE(ereg_replace, NULL) - PHP_FE(eregi, third_argument_force_ref) - PHP_FE(eregi_replace, NULL) - PHP_FE(split, NULL) - PHP_FALIAS(join, implode, NULL) - PHP_FE(sql_regcase, NULL) - {NULL, NULL, NULL} -}; - - -static PHP_MINIT_FUNCTION(regex); -static PHP_MSHUTDOWN_FUNCTION(regex); -static PHP_MINFO_FUNCTION(regex); - +#if 0 zend_module_entry regexp_module_entry = { "Regular Expressions", reg_functions, @@ -49,6 +32,7 @@ NULL, NULL, PHP_MINFO(regex), STANDARD_MODULE_PROPERTIES }; +#endif #ifdef ZTS int reg_globals_id; @@ -101,7 +85,7 @@ zend_hash_init(&reg_globals->ht_rc, 0, NULL, (void (*)(void *)) _free_reg_cache, 1); } -static PHP_MINIT_FUNCTION(regex) +PHP_MINIT_FUNCTION(regex) { #ifdef ZTS reg_globals_id = ts_allocate_id(sizeof(php_reg_globals), (ts_allocate_ctor) php_reg_init_globals, NULL); @@ -112,7 +96,7 @@ return SUCCESS; } -static PHP_MSHUTDOWN_FUNCTION(regex) +PHP_MSHUTDOWN_FUNCTION(regex) { REGLS_FETCH(); @@ -120,12 +104,12 @@ return SUCCESS; } -static PHP_MINFO_FUNCTION(regex) +PHP_MINFO_FUNCTION(regex) { #if HSREGEX - PUTS("Bundled regex library enabled\n"); + PUTS("Bundled regex library enabled<br>\n"); #else - PUTS("System regex library enabled\n"); + PUTS("System regex library enabled<br>\n"); #endif } Index: php4/ext/standard/reg.h diff -u php4/ext/standard/reg.h:1.6 php4/ext/standard/reg.h:1.7 --- php4/ext/standard/reg.h:1.6 Fri Dec 17 20:01:15 1999 +++ php4/ext/standard/reg.h Mon Mar 6 12:37:11 2000 @@ -28,14 +28,11 @@ */ -/* $Id: reg.h,v 1.6 1999/12/18 04:01:15 zeev Exp $ */ +/* $Id: reg.h,v 1.7 2000/03/06 20:37:11 ssb Exp $ */ #ifndef _REG_H #define _REG_H -extern zend_module_entry regexp_module_entry; -#define regexp_module_ptr &regexp_module_entry - char *php_reg_replace(const char *pattern, const char *replace, const char *string, int icase, int extended); PHP_FUNCTION(ereg); @@ -49,6 +46,10 @@ HashTable ht_rc; } php_reg_globals; +PHP_MINIT_FUNCTION(regex); +PHP_MSHUTDOWN_FUNCTION(regex); +PHP_MINFO_FUNCTION(regex); + #ifdef ZTS #define REGLS_D php_reg_globals *reg_globals @@ -65,7 +66,5 @@ #define REG(v) (reg_globals.v) #define REGLS_FETCH() #endif - -#define phpext_regex_ptr regexp_module_ptr #endif /* _REG_H */ Index: php4/ext/standard/syslog.c diff -u php4/ext/standard/syslog.c:1.16 php4/ext/standard/syslog.c:1.17 --- php4/ext/standard/syslog.c:1.16 Sat Feb 19 15:41:21 2000 +++ php4/ext/standard/syslog.c Mon Mar 6 12:37:11 2000 @@ -12,11 +12,11 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Authors: Stig Sæther Bakken <ssb@guardian.no> | + | Authors: Stig Sæther Bakken <ssb@fast.no> | +----------------------------------------------------------------------+ */ -/* $Id: syslog.c,v 1.16 2000/02/19 23:41:21 zeev Exp $ */ +/* $Id: syslog.c,v 1.17 2000/03/06 20:37:11 ssb Exp $ */ #include "php.h" #include "php_ini.h" @@ -252,26 +252,6 @@ RETURN_TRUE; } /* }}} */ - - -function_entry syslog_functions[] = { - PHP_FE(openlog, NULL) - PHP_FE(syslog, NULL) - PHP_FE(closelog, NULL) - PHP_FE(define_syslog_variables, NULL) - {NULL, NULL, NULL} -}; - - -zend_module_entry syslog_module_entry = { - "Syslog", syslog_functions, PHP_MINIT(syslog), NULL, PHP_RINIT(syslog), PHP_RSHUTDOWN(syslog), NULL, STANDARD_MODULE_PROPERTIES -}; - - -#if COMPILE_DL -DLEXPORT zend_module_entry *get_module(void) { return &syslog_module_entry; } -#endif - /* * Local variables: