Skip to content

Commit 37600a2

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 48de3c0 commit 37600a2

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
@@ -763,6 +763,7 @@ static int has_valid_directory_prefix(wchar_t *wfilename)
763763
int mingw_lstat(const char *file_name, struct stat *buf)
764764
{
765765
WIN32_FILE_ATTRIBUTE_DATA fdata;
766+
WIN32_FIND_DATAW findbuf = { 0 };
766767
wchar_t wfilename[MAX_LONG_PATH];
767768
int wlen = xutftowcs_long_path(wfilename, file_name);
768769
if (wlen < 0)
@@ -777,6 +778,13 @@ int mingw_lstat(const char *file_name, struct stat *buf)
777778
}
778779

779780
if (GetFileAttributesExW(wfilename, GetFileExInfoStandard, &fdata)) {
781+
/* for reparse points, use FindFirstFile to get the reparse tag */
782+
if (fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
783+
HANDLE handle = FindFirstFileW(wfilename, &findbuf);
784+
if (handle == INVALID_HANDLE_VALUE)
785+
goto error;
786+
FindClose(handle);
787+
}
780788
buf->st_ino = 0;
781789
buf->st_gid = 0;
782790
buf->st_uid = 0;
@@ -789,20 +797,16 @@ int mingw_lstat(const char *file_name, struct stat *buf)
789797
filetime_to_timespec(&(fdata.ftLastWriteTime), &(buf->st_mtim));
790798
filetime_to_timespec(&(fdata.ftCreationTime), &(buf->st_ctim));
791799
if (fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
792-
WIN32_FIND_DATAW findbuf;
793-
HANDLE handle = FindFirstFileW(wfilename, &findbuf);
794-
if (handle != INVALID_HANDLE_VALUE) {
795800
if ((findbuf.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
796801
(findbuf.dwReserved0 == IO_REPARSE_TAG_SYMLINK)) {
797802
buf->st_mode = S_IFLNK | S_IREAD;
798803
if (!(findbuf.dwFileAttributes & FILE_ATTRIBUTE_READONLY))
799804
buf->st_mode |= S_IWRITE;
800805
}
801-
FindClose(handle);
802-
}
803806
}
804807
return 0;
805808
}
809+
error:
806810
switch (GetLastError()) {
807811
case ERROR_ACCESS_DENIED:
808812
case ERROR_SHARING_VIOLATION:

0 commit comments

Comments
 (0)