archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Generalize

Browse source
This commit is contained in:
Zeev Suraski 2001-07-16 13:31:55 +00:00
parent 1c27165161
commit 407fd77c20
1 changed files with 3 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
main/fopen_wrappers.c
View file

@ -215,11 +215,7 @@ PHPAPI int php_check_open_basedir(char *path)
ptr = pathbuf; ptr = pathbuf;
while (ptr && *ptr) { while (ptr && *ptr) {
#ifdef PHP_WIN32 end = strchr(ptr, DEFAULT_DIR_SEPARATOR);
end = strchr(ptr, ';');
#else
end = strchr(ptr, ':');
#endif
if (end != NULL) { if (end != NULL) {
*end = '\0'; *end = '\0';
end++; end++;
@ -478,11 +474,7 @@ PHPAPI FILE *php_fopen_with_path(char *filename, char *mode, char *path, char **
pathbuf = (char *) emalloc(exec_fname_length + path_length +1 +1); pathbuf = (char *) emalloc(exec_fname_length + path_length +1 +1);
memcpy(pathbuf, path, path_length); memcpy(pathbuf, path, path_length);
#ifdef PHP_WIN32 pathbuf[path_length] = DEFAULT_DIR_SEPARATOR;
pathbuf[path_length] = ';';
#else
pathbuf[path_length] = ':';
#endif
memcpy(pathbuf+path_length+1, exec_fname, exec_fname_length); memcpy(pathbuf+path_length+1, exec_fname, exec_fname_length);
pathbuf[path_length + exec_fname_length +1] = '\0'; pathbuf[path_length + exec_fname_length +1] = '\0';
} else { } else {
@ -492,11 +484,7 @@ PHPAPI FILE *php_fopen_with_path(char *filename, char *mode, char *path, char **
ptr = pathbuf; ptr = pathbuf;
while (ptr && *ptr) { while (ptr && *ptr) {
#ifdef PHP_WIN32 end = strchr(ptr, DEFAULT_DIR_SEPARATOR);
end = strchr(ptr, ';');
#else
end = strchr(ptr, ':');
#endif
if (end != NULL) { if (end != NULL) {
*end = '\0'; *end = '\0';
end++; end++;