mingw: avoid inifinite loop in rename()

dscho · dscho · commit e493ca541b3f · 2017-11-29T11:36:27.000+01:00
We have this loop where we try to remove the read-only attribute when rename() fails and try again. If it fails again, let's not try to remove the read-only attribute and try *again*. This fixes #1299 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
diff --git a/compat/mingw.c b/compat/mingw.c
@@ -2423,7 +2423,8 @@ int mingw_rename(const char *pold, const char *pnew)
 		return -1;
 	}
 
-	if ((attrs = GetFileAttributesW(wpnew)) != INVALID_FILE_ATTRIBUTES) {
+	if (attrs == INVALID_FILE_ATTRIBUTES &&
+	    (attrs = GetFileAttributesW(wpnew)) != INVALID_FILE_ATTRIBUTES) {
 		if (attrs & FILE_ATTRIBUTE_DIRECTORY) {
 			DWORD attrsold = GetFileAttributesW(wpold);
 			if (attrsold == INVALID_FILE_ATTRIBUTES ||

Original file line number	Diff line number	Diff line change
`@@ -2423,7 +2423,8 @@ int mingw_rename(const char pold, const char pnew)`
`2423`	`2423`	`return -1;`
`2424`	`2424`	`}`
`2425`	`2425`
`2426`		`- if ((attrs = GetFileAttributesW(wpnew)) != INVALID_FILE_ATTRIBUTES) {`
	`2426`	`+ if (attrs == INVALID_FILE_ATTRIBUTES &&`
	`2427`	`+ (attrs = GetFileAttributesW(wpnew)) != INVALID_FILE_ATTRIBUTES) {`
`2427`	`2428`	`if (attrs & FILE_ATTRIBUTE_DIRECTORY) {`
`2428`	`2429`	`DWORD attrsold = GetFileAttributesW(wpold);`
`2429`	`2430`	`if (attrsold == INVALID_FILE_ATTRIBUTES \|\|`