cvs: /php3 configuration-parser.y fopen-wrappers.c

bjh Mon Aug 23 04:55:09 1999 EDT Modified files: /php3 configuration-parser.y fopen-wrappers.c Log: Use ';' instead of ':' as path separator under OS/2. This allows require() and include() to work properly with include paths. Index: php3/configuration-parser.y diff -u php3/configuration-parser.y:1.76 php3/configuration-parser.y:1.77 --- php3/configuration-parser.y:1.76 Fri Jan 1 12:58:48 1999 +++ php3/configuration-parser.y Mon Aug 23 04:55:09 1999 @@ -30,7 +30,7 @@ -/* $Id: configuration-parser.y,v 1.76 1999/01/01 17:58:48 zeev Exp $ */ +/* $Id: configuration-parser.y,v 1.77 1999/08/23 08:55:09 bjh Exp $ */ #define DEBUG_CFG_PARSER 1 #ifdef THREAD_SAFE @@ -179,7 +179,7 @@ php_ini_path = (char *) malloc(sizeof(".")+strlen(env_location)+strlen(default_location)+2+1); if (!GLOBAL(php3_ini_path)) { -#if WIN32|WINNT +#if WIN32|WINNT|OS2 sprintf(php_ini_path,".;%s;%s",env_location,default_location); #else sprintf(php_ini_path,".:%s:%s",env_location,default_location); Index: php3/fopen-wrappers.c diff -u php3/fopen-wrappers.c:1.71 php3/fopen-wrappers.c:1.72 --- php3/fopen-wrappers.c:1.71 Sun Jul 18 20:43:59 1999 +++ php3/fopen-wrappers.c Mon Aug 23 04:55:09 1999 @@ -27,7 +27,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen-wrappers.c,v 1.71 1999/07/19 00:43:59 sas Exp $ */ +/* $Id: fopen-wrappers.c,v 1.72 1999/08/23 08:55:09 bjh Exp $ */ #ifdef THREAD_SAFE #include "tls.h" @@ -186,7 +186,7 @@ ptr = pathbuf; while (ptr && *ptr) { -#if WIN32|WINNT +#if WIN32|WINNT|OS2 end = strchr(ptr, ';'); #else end = strchr(ptr, ':'); @@ -365,7 +365,7 @@ return fp; } /* Absolute path open - prepend document_root in safe mode */ -#if WIN32|WINNT +#if WIN32|WINNT|OS2 if ((*filename == '\\') || (*filename == '/') || (filename[1] == ':')) { #else if (*filename == '/') { @@ -406,7 +406,7 @@ ptr = pathbuf; while (ptr && *ptr) { -#if WIN32|WINNT +#if WIN32|WINNT|OS2 end = strchr(ptr, ';'); #else end = strchr(ptr, ':');