pajoye                                   Tue, 26 Jul 2011 07:30:41 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=313695

Log:
- use cwd_expand now

Changed paths:
    U   php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c
    U   php/php-src/trunk/ext/spl/spl_directory.c

Modified: php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c        2011-07-26 
06:31:59 UTC (rev 313694)
+++ php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c        2011-07-26 
07:30:41 UTC (rev 313695)
@@ -1219,10 +1219,7 @@
 #if defined(PHP_WIN32) || HAVE_SYMLINK
        if (!IS_ABSOLUTE_PATH(intern->file_name, intern->file_name_len)) {
                char expanded_path[MAXPATHLEN];
-
-               /* TODO: Fix expand_filepath to do not resolve links but only 
expand the path
-                  (Pierre) */
-               if (!expand_filepath(intern->file_name, expanded_path 
TSRMLS_CC)) {
+               if (!expand_filepath_with_mode(intern->file_name, 
expanded_path, NULL, 0, CWD_EXPAND  TSRMLS_CC)) {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "No such 
file or directory");
                        RETURN_FALSE;
                }

Modified: php/php-src/trunk/ext/spl/spl_directory.c
===================================================================
--- php/php-src/trunk/ext/spl/spl_directory.c   2011-07-26 06:31:59 UTC (rev 
313694)
+++ php/php-src/trunk/ext/spl/spl_directory.c   2011-07-26 07:30:41 UTC (rev 
313695)
@@ -1219,10 +1219,7 @@
 #if defined(PHP_WIN32) || HAVE_SYMLINK
        if (!IS_ABSOLUTE_PATH(intern->file_name, intern->file_name_len)) {
                char expanded_path[MAXPATHLEN];
-
-               /* TODO: Fix expand_filepath to do not resolve links but only 
expand the path
-                  (Pierre) */
-               if (!expand_filepath(intern->file_name, expanded_path 
TSRMLS_CC)) {
+               if (!expand_filepath_with_mode(intern->file_name, 
expanded_path, NULL, 0, CWD_EXPAND  TSRMLS_CC)) {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "No such 
file or directory");
                        RETURN_FALSE;
                }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to