proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-11 18:17:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/cmn/filebuf-atomic-unlock'

Browse Source
This commit is contained in:
Carlos Martín Nieto 2014-06-23 17:32:30 +02:00
commit 461da57aff
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/filebuf.c
View File

@ -334,8 +334,6 @@ int git_filebuf_commit(git_filebuf *file)
file->fd = -1; file->fd = -1;
p_unlink(file->path_original);
if (p_rename(file->path_lock, file->path_original) < 0) { if (p_rename(file->path_lock, file->path_original) < 0) {
giterr_set(GITERR_OS, "Failed to rename lockfile to '%s'", file->path_original); giterr_set(GITERR_OS, "Failed to rename lockfile to '%s'", file->path_original);
goto on_error; goto on_error;

30
src/win32/posix_w32.c
View File

@ -591,6 +591,31 @@ int p_access(const char* path, mode_t mode)
return _waccess(buf, mode); return _waccess(buf, mode);
} }
static int ensure_writable(wchar_t *fpath)
{
DWORD attrs;
attrs = GetFileAttributesW(fpath);
if (attrs == INVALID_FILE_ATTRIBUTES) {
if (GetLastError() == ERROR_FILE_NOT_FOUND)
return 0;
giterr_set(GITERR_OS, "failed to get attributes");
return -1;
}
if (!(attrs & FILE_ATTRIBUTE_READONLY))
return 0;
attrs &= ~FILE_ATTRIBUTE_READONLY;
if (!SetFileAttributesW(fpath, attrs)) {
giterr_set(GITERR_OS, "failed to set attributes");
return -1;
}
return 0;
}
int p_rename(const char *from, const char *to) int p_rename(const char *from, const char *to)
{ {
git_win32_path wfrom; git_win32_path wfrom;
@ -602,12 +627,13 @@ int p_rename(const char *from, const char *to)
if (utf8_to_16_with_errno(wfrom, from) < 0 || if (utf8_to_16_with_errno(wfrom, from) < 0 ||
utf8_to_16_with_errno(wto, to) < 0) utf8_to_16_with_errno(wto, to) < 0)
return -1; return -1;
/* wait up to 50ms if file is locked by another thread or process */ /* wait up to 50ms if file is locked by another thread or process */
rename_tries = 0; rename_tries = 0;
rename_succeeded = 0; rename_succeeded = 0;
while (rename_tries < 10) { while (rename_tries < 10) {
if (MoveFileExW(wfrom, wto, MOVEFILE_REPLACE_EXISTING | MOVEFILE_COPY_ALLOWED) != 0) { if (ensure_writable(wto) == 0 &&
MoveFileExW(wfrom, wto, MOVEFILE_REPLACE_EXISTING | MOVEFILE_COPY_ALLOWED) != 0) {
rename_succeeded = 1; rename_succeeded = 1;
break; break;
} }