helly Fri Jan 13 19:36:57 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/spl spl_directory.c
/php-src NEWS
Log:
- Fix #35998 (getPathname() method always returns unix style filenames)
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.10&r2=1.45.2.11&diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.45.2.10
php-src/ext/spl/spl_directory.c:1.45.2.11
--- php-src/ext/spl/spl_directory.c:1.45.2.10 Sun Jan 1 12:50:13 2006
+++ php-src/ext/spl/spl_directory.c Fri Jan 13 19:36:57 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_directory.c,v 1.45.2.10 2006/01/01 12:50:13 sniper Exp $ */
+/* $Id: spl_directory.c,v 1.45.2.11 2006/01/13 19:36:57 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -162,7 +162,7 @@
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Object not
initialized");
break;
case SPL_FS_DIR:
- intern->file_name_len = spprintf(&intern->file_name, 0,
"%s/%s", intern->path, intern->u.dir.entry.d_name);
+ intern->file_name_len = spprintf(&intern->file_name, 0,
"%s%c%s", intern->path, DEFAULT_SLASH, intern->u.dir.entry.d_name);
break;
}
}
@@ -852,7 +852,7 @@
subdir =
(spl_filesystem_object*)zend_object_store_get_object(return_value TSRMLS_CC);
if (subdir) {
if (intern->u.dir.sub_path && intern->u.dir.sub_path[0]) {
- subdir->u.dir.sub_path_len =
spprintf(&subdir->u.dir.sub_path, 0, "%s/%s", intern->u.dir.sub_path,
intern->u.dir.entry.d_name);
+ subdir->u.dir.sub_path_len =
spprintf(&subdir->u.dir.sub_path, 0, "%s%c%s", intern->u.dir.sub_path,
DEFAULT_SLASH, intern->u.dir.entry.d_name);
} else {
subdir->u.dir.sub_path_len =
strlen(intern->u.dir.entry.d_name);
subdir->u.dir.sub_path =
estrndup(intern->u.dir.entry.d_name, subdir->u.dir.sub_path_len);
@@ -885,7 +885,7 @@
int len;
if (intern->u.dir.sub_path) {
- len = spprintf(&sub_name, 0, "%s/%s", intern->u.dir.sub_path,
intern->u.dir.entry.d_name);
+ len = spprintf(&sub_name, 0, "%s%c%s", intern->u.dir.sub_path,
DEFAULT_SLASH, intern->u.dir.entry.d_name);
RETURN_STRINGL(sub_name, len, 0);
} else {
RETURN_STRING(intern->u.dir.entry.d_name, 1);
@@ -907,7 +907,7 @@
}
if (intern->u.dir.sub_path) {
- len = spprintf(&sub_name, 0, "%s/%s", intern->u.dir.sub_path,
intern->u.dir.entry.d_name);
+ len = spprintf(&sub_name, 0, "%s%c%s", intern->u.dir.sub_path,
DEFAULT_SLASH, intern->u.dir.entry.d_name);
spl_filesystem_object_create_info(intern, sub_name, len, 0, ce,
return_value TSRMLS_CC);
} else {
spl_filesystem_object_create_info(intern, intern->path,
intern->path_len, 1, ce, return_value TSRMLS_CC);
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.348&r2=1.2027.2.349&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.348 php-src/NEWS:1.2027.2.349
--- php-src/NEWS:1.2027.2.348 Fri Jan 13 08:30:40 2006
+++ php-src/NEWS Fri Jan 13 19:36:57 2006
@@ -2,6 +2,8 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2006, PHP 5.1.3
- Added stream filter 'consumed'. (Marcus)
+- Fixed bug #35998 (getPathname() method always returns unix style filenames).
+ (Marcus)
12 Jan 2006, PHP 5.1.2
- Updated libsqlite in ext/sqlite to 2.8.17. (Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
