Skip to content

Commit 1825a92

Browse files
kbleesdscho
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 6916c16 commit 1825a92

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
@@ -934,6 +934,7 @@ static int has_valid_directory_prefix(wchar_t *wfilename)
934934
int mingw_lstat(const char *file_name, struct stat *buf)
935935
{
936936
WIN32_FILE_ATTRIBUTE_DATA fdata;
937+
WIN32_FIND_DATAW findbuf = { 0 };
937938
wchar_t wfilename[MAX_LONG_PATH];
938939
int wlen = xutftowcs_long_path(wfilename, file_name);
939940
if (wlen < 0)
@@ -948,6 +949,13 @@ int mingw_lstat(const char *file_name, struct stat *buf)
948949
}
949950

950951
if (GetFileAttributesExW(wfilename, GetFileExInfoStandard, &fdata)) {
952+
/* for reparse points, use FindFirstFile to get the reparse tag */
953+
if (fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
954+
HANDLE handle = FindFirstFileW(wfilename, &findbuf);
955+
if (handle == INVALID_HANDLE_VALUE)
956+
goto error;
957+
FindClose(handle);
958+
}
951959
buf->st_ino = 0;
952960
buf->st_gid = 0;
953961
buf->st_uid = 0;
@@ -960,20 +968,16 @@ int mingw_lstat(const char *file_name, struct stat *buf)
960968
filetime_to_timespec(&(fdata.ftLastWriteTime), &(buf->st_mtim));
961969
filetime_to_timespec(&(fdata.ftCreationTime), &(buf->st_ctim));
962970
if (fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
963-
WIN32_FIND_DATAW findbuf;
964-
HANDLE handle = FindFirstFileW(wfilename, &findbuf);
965-
if (handle != INVALID_HANDLE_VALUE) {
966971
if ((findbuf.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
967972
(findbuf.dwReserved0 == IO_REPARSE_TAG_SYMLINK)) {
968973
buf->st_mode = S_IFLNK | S_IREAD;
969974
if (!(findbuf.dwFileAttributes & FILE_ATTRIBUTE_READONLY))
970975
buf->st_mode |= S_IWRITE;
971976
}
972-
FindClose(handle);
973-
}
974977
}
975978
return 0;
976979
}
980+
error:
977981
switch (GetLastError()) {
978982
case ERROR_ACCESS_DENIED:
979983
case ERROR_SHARING_VIOLATION:

0 commit comments

Comments
 (0)