mingw_open_existing: handle directories better #5342
Conversation
CreateFileW() requires FILE_FLAG_BACKUP_SEMANTICS to create a directory handle [1] and errors out with ERROR_ACCESS_DENIED without this flag. Fall back to accessing Directory handles this way. [1] https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-createfilew#directories This fixes git-for-windows#5068 Signed-off-by: Matthias Aßhauer <[email protected]>
| @@ -810,13 +810,24 @@ static int mingw_open_existing(const wchar_t *filename, int oflags, ...) | |||
| &security_attributes, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); | |||
| if (handle == INVALID_HANDLE_VALUE) { | |||
| DWORD err = GetLastError(); | |||
| if (err == ERROR_ACCESS_DENIED) { | |||
| DWORD attrs = GetFileAttributesW(filename); | |||
There was a problem hiding this comment.
We could probably also check GetFileAttributesW() before the first CreateFileW() and avoid calling CreateFileW() twice.
There was a problem hiding this comment.
I think the current version is fine because it optimizes for the common case, avoiding the extra GetFileAttributesW() & CreateFileW() calls for the vast majority of calls.
| @@ -810,13 +810,24 @@ static int mingw_open_existing(const wchar_t *filename, int oflags, ...) | |||
| &security_attributes, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); | |||
| if (handle == INVALID_HANDLE_VALUE) { | |||
| DWORD err = GetLastError(); | |||
| if (err == ERROR_ACCESS_DENIED) { | |||
| DWORD attrs = GetFileAttributesW(filename); | |||
There was a problem hiding this comment.
I think the current version is fine because it optimizes for the common case, avoiding the extra GetFileAttributesW() & CreateFileW() calls for the vast majority of calls.
|
It looks like t5616 has a newly-introduced flake now:
I've restarted the job. |
|
/add relnote bug Git for Windows used to issue a misleading warning when The workflow run was started |
Git for Windows used [to issue a misleading warning when `.gitignore` was a directory](git-for-windows/git#5068), which has been [fixed](git-for-windows/git#5342). Signed-off-by: gitforwindowshelper[bot] <[email protected]>
CreateFileW()requiresFILE_FLAG_BACKUP_SEMANTICSto create a directory handle and errors out withERROR_ACCESS_DENIEDwithout this flag. Fall back to accessing Directory handles this way.This fixes #5068