svn: /php/php-src/ branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c trunk/TSRM/tsrm_virtual_cwd.c

pajoye Mon, 24 Aug 2009 20:27:52 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=287654 Log: - split atime and mtime Changed paths: U php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c U php/php-src/trunk/TSRM/tsrm_virtual_cwd.c Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c =================================================================== --- php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c 2009-08-24 20:03:26 UTC (rev 287653) +++ php/php-src/branches/PHP_5_3/TSRM/tsrm_virtual_cwd.c 2009-08-24 20:27:52 UTC (rev 287654) @@ -271,9 +271,6 @@ buf->st_atime = FileTimeToUnixTime(data.ftLastAccessTime); buf->st_ctime = FileTimeToUnixTime(data.ftCreationTime); buf->st_mtime = FileTimeToUnixTime(data.ftLastWriteTime); - if (buf->st_mtime != buf->st_atime) { - buf->st_atime = buf->st_mtime; - } return 0; } /* }}} */ @@ -741,6 +738,7 @@ return -1; } } + directory = (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0; if(link_is_dir) { *link_is_dir = directory; @@ -988,6 +986,7 @@ add_slash = (use_realpath != CWD_REALPATH) && path_length > 0 && IS_SLASH(resolved_path[path_length-1]); t = CWDG(realpath_cache_ttl) ? 0 : -1; + path_length = tsrm_realpath_r(resolved_path, start, path_length, &ll, &t, use_realpath, 0, NULL TSRMLS_CC); if (path_length < 0) { Modified: php/php-src/trunk/TSRM/tsrm_virtual_cwd.c =================================================================== --- php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2009-08-24 20:03:26 UTC (rev 287653) +++ php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2009-08-24 20:27:52 UTC (rev 287654) @@ -271,9 +271,6 @@ buf->st_atime = FileTimeToUnixTime(data.ftLastAccessTime); buf->st_ctime = FileTimeToUnixTime(data.ftCreationTime); buf->st_mtime = FileTimeToUnixTime(data.ftLastWriteTime); - if (buf->st_mtime != buf->st_atime) { - buf->st_atime = buf->st_mtime; - } return 0; } /* }}} */