mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'js/mingw-rename-fix' into maint
* js/mingw-rename-fix: compat/mingw.c: Teach mingw_rename() to replace read-only files
This commit is contained in:
commit
e23f6822df
|
@ -865,6 +865,8 @@ int mingw_connect(int sockfd, struct sockaddr *sa, size_t sz)
|
|||
#undef rename
|
||||
int mingw_rename(const char *pold, const char *pnew)
|
||||
{
|
||||
DWORD attrs;
|
||||
|
||||
/*
|
||||
* Try native rename() first to get errno right.
|
||||
* It is based on MoveFile(), which cannot overwrite existing files.
|
||||
|
@ -876,12 +878,19 @@ int mingw_rename(const char *pold, const char *pnew)
|
|||
if (MoveFileEx(pold, pnew, MOVEFILE_REPLACE_EXISTING))
|
||||
return 0;
|
||||
/* TODO: translate more errors */
|
||||
if (GetLastError() == ERROR_ACCESS_DENIED) {
|
||||
DWORD attrs = GetFileAttributes(pnew);
|
||||
if (attrs != INVALID_FILE_ATTRIBUTES && (attrs & FILE_ATTRIBUTE_DIRECTORY)) {
|
||||
if (GetLastError() == ERROR_ACCESS_DENIED &&
|
||||
(attrs = GetFileAttributes(pnew)) != INVALID_FILE_ATTRIBUTES) {
|
||||
if (attrs & FILE_ATTRIBUTE_DIRECTORY) {
|
||||
errno = EISDIR;
|
||||
return -1;
|
||||
}
|
||||
if ((attrs & FILE_ATTRIBUTE_READONLY) &&
|
||||
SetFileAttributes(pnew, attrs & ~FILE_ATTRIBUTE_READONLY)) {
|
||||
if (MoveFileEx(pold, pnew, MOVEFILE_REPLACE_EXISTING))
|
||||
return 0;
|
||||
/* revert file attributes on failure */
|
||||
SetFileAttributes(pnew, attrs);
|
||||
}
|
||||
}
|
||||
errno = EACCES;
|
||||
return -1;
|
||||
|
|
Loading…
Reference in a new issue