cvs: php4 / configure.in /ext/standard basic_functions.c file.c file.h

sniper Tue Oct 23 07:14:52 2001 EDT Modified files: /php4 configure.in /php4/ext/standard basic_functions.c file.c file.h Log: Check that realpath is available. Bug: #9469 # TSRM still uses it without checking. I can't fix that. Index: php4/configure.in diff -u php4/configure.in:1.279 php4/configure.in:1.280 --- php4/configure.in:1.279 Mon Oct 15 14:58:48 2001 +++ php4/configure.in Tue Oct 23 07:14:51 2001 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.279 2001/10/15 18:58:48 ssb Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.280 2001/10/23 11:14:51 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -395,6 +395,7 @@ mmap \ nl_langinfo \ putenv \ +realpath \ random \ rand_r \ regcomp \ Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.410 php4/ext/standard/basic_functions.c:1.411 --- php4/ext/standard/basic_functions.c:1.410 Sun Oct 21 03:42:35 2001 +++ php4/ext/standard/basic_functions.c Tue Oct 23 07:14:51 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.410 2001/10/21 07:42:35 rasmus Exp $ */ +/* $Id: basic_functions.c,v 1.411 2001/10/23 11:14:51 sniper Exp $ */ #include "php.h" #include "php_main.h" @@ -628,7 +628,7 @@ PHP_FE(socket_get_status, NULL) -#if (!defined(PHP_WIN32) && !defined(__BEOS__)) || defined(ZTS) +#if (!defined(PHP_WIN32) && !defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS) PHP_FE(realpath, NULL) #else PHP_FALIAS(realpath, warn_not_available, NULL) Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.188 php4/ext/standard/file.c:1.189 --- php4/ext/standard/file.c:1.188 Sat Oct 13 19:43:49 2001 +++ php4/ext/standard/file.c Tue Oct 23 07:14:51 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.188 2001/10/13 23:43:49 sas Exp $ */ +/* $Id: file.c,v 1.189 2001/10/23 11:14:51 sniper Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -2270,7 +2270,7 @@ /* }}} */ -#if (!defined(PHP_WIN32) && !defined(__BEOS__)) || defined(ZTS) +#if (!defined(PHP_WIN32) && !defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS) /* {{{ proto string realpath(string path) Return the resolved path */ PHP_FUNCTION(realpath) Index: php4/ext/standard/file.h diff -u php4/ext/standard/file.h:1.41 php4/ext/standard/file.h:1.42 --- php4/ext/standard/file.h:1.41 Sun Oct 7 14:34:44 2001 +++ php4/ext/standard/file.h Tue Oct 23 07:14:51 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.h,v 1.41 2001/10/07 18:34:44 derick Exp $ */ +/* $Id: file.h,v 1.42 2001/10/23 11:14:51 sniper Exp $ */ /* Synced with php 3.0 revision 1.30 1999-06-16 [ssb] */ @@ -66,7 +66,9 @@ PHP_FUNCTION(fd_set); PHP_FUNCTION(fd_isset); PHP_FUNCTION(select); +#if (!defined(PHP_WIN32) && !defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS) PHP_FUNCTION(realpath); +#endif PHP_NAMED_FUNCTION(php_if_ftruncate); PHP_NAMED_FUNCTION(php_if_fstat);