iliaa Wed Nov 6 13:07:23 2002 EDT
Modified files:
/TSRM tsrm_virtual_cwd.c tsrm_virtual_cwd.h
/php4/main safe_mode.c
/php4/ext/standard file.c
Log:
Instead of checking whether realpath exists based on OS. Use the
HAVE_REALPATH define, which is set if realpath() is avaliable. This patch
also resolves bug #18868.
Index: TSRM/tsrm_virtual_cwd.c
diff -u TSRM/tsrm_virtual_cwd.c:1.40 TSRM/tsrm_virtual_cwd.c:1.41
--- TSRM/tsrm_virtual_cwd.c:1.40 Tue Nov 5 09:50:16 2002
+++ TSRM/tsrm_virtual_cwd.c Wed Nov 6 13:07:22 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tsrm_virtual_cwd.c,v 1.40 2002/11/05 14:50:16 iliaa Exp $ */
+/* $Id: tsrm_virtual_cwd.c,v 1.41 2002/11/06 18:07:22 iliaa Exp $ */
#include <sys/types.h>
#include <sys/stat.h>
@@ -41,7 +41,7 @@
#include "tsrm_nw.h"
#endif
-#ifdef __BEOS__
+#ifndef HAVE_REALPATH
#define realpath(x,y) strcpy(y,x)
#endif
Index: TSRM/tsrm_virtual_cwd.h
diff -u TSRM/tsrm_virtual_cwd.h:1.24 TSRM/tsrm_virtual_cwd.h:1.25
--- TSRM/tsrm_virtual_cwd.h:1.24 Tue Nov 5 09:50:16 2002
+++ TSRM/tsrm_virtual_cwd.h Wed Nov 6 13:07:22 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tsrm_virtual_cwd.h,v 1.24 2002/11/05 14:50:16 iliaa Exp $ */
+/* $Id: tsrm_virtual_cwd.h,v 1.25 2002/11/06 18:07:22 iliaa Exp $ */
#ifndef VIRTUAL_CWD_H
#define VIRTUAL_CWD_H
@@ -233,7 +233,7 @@
#define VCWD_POPEN(command, type) popen(command, type)
#define VCWD_ACCESS(pathname, mode) access(pathname, mode)
-#if !defined(TSRM_WIN32) && !defined(NETWARE)
+#ifdef HAVE_REALPATH
#define VCWD_REALPATH(path, real_path) realpath(path, real_path)
#else
#define VCWD_REALPATH(path, real_path) strcpy(real_path, path)
Index: php4/main/safe_mode.c
diff -u php4/main/safe_mode.c:1.50 php4/main/safe_mode.c:1.51
--- php4/main/safe_mode.c:1.50 Wed Oct 2 19:48:58 2002
+++ php4/main/safe_mode.c Wed Nov 6 13:07:23 2002
@@ -15,7 +15,7 @@
| Author: Rasmus Lerdorf <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: safe_mode.c,v 1.50 2002/10/02 23:48:58 dreid Exp $ */
+/* $Id: safe_mode.c,v 1.51 2002/11/06 18:07:23 iliaa Exp $ */
#include "php.h"
@@ -30,10 +30,6 @@
#include "safe_mode.h"
#include "SAPI.h"
#include "php_globals.h"
-
-#ifdef __BEOS__
-#define realpath(x,y) strcpy(y,x)
-#endif
/*
* php_checkuid
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.278 php4/ext/standard/file.c:1.279
--- php4/ext/standard/file.c:1.278 Tue Oct 29 08:26:44 2002
+++ php4/ext/standard/file.c Wed Nov 6 13:07:23 2002
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.278 2002/10/29 13:26:44 helly Exp $ */
+/* $Id: file.c,v 1.279 2002/11/06 18:07:23 iliaa Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -113,10 +113,6 @@
#ifdef HAVE_FNMATCH
#include <fnmatch.h>
-#endif
-
-#ifdef __BEOS__
-#define realpath(x,y) strcpy(y,x)
#endif
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
