Skip to content

Commit aeb02af

Browse files
kbleesGit for Windows Build Agent
authored andcommitted
Win32: let mingw_lstat() error early upon problems with reparse points
When obtaining lstat information for reparse points, we need to call FindFirstFile() in addition to GetFileInformationEx() to obtain the type of the reparse point (symlink, mount point etc.). However, currently there is no error handling whatsoever if FindFirstFile() fails. Call FindFirstFile() before modifying the stat *buf output parameter and error out if the call fails. Note: The FindFirstFile() return value includes all the data that we get from GetFileAttributesEx(), so we could replace GetFileAttributesEx() with FindFirstFile(). We don't do that because GetFileAttributesEx() is about twice as fast for single files. I.e. we only pay the extra cost of calling FindFirstFile() in the rare case that we encounter a reparse point. Note: The indentation of the remaining reparse point code will be fixed in the next patch. Signed-off-by: Karsten Blees <[email protected]>
1 parent a6b92b0 commit aeb02af

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

compat/mingw.c

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -959,6 +959,7 @@ static int has_valid_directory_prefix(wchar_t *wfilename)
959959
int mingw_lstat(const char *file_name, struct stat *buf)
960960
{
961961
WIN32_FILE_ATTRIBUTE_DATA fdata;
962+
WIN32_FIND_DATAW findbuf = { 0 };
962963
wchar_t wfilename[MAX_LONG_PATH];
963964
int wlen = xutftowcs_long_path(wfilename, file_name);
964965
if (wlen < 0)
@@ -973,6 +974,13 @@ int mingw_lstat(const char *file_name, struct stat *buf)
973974
}
974975

975976
if (GetFileAttributesExW(wfilename, GetFileExInfoStandard, &fdata)) {
977+
/* for reparse points, use FindFirstFile to get the reparse tag */
978+
if (fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
979+
HANDLE handle = FindFirstFileW(wfilename, &findbuf);
980+
if (handle == INVALID_HANDLE_VALUE)
981+
goto error;
982+
FindClose(handle);
983+
}
976984
buf->st_ino = 0;
977985
buf->st_gid = 0;
978986
buf->st_uid = 0;
@@ -985,20 +993,16 @@ int mingw_lstat(const char *file_name, struct stat *buf)
985993
filetime_to_timespec(&(fdata.ftLastWriteTime), &(buf->st_mtim));
986994
filetime_to_timespec(&(fdata.ftCreationTime), &(buf->st_ctim));
987995
if (fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
988-
WIN32_FIND_DATAW findbuf;
989-
HANDLE handle = FindFirstFileW(wfilename, &findbuf);
990-
if (handle != INVALID_HANDLE_VALUE) {
991996
if ((findbuf.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
992997
(findbuf.dwReserved0 == IO_REPARSE_TAG_SYMLINK)) {
993998
buf->st_mode = S_IFLNK | S_IREAD;
994999
if (!(findbuf.dwFileAttributes & FILE_ATTRIBUTE_READONLY))
9951000
buf->st_mode |= S_IWRITE;
9961001
}
997-
FindClose(handle);
998-
}
9991002
}
10001003
return 0;
10011004
}
1005+
error:
10021006
switch (GetLastError()) {
10031007
case ERROR_ACCESS_DENIED:
10041008
case ERROR_SHARING_VIOLATION:

0 commit comments

Comments
 (0)