cvs: php-src /ext/standard file.c

pollita Mon Oct 9 02:52:27 2006 UTC Modified files: /php-src/ext/standard file.c Log: Fix realpath() in unicode mode http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.462&r2=1.463&diff_format=u Index: php-src/ext/standard/file.c diff -u php-src/ext/standard/file.c:1.462 php-src/ext/standard/file.c:1.463 --- php-src/ext/standard/file.c:1.462 Sun Oct 8 13:34:23 2006 +++ php-src/ext/standard/file.c Mon Oct 9 02:52:27 2006 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.462 2006/10/08 13:34:23 bjori Exp $ */ +/* $Id: file.c,v 1.463 2006/10/09 02:52:27 pollita Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -2432,10 +2432,11 @@ UChar *path; int path_len; - if (php_stream_path_decode(&php_plain_files_wrapper, &path, &path_len, filename, filename_len, REPORT_ERRORS, FG(default_context)) == SUCCESS) { + if (php_stream_path_decode(&php_plain_files_wrapper, &path, &path_len, resolved_path_buff, strlen(resolved_path_buff), REPORT_ERRORS, FG(default_context)) == SUCCESS) { RETVAL_UNICODEL(path, path_len, 0); } else { - RETVAL_FALSE; + /* Fallback */ + RETVAL_STRING(resolved_path_buff, 1); } } else { RETVAL_STRING(resolved_path_buff, 1);