cvs: php4 /ext/standard dl.c /main config.w32.h fopen-wrappers.c

andi Thu Aug 31 12:49:36 2000 EDT Modified files: /php4/ext/standard dl.c /php4/main config.w32.h fopen-wrappers.c Log: - Remove redundant IS_SLASH - Reverse config.w32.h patches - Use IS_ABSOLUTE_PATH() in one place in fopen-wrappers.c Index: php4/ext/standard/dl.c diff -u php4/ext/standard/dl.c:1.47 php4/ext/standard/dl.c:1.48 --- php4/ext/standard/dl.c:1.47 Sun Jul 23 18:39:49 2000 +++ php4/ext/standard/dl.c Thu Aug 31 12:49:36 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dl.c,v 1.47 2000/07/24 01:39:49 david Exp $ */ +/* $Id: dl.c,v 1.48 2000/08/31 19:49:36 andi Exp $ */ #include "php.h" #include "dl.h" @@ -86,9 +86,6 @@ #else #define USING_ZTS 0 #endif - -#define IS_SLASH(c) \ - (((c)=='/') || ((c)=='\\')) void php_dl(pval *file, int type, pval *return_value) { Index: php4/main/config.w32.h diff -u php4/main/config.w32.h:1.32 php4/main/config.w32.h:1.33 --- php4/main/config.w32.h:1.32 Wed Aug 30 14:07:16 2000 +++ php4/main/config.w32.h Thu Aug 31 12:49:36 2000 @@ -58,19 +58,19 @@ #if !defined(COMPILE_DL) #define HAVE_SNMP 0 # define HAVE_ERRMSG_H 0 /*needed for mysql 3.21.17 and up*/ -#define DBASE 1 +#define DBASE 0 #define NDBM 0 #define GDBM 0 #define BSD2 0 #define HAVE_CRYPT 0 -#define HAVE_ORACLE 1 +#define HAVE_ORACLE 0 #undef HAVE_ADABAS #undef HAVE_SOLID #ifndef COMPILE_DL_MSQL #define HAVE_MSQL 0 #endif -#define HAVE_SYBASE 1 -#define HAVE_LIBGD 1 +#define HAVE_SYBASE 0 +#define HAVE_LIBGD 0 #define HAVE_FILEPRO 0 #endif /* ---------------------------------------------------------------- Index: php4/main/fopen-wrappers.c diff -u php4/main/fopen-wrappers.c:1.84 php4/main/fopen-wrappers.c:1.85 --- php4/main/fopen-wrappers.c:1.84 Wed Aug 30 13:32:29 2000 +++ php4/main/fopen-wrappers.c Thu Aug 31 12:49:36 2000 @@ -16,7 +16,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen-wrappers.c,v 1.84 2000/08/30 20:32:29 andi Exp $ */ +/* $Id: fopen-wrappers.c,v 1.85 2000/08/31 19:49:36 andi Exp $ */ #include "php.h" #include "php_globals.h" @@ -328,12 +328,7 @@ #endif if (PG(doc_root) && path_info) { length = strlen(PG(doc_root)); -#ifdef PHP_WIN32 - /* Check for absolute path. This should really use virtual cwd macros */ - if (IS_SLASH(*PG(doc_root)) || (length >= 3 && PG(doc_root)[1] == ':' && IS_SLASH(PG(doc_root)[2]))) { -#else - if (IS_SLASH(*PG(doc_root))) { -#endif + if (IS_ABSOLUTE_PATH(PG(doc_root), length)) { filename = emalloc(length + strlen(path_info) + 2); if (filename) { memcpy(filename, PG(doc_root), length);