mingw: avoid infinite loop in rename()

dscho · dscho · commit d9430eef1c0d · 2018-05-29T19:25:42.000+02: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
@@ -2391,7 +2391,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
`@@ -2391,7 +2391,8 @@ int mingw_rename(const char pold, const char pnew)`
`2391`	`2391`	`return -1;`
`2392`	`2392`	`}`
`2393`	`2393`
`2394`		`- if ((attrs = GetFileAttributesW(wpnew)) != INVALID_FILE_ATTRIBUTES) {`
	`2394`	`+ if (attrs == INVALID_FILE_ATTRIBUTES &&`
	`2395`	`+ (attrs = GetFileAttributesW(wpnew)) != INVALID_FILE_ATTRIBUTES) {`
`2395`	`2396`	`if (attrs & FILE_ATTRIBUTE_DIRECTORY) {`
`2396`	`2397`	`DWORD attrsold = GetFileAttributesW(wpold);`
`2397`	`2398`	`if (attrsold == INVALID_FILE_ATTRIBUTES \|\|`