kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

win32.c: stat_by_find

Browse source 
* win32/win32.c (stat_by_find): extract from winnt_stat.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50051 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-03-22 02:26:28 +00:00
parent 8670fc560b
commit d26965fcdb
2 changed files with 38 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
win32/Makefile.sub
View file

@ -122,6 +122,9 @@ PLATFORM = mswin32
!if !defined(RT) !if !defined(RT)
!error RT not defined. Retry from configure pass. !error RT not defined. Retry from configure pass.
!endif !endif
!ifndef NTVER
NTVER = 0x0600
!endif
!ifdef NTVER !ifdef NTVER
ARCHDEFS = -D_WIN32_WINNT=$(NTVER) $(ARCHDEFS) ARCHDEFS = -D_WIN32_WINNT=$(NTVER) $(ARCHDEFS)
!endif !endif

59
win32/win32.c
View file

@ -56,6 +56,10 @@
# define CharNextExA(cp, p, flags) CharNextExA((WORD)(cp), (p), (flags)) # define CharNextExA(cp, p, flags) CharNextExA((WORD)(cp), (p), (flags))
#endif #endif
#if _WIN32_WINNT < 0x0600
DWORD WINAPI GetFinalPathNameByHandleW(HANDLE, LPWSTR, DWORD, DWORD);
#endif
static int w32_stati64(const char *path, struct stati64 *st, UINT cp); static int w32_stati64(const char *path, struct stati64 *st, UINT cp);
static char *w32_getenv(const char *name, UINT cp); static char *w32_getenv(const char *name, UINT cp);
@ -5038,10 +5042,39 @@ check_valid_dir(const WCHAR *path)
/* License: Ruby's */ /* License: Ruby's */
static int static int
winnt_stat(const WCHAR *path, struct stati64 *st) stat_by_find(const WCHAR *path, struct stati64 *st)
{ {
HANDLE h; HANDLE h;
WIN32_FIND_DATAW wfd; WIN32_FIND_DATAW wfd;
/* GetFileAttributesEx failed; check why. */
int e = GetLastError();
if ((e == ERROR_FILE_NOT_FOUND) || (e == ERROR_INVALID_NAME)
|| (e == ERROR_PATH_NOT_FOUND || (e == ERROR_BAD_NETPATH))) {
errno = map_errno(e);
return -1;
}
/* Fall back to FindFirstFile for ERROR_SHARING_VIOLATION */
h = FindFirstFileW(path, &wfd);
if (h == INVALID_HANDLE_VALUE) {
errno = map_errno(GetLastError());
return -1;
}
FindClose(h);
st->st_mode = fileattr_to_unixmode(wfd.dwFileAttributes, path);
st->st_atime = filetime_to_unixtime(&wfd.ftLastAccessTime);
st->st_mtime = filetime_to_unixtime(&wfd.ftLastWriteTime);
st->st_ctime = filetime_to_unixtime(&wfd.ftCreationTime);
st->st_size = ((__int64)wfd.nFileSizeHigh << 32) | wfd.nFileSizeLow;
st->st_nlink = 1;
return 0;
}
/* License: Ruby's */
static int
winnt_stat(const WCHAR *path, struct stati64 *st)
{
WIN32_FILE_ATTRIBUTE_DATA wfa; WIN32_FILE_ATTRIBUTE_DATA wfa;
const WCHAR *p = path; const WCHAR *p = path;
@ -5067,29 +5100,7 @@ winnt_stat(const WCHAR *path, struct stati64 *st)
st->st_ctime = filetime_to_unixtime(&wfa.ftCreationTime); st->st_ctime = filetime_to_unixtime(&wfa.ftCreationTime);
} }
else { else {
/* GetFileAttributesEx failed; check why. */ if (stat_by_find(path, st)) return -1;
int e = GetLastError();
if ((e == ERROR_FILE_NOT_FOUND) || (e == ERROR_INVALID_NAME)
|| (e == ERROR_PATH_NOT_FOUND || (e == ERROR_BAD_NETPATH))) {
errno = map_errno(e);
return -1;
}
/* Fall back to FindFirstFile for ERROR_SHARING_VIOLATION */
h = FindFirstFileW(path, &wfd);
if (h != INVALID_HANDLE_VALUE) {
FindClose(h);
st->st_mode = fileattr_to_unixmode(wfd.dwFileAttributes, path);
st->st_atime = filetime_to_unixtime(&wfd.ftLastAccessTime);
st->st_mtime = filetime_to_unixtime(&wfd.ftLastWriteTime);
st->st_ctime = filetime_to_unixtime(&wfd.ftCreationTime);
st->st_size = ((__int64)wfd.nFileSizeHigh << 32) | wfd.nFileSizeLow;
}
else {
errno = map_errno(GetLastError());
return -1;
}
} }
st->st_dev = st->st_rdev = (iswalpha(path[0]) && path[1] == L':') ? st->st_dev = st->st_rdev = (iswalpha(path[0]) && path[1] == L':') ?