From 4ff07119e960aee14e03753f808914fa000abe2f Mon Sep 17 00:00:00 2001 From: naruse Date: Sat, 13 Jun 2015 11:46:38 +0000 Subject: * file.c (rb_stat_ino): get inode from the interval of struct st. * win32/win32.c (stati64_set_inode): get nFilIndexHigh/Low, and set it to the interval of struct st as inode. * win32/win32.c (stati64_set_inode_handle): call stati64_set_inode. * win32/win32.c (rb_w32_fstati64): call stati64_set_inode_handle. * win32/win32.c (stati64_handle): call stati64_set_inode. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50870 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/win32.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) (limited to 'win32/win32.c') diff --git a/win32/win32.c b/win32/win32.c index ab4c9924e3..445a5c4bd8 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -4975,6 +4975,48 @@ static time_t filetime_to_unixtime(const FILETIME *ft); static WCHAR *name_for_stat(WCHAR *buf, const WCHAR *path); static DWORD stati64_handle(HANDLE h, struct stati64 *st); +/* License: Ruby's */ +static void +stati64_set_inode(PBY_HANDLE_FILE_INFORMATION pinfo, struct stati64 *st) +{ + /* struct stati64 layout + * + * dev: 0-3 + * ino: 4-5 + * mode: 6-7 + * nlink: 8-9 + * uid: 10-11 + * gid: 12-13 + * _: 14-15 + * rdev: 16-19 + * _: 20-23 + * size: 24-31 + * atime: 32-39 + * mtime: 40-47 + * ctime: 48-55 + * + */ + unsigned short *p2 = (unsigned short *)st; + unsigned int *p4 = (unsigned int *)st; + DWORD high = pinfo->nFileIndexHigh; + p2[2] = high >> 16; + p2[7] = high & 0xFFFF; + p4[5] = pinfo->nFileIndexLow; +} + +/* License: Ruby's */ +static DWORD +stati64_set_inode_handle(HANDLE h, struct stati64 *st) +{ + BY_HANDLE_FILE_INFORMATION info; + DWORD attr = (DWORD)-1; + + if (GetFileInformationByHandle(h, &info)) { + stati64_set_inode(&info, st); + } + return attr; +} + #undef fstat /* License: Ruby's */ int @@ -5000,7 +5042,11 @@ rb_w32_fstati64(int fd, struct stati64 *st) struct stat tmp; int ret; - if (GetEnvironmentVariableW(L"TZ", NULL, 0) == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND) return _fstati64(fd, st); + if (GetEnvironmentVariableW(L"TZ", NULL, 0) == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND) { + ret = _fstati64(fd, st); + stati64_set_inode_handle((HANDLE)_get_osfhandle(fd), st); + return ret; + } ret = fstat(fd, &tmp); if (ret) return ret; @@ -5023,6 +5069,7 @@ stati64_handle(HANDLE h, struct stati64 *st) st->st_ctime = filetime_to_unixtime(&info.ftCreationTime); st->st_nlink = info.nNumberOfLinks; attr = info.dwFileAttributes; + stati64_set_inode(&info, st); } return attr; } -- cgit v1.2.3