com php-src: Merge branch 'PHP-5.6': ext/spl/spl_directory. c

From: Date: Sat, 29 Nov 2014 11:14:37 +0000
Subject: com php-src: Merge branch 'PHP-5.6': ext/spl/spl_directory. c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83387@lists.php.net to get a copy of this message
Commit: 2faf4489825f6a0fb57c14f23fcece14877fef93 Author: Julien Pauli <jpauli@php.net> Sat, 29 Nov 2014 12:14:37 +0100 Parents: c7ea45308d10a5782b3de28feb30bb98a7221caf c4f9f1ff4c7465f67789dc959043891a0afe2621 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2faf4489825f6a0fb57c14f23fcece14877fef93 Log: Merge branch 'PHP-5.6' * PHP-5.6: Updated NEWS Updated NEWS SPL: Fix for bug 66405 RecursiveDirectoryIterator with CURRENT_AS_PATHNAME Conflicts: ext/spl/spl_directory.c Bugs: https://bugs.php.net/66405 Changed paths: MM ext/spl/spl_directory.c Diff: diff --cc ext/spl/spl_directory.c index 108eafd,2875cc2..481595e --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@@ -1506,27 -1523,25 +1506,23 @@@ SPL_METHOD(RecursiveDirectoryIterator, spl_filesystem_object_get_file_name(intern TSRMLS_CC); - if (SPL_HAS_FLAG(intern->flags, SPL_FILE_DIR_CURRENT_AS_PATHNAME)) { - RETURN_STRINGL(intern->file_name, intern->file_name_len); - } else { - ZVAL_LONG(&zflags, intern->flags); - ZVAL_STRINGL(&zpath, intern->file_name, intern->file_name_len); - spl_instantiate_arg_ex2(Z_OBJCE_P(getThis()), return_value, &zpath, &zflags TSRMLS_CC); - zval_ptr_dtor(&zpath); - zval_ptr_dtor(&zflags); - - subdir = Z_SPLFILESYSTEM_P(return_value); - if (subdir) { - if (intern->u.dir.sub_path && intern->u.dir.sub_path[0]) { - subdir->u.dir.sub_path_len = (int)spprintf(&subdir->u.dir.sub_path, 0, "%s%c%s", intern->u.dir.sub_path, slash, intern->u.dir.entry.d_name); - } else { - subdir->u.dir.sub_path_len = (int)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); - } - subdir->info_class = intern->info_class; - subdir->file_class = intern->file_class; - subdir->oth = intern->oth; - MAKE_STD_ZVAL(zflags); - MAKE_STD_ZVAL(zpath); - ZVAL_LONG(zflags, intern->flags); - ZVAL_STRINGL(zpath, intern->file_name, intern->file_name_len, 1); - spl_instantiate_arg_ex2(Z_OBJCE_P(getThis()), &return_value, 0, zpath, zflags TSRMLS_CC); ++ ZVAL_LONG(&zflags, intern->flags); ++ ZVAL_STRINGL(&zpath, intern->file_name, intern->file_name_len); ++ spl_instantiate_arg_ex2(Z_OBJCE_P(getThis()), return_value, &zpath, &zflags TSRMLS_CC); + zval_ptr_dtor(&zpath); + zval_ptr_dtor(&zflags); - - subdir = (spl_filesystem_object*)zend_object_store_get_object(return_value TSRMLS_CC); ++ ++ subdir = Z_SPLFILESYSTEM_P(return_value); + 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%c%s", intern->u.dir.sub_path, slash, intern->u.dir.entry.d_name); ++ subdir->u.dir.sub_path_len = (int)spprintf(&subdir->u.dir.sub_path, 0, "%s%c%s", intern->u.dir.sub_path, 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_len = (int)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); } + subdir->info_class = intern->info_class; + subdir->file_class = intern->file_class; + subdir->oth = intern->oth; } } /* }}} */

« previous php.cvs (#83387) next »