diff options
| author | Sascha Schumann <sas@php.net> | 2001-02-15 05:21:27 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2001-02-15 05:21:27 +0000 |
| commit | 637e8e14aa81e9e8d3c76cc501bc044efea2e5ac (patch) | |
| tree | 88e5857a7b1f792747ac6f4731b0538c8cade280 /ext | |
| parent | c239da7e66a06a66c963802e3589889f6c8b4b6b (diff) | |
| download | php-git-637e8e14aa81e9e8d3c76cc501bc044efea2e5ac.tar.gz | |
There might be more systems which do not support chroot, so we check
for the existence of it.
Additionally, if chroot is not supported, the warn_not_available function
is invoked now.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/basic_functions.c | 4 | ||||
| -rw-r--r-- | ext/standard/dir.c | 2 | ||||
| -rw-r--r-- | ext/standard/php_dir.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 303d3b4639..855457b815 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -465,8 +465,10 @@ function_entry basic_functions[] = { PHP_FE(opendir, NULL) PHP_FE(closedir, NULL) PHP_FE(chdir, NULL) -#if !defined(ZEND_WIN32)&&!defined(ZTS) +#if defined(HAVE_CHROOT) && !defined(ZTS) PHP_FE(chroot, NULL) +#else + PHP_FALIAS(chroot, warn_not_available, NULL) #endif PHP_FE(getcwd, NULL) PHP_FE(rewinddir, NULL) diff --git a/ext/standard/dir.c b/ext/standard/dir.c index 39df84b267..89f4f797c0 100644 --- a/ext/standard/dir.c +++ b/ext/standard/dir.c @@ -223,7 +223,7 @@ PHP_FUNCTION(closedir) /* }}} */ -#if !defined(ZEND_WIN32)&&!defined(ZTS) +#if defined(HAVE_CHROOT) && !defined(ZTS) /* {{{ proto int chroot(string directory) Change root directory */ diff --git a/ext/standard/php_dir.h b/ext/standard/php_dir.h index 3326b94a0a..7bef9249e7 100644 --- a/ext/standard/php_dir.h +++ b/ext/standard/php_dir.h @@ -28,7 +28,7 @@ PHP_RINIT_FUNCTION(dir); PHP_FUNCTION(opendir); PHP_FUNCTION(closedir); PHP_FUNCTION(chdir); -#if !defined(ZEND_WIN32)&&!defined(ZTS) +#if defined(HAVE_CHROOT) && !defined(ZTS) PHP_FUNCTION(chroot); #endif PHP_FUNCTION(getcwd); |