MFH LFS-related changes

8 files changed, 23 insertions, 22 deletions

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index dbb6e7cb54..a80a583f4c 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -393,10 +393,10 @@ function_entry basic_functions[] = {
 	PHP_FE(fgets,				NULL)
 	PHP_FE(fgetss,				NULL)
 	PHP_FE(fread,				NULL)
-	PHP_FE(fopen,				NULL)
+	PHP_STATIC_FE("fopen", php_if_fopen,			NULL)
 	PHP_FE(fpassthru,			NULL)
-	PHP_FE(ftruncate,    		NULL)
-	PHP_FE(fstat,    			NULL)
+	PHP_STATIC_FE("ftruncate", php_if_ftruncate,   	NULL)
+	PHP_STATIC_FE("fstat", php_if_fstat,    		NULL)
 	PHP_FE(fseek,				NULL)
 	PHP_FE(ftell,				NULL)
 	PHP_FE(fflush,				NULL)
@@ -406,7 +406,7 @@ function_entry basic_functions[] = {
 	PHP_FE(rename,				NULL)
 	PHP_FE(copy,				NULL)
 	PHP_FE(tempnam,				NULL)
-	PHP_FE(tmpfile,				NULL)
+	PHP_STATIC_FE("tmpfile", php_if_tmpfile,		NULL)
 	PHP_FE(file,				NULL)
 	PHP_FE(fgetcsv,				NULL)
     PHP_FE(flock,				NULL)
@@ -452,7 +452,7 @@ function_entry basic_functions[] = {
 	PHP_FE(chdir,				NULL)
 	PHP_FE(getcwd,				NULL)
 	PHP_FE(rewinddir,			NULL)
-	PHP_FE(readdir,				NULL)
+	PHP_STATIC_FE("readdir", php_if_readdir, NULL)
 	PHP_FALIAS(dir,		getdir,	NULL)
 
 	/* functions from filestat.c */
@@ -473,8 +473,8 @@ function_entry basic_functions[] = {
 	PHP_FE(is_file,					NULL)
 	PHP_FE(is_dir,					NULL)
 	PHP_FE(is_link,					NULL)
-	PHP_FE(stat,					NULL)
-	PHP_FE(lstat,					NULL)
+	PHP_STATIC_FE("stat", php_if_stat,				NULL)
+	PHP_STATIC_FE("lstat", php_if_lstat,			NULL)
 	PHP_FE(chown,					NULL)
 	PHP_FE(chgrp,					NULL)
 	PHP_FE(chmod,					NULL)
diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index 84e0d8e5c1..131540816a 100644
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -92,7 +92,7 @@ static zend_class_entry *dir_class_entry_ptr;
 static zend_function_entry php_dir_class_functions[] = {
 	PHP_FALIAS(close,	closedir,	NULL)
 	PHP_FALIAS(rewind,	rewinddir,	NULL)
-	PHP_FALIAS(read,	readdir,	NULL)
+	PHP_STATIC_FE("read", php_if_readdir, NULL)
 	{NULL, NULL, NULL}
 };
 
@@ -294,7 +294,7 @@ PHP_FUNCTION(rewinddir)
 /* {{{ proto string readdir([int dir_handle])
    Read directory entry from dir_handle */
 
-PHP_FUNCTION(readdir)
+PHP_NAMED_FUNCTION(php_if_readdir)
 {
 	pval **id, **tmp, *myself;
 	php_dir *dirp;
diff --git a/ext/standard/file.c b/ext/standard/file.c
index bc8a516ffb..d421230de7 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -500,7 +500,7 @@ PHP_FUNCTION(tempnam)
 /* }}} */
 /* {{{ proto int tmpfile(void)
    Create a temporary file that will be deleted automatically after use */
-PHP_FUNCTION(tmpfile)
+PHP_NAMED_FUNCTION(php_if_tmpfile)
 {
 	FILE *fp;
 	if (ARG_COUNT(ht) != 0) {
@@ -518,7 +518,7 @@ PHP_FUNCTION(tmpfile)
 /* {{{ proto int fopen(string filename, string mode [, int use_include_path])
    Open a file or a URL and return a file pointer */
 
-PHP_FUNCTION(fopen)
+PHP_NAMED_FUNCTION(php_if_fopen)
 {
 	pval **arg1, **arg2, **arg3;
 	FILE *fp;
@@ -1552,7 +1552,7 @@ PHP_FUNCTION(unlink)
 
 /* {{{ proto int ftruncate (int fp, int size)
    Truncate file to 'size' length */
-PHP_FUNCTION(ftruncate)
+PHP_NAMED_FUNCTION(php_if_ftruncate)
 {
 	zval **fp , **size;
 	short int ret;
@@ -1581,7 +1581,7 @@ PHP_FUNCTION(ftruncate)
 
 /* {{{ proto int fstat(int fp)
    Stat() on a filehandle */
-PHP_FUNCTION(fstat)
+PHP_NAMED_FUNCTION(php_if_fstat)
 {
 	zval **fp;
 	int type;
diff --git a/ext/standard/file.h b/ext/standard/file.h
index ab8216c33a..cc2fe08cbc 100644
--- a/ext/standard/file.h
+++ b/ext/standard/file.h
@@ -26,8 +26,8 @@
 extern PHP_MINIT_FUNCTION(file);
 
 PHP_FUNCTION(tempnam);
-PHP_FUNCTION(tmpfile);
-PHP_FUNCTION(fopen);
+PHP_NAMED_FUNCTION(php_if_tmpfile);
+PHP_NAMED_FUNCTION(php_if_fopen);
 PHP_FUNCTION(fclose);
 PHP_FUNCTION(popen);
 PHP_FUNCTION(pclose);
@@ -63,8 +63,8 @@ PHP_FUNCTION(fd_set);
 PHP_FUNCTION(fd_isset);
 PHP_FUNCTION(select);
 PHP_FUNCTION(realpath);
-PHP_FUNCTION(ftruncate);
-PHP_FUNCTION(fstat);
+PHP_NAMED_FUNCTION(php_if_ftruncate);
+PHP_NAMED_FUNCTION(php_if_fstat);
 
 PHPAPI int php_set_sock_blocking(int socketd, int block);
 PHPAPI int php_file_le_fopen(void);
diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index e845f4872e..e095deba97 100644
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -709,12 +709,12 @@ FileFunction(PHP_FN(file_exists),15)
 
 /* {{{ proto array lstat(string filename)
    Give information about a file or symbolic link */
-FileFunction(PHP_FN(lstat),16)
+FileFunction(php_if_lstat,16)
 /* }}} */
 
 /* {{{ proto array stat(string filename)
    Give information about a file */
-FileFunction(PHP_FN(stat),17)
+FileFunction(php_if_stat,17)
 /* }}} */
 
 /*
diff --git a/ext/standard/php_dir.h b/ext/standard/php_dir.h
index 2f416fc5f4..8bbaba3b80 100644
--- a/ext/standard/php_dir.h
+++ b/ext/standard/php_dir.h
@@ -30,7 +30,7 @@ PHP_FUNCTION(closedir);
 PHP_FUNCTION(chdir);
 PHP_FUNCTION(getcwd);
 PHP_FUNCTION(rewinddir);
-PHP_FUNCTION(readdir);
+PHP_NAMED_FUNCTION(php_if_readdir);
 PHP_FUNCTION(getdir);
 
 #endif /* PHP_DIR_H */
diff --git a/ext/standard/php_filestat.h b/ext/standard/php_filestat.h
index 8f238d8a41..8e88431307 100644
--- a/ext/standard/php_filestat.h
+++ b/ext/standard/php_filestat.h
@@ -41,8 +41,8 @@ PHP_FUNCTION(is_file);
 PHP_FUNCTION(is_dir);
 PHP_FUNCTION(is_link);
 PHP_FUNCTION(file_exists);
-PHP_FUNCTION(stat);
-PHP_FUNCTION(lstat);
+PHP_NAMED_FUNCTION(php_if_stat);
+PHP_NAMED_FUNCTION(php_if_lstat);
 PHP_FUNCTION(diskfreespace);
 PHP_FUNCTION(chown);
 PHP_FUNCTION(chgrp);
diff --git a/main/php.h b/main/php.h
index 76acd56cb2..9296138640 100644
--- a/main/php.h
+++ b/main/php.h
@@ -215,6 +215,7 @@ char *strerror(int);
 #define PHP_NAMED_FE(php_name, name, arg_types) { #php_name, name, arg_types },
 #define PHP_FE(name, arg_types) PHP_NAMED_FE(name, PHP_FN(name), arg_types)
 #define PHP_FALIAS(name, alias, arg_types) PHP_NAMED_FE(name, PHP_FN(alias), arg_types)
+#define PHP_STATIC_FE(php_name, func_name, arg_types) { php_name, func_name, arg_types },
 
 #define PHP_MINIT(module)	php_minit_##module
 #define PHP_MSHUTDOWN(module)	php_mshutdown_##module