archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-21 01:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

MFB51: Only use win32 directory separators on win32 or netware.

Browse source
This commit is contained in:
Ilia Alshanetsky 2006-02-02 15:10:23 +00:00
parent 2c508bc1f0
commit 555cfd0146
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ext/spl/spl_directory.c
View file

@ -176,7 +176,11 @@ static void spl_filesystem_dir_open(spl_filesystem_object* intern, char *path TS
intern->path_len = strlen(path); intern->path_len = strlen(path);
intern->u.dir.dirp = php_stream_opendir(path, ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL); intern->u.dir.dirp = php_stream_opendir(path, ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL);
if (intern->path_len && (path[intern->path_len-1] == '/' || path[intern->path_len-1] == '\\')) { if (intern->path_len && (path[intern->path_len-1] == '/'
#if defined(PHP_WIN32) || defined(NETWARE)
|| path[intern->path_len-1] == '\\'
#endif
)) {
intern->path = estrndup(path, --intern->path_len); intern->path = estrndup(path, --intern->path_len);
} else { } else {
intern->path = estrndup(path, intern->path_len); intern->path = estrndup(path, intern->path_len);
@ -279,7 +283,11 @@ void spl_filesystem_info_set_filename(spl_filesystem_object *intern, char *path,
intern->file_name_len = len; intern->file_name_len = len;
p1 = strrchr(path, '/'); p1 = strrchr(path, '/');
#if defined(PHP_WIN32) || defined(NETWARE)
p2 = strrchr(path, '\\'); p2 = strrchr(path, '\\');
#else
p2 = 0;
#endif
if (p1 || p2) { if (p1 || p2) {
intern->path_len = (p1 > p2 ? p1 : p2) - path; intern->path_len = (p1 > p2 ? p1 : p2) - path;
} else { } else {
@ -1393,7 +1401,11 @@ SPL_METHOD(SplFileObject, __construct)
if (spl_filesystem_file_open(intern, use_include_path, 0 TSRMLS_CC) == SUCCESS) { if (spl_filesystem_file_open(intern, use_include_path, 0 TSRMLS_CC) == SUCCESS) {
p1 = strrchr(intern->file_name, '/'); p1 = strrchr(intern->file_name, '/');
p2 = strrchr(intern->file_name, '\\'); #if defined(PHP_WIN32) || defined(NETWARE)
p2 = strrchr(path, '\\');
#else
p2 = 0;
#endif
if (p1 || p2) { if (p1 || p2) {
intern->path_len = (p1 > p2 ? p1 : p2) - intern->file_name; intern->path_len = (p1 > p2 ? p1 : p2) - intern->file_name;
} else { } else {