derick Wed Feb 14 16:43:45 2001 EDT
Modified files:
/php4/ext/standard basic_functions.c php_dir.h dir.c
Log:
- chroot does not work on windows
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.303
php4/ext/standard/basic_functions.c:1.304
--- php4/ext/standard/basic_functions.c:1.303 Wed Feb 14 02:48:48 2001
+++ php4/ext/standard/basic_functions.c Wed Feb 14 16:43:44 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.303 2001/02/14 10:48:48 derick Exp $ */
+/* $Id: basic_functions.c,v 1.304 2001/02/15 00:43:44 derick Exp $ */
#include "php.h"
#include "php_main.h"
@@ -465,7 +465,9 @@
PHP_FE(opendir, NULL)
PHP_FE(closedir, NULL)
PHP_FE(chdir, NULL)
+#if !defined(ZEND_WIN32)&&!defined(ZTS)
PHP_FE(chroot, NULL)
+#endif
PHP_FE(getcwd, NULL)
PHP_FE(rewinddir, NULL)
PHP_STATIC_FE("readdir", php_if_readdir, NULL)
Index: php4/ext/standard/php_dir.h
diff -u php4/ext/standard/php_dir.h:1.12 php4/ext/standard/php_dir.h:1.13
--- php4/ext/standard/php_dir.h:1.12 Wed Feb 14 02:48:48 2001
+++ php4/ext/standard/php_dir.h Wed Feb 14 16:43:44 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dir.h,v 1.12 2001/02/14 10:48:48 derick Exp $ */
+/* $Id: php_dir.h,v 1.13 2001/02/15 00:43:44 derick Exp $ */
#ifndef PHP_DIR_H
#define PHP_DIR_H
@@ -28,7 +28,9 @@
PHP_FUNCTION(opendir);
PHP_FUNCTION(closedir);
PHP_FUNCTION(chdir);
+#if !defined(ZEND_WIN32)&&!defined(ZTS)
PHP_FUNCTION(chroot);
+#endif
PHP_FUNCTION(getcwd);
PHP_FUNCTION(rewinddir);
PHP_NAMED_FUNCTION(php_if_readdir);
Index: php4/ext/standard/dir.c
diff -u php4/ext/standard/dir.c:1.54 php4/ext/standard/dir.c:1.55
--- php4/ext/standard/dir.c:1.54 Wed Feb 14 03:02:54 2001
+++ php4/ext/standard/dir.c Wed Feb 14 16:43:44 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dir.c,v 1.54 2001/02/14 11:02:54 derick Exp $ */
+/* $Id: dir.c,v 1.55 2001/02/15 00:43:44 derick Exp $ */
/* {{{ includes/startup/misc */
@@ -222,6 +222,8 @@
}
/* }}} */
+
+#if !defined(ZEND_WIN32)&&!defined(ZTS)
/* {{{ proto int chroot(string directory)
Change root directory */
@@ -253,6 +255,8 @@
}
/* }}} */
+#endif
+
/* {{{ proto int chdir(string directory)
Change the current directory */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
