Skip to content

Commit 9fac53c

Browse files
dschomjcheetham
authored andcommitted
mingw: emulate stat() a little more faithfully
When creating directories via `safe_create_leading_directories()`, we might encounter an already-existing directory which is not readable by the current user. To handle that situation, Git's code calls `stat()` to determine whether we're looking at a directory. In such a case, `CreateFile()` will fail, though, no matter what, and consequently `mingw_stat()` will fail, too. But POSIX semantics seem to still allow `stat()` to go forward. So let's call `mingw_lstat()` for the rescue if we fail to get a file handle due to denied permission in `mingw_stat()`, and fill the stat info that way. We need to be careful to not allow this to go forward in case that we're looking at a symbolic link: to resolve the link, we would still have to create a file handle, and we just found out that we cannot. Therefore, `stat()` still needs to fail with `EACCES` in that case. This fixes git-for-windows#2531. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent e40daec commit 9fac53c

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

compat/mingw.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1127,7 +1127,19 @@ int mingw_stat(const char *file_name, struct stat *buf)
11271127
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL,
11281128
OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
11291129
if (hnd == INVALID_HANDLE_VALUE) {
1130-
errno = err_win_to_posix(GetLastError());
1130+
DWORD err = GetLastError();
1131+
1132+
if (err == ERROR_ACCESS_DENIED &&
1133+
!mingw_lstat(file_name, buf) &&
1134+
!S_ISLNK(buf->st_mode))
1135+
/*
1136+
* POSIX semantics state to still try to fill
1137+
* information, even if permission is denied to create
1138+
* a file handle.
1139+
*/
1140+
return 0;
1141+
1142+
errno = err_win_to_posix(err);
11311143
return -1;
11321144
}
11331145
result = get_file_info_by_handle(hnd, buf);

0 commit comments

Comments
 (0)