Commit fcb322f5a04382e0f0121af5803f0ef0cb42a4af
2017-03-31T23:39:33
Merge remote-tracking branch 'origin/pr/3790' into win32_posix
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76
diff --git a/src/win32/posix_w32.c b/src/win32/posix_w32.c
index 5172627..7b82d09 100644
--- a/src/win32/posix_w32.c
+++ b/src/win32/posix_w32.c
@@ -93,17 +93,31 @@ int p_unlink(const char *path)
{
git_win32_path buf;
int error;
+ int unlink_tries;
if (git_win32_path_from_utf8(buf, path) < 0)
return -1;
- error = _wunlink(buf);
-
- /* If the file could not be deleted because it was
- * read-only, clear the bit and try again */
- if (error == -1 && errno == EACCES) {
- _wchmod(buf, 0666);
+ /* wait up to 50ms if file is locked by another thread or process */
+ unlink_tries = 0;
+ while (unlink_tries < 10) {
error = _wunlink(buf);
+
+ /* If the file could not be deleted because it was
+ * read-only, clear the bit and try again */
+ if (error == -1 && errno == EACCES) {
+ _wchmod(buf, 0666);
+ error = _wunlink(buf);
+
+ if (error == -1 && errno == EACCES) {
+ Sleep(5);
+ unlink_tries++;
+ } else {
+ break;
+ }
+ } else {
+ break;
+ }
}
return error;
@@ -286,6 +300,8 @@ int p_open(const char *path, int flags, ...)
{
git_win32_path buf;
mode_t mode = 0;
+ int open_tries;
+ int handle;
if (git_win32_path_from_utf8(buf, path) < 0)
return -1;
@@ -298,7 +314,23 @@ int p_open(const char *path, int flags, ...)
va_end(arg_list);
}
- return _wopen(buf, flags | STANDARD_OPEN_FLAGS, mode & WIN32_MODE_MASK);
+ /* wait up to 50ms if file is locked by another thread or process */
+ open_tries = 0;
+ while (open_tries < 10) {
+ handle = _wopen(buf, flags | STANDARD_OPEN_FLAGS, mode & WIN32_MODE_MASK);
+ if (handle != -1) {
+ break;
+ }
+
+ if (errno == EACCES) {
+ Sleep(5);
+ open_tries++;
+ } else {
+ break;
+ }
+ }
+
+ return handle;
}
int p_creat(const char *path, mode_t mode)