mingw: avoid inifinite loop in rename()

dscho · Git for Windows Build Agent · commit 62fcbf044e09 · 2018-01-22T09:32:52.000Z
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
@@ -2393,7 +2393,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
`@@ -2393,7 +2393,8 @@ int mingw_rename(const char pold, const char pnew)`
`2393`	`2393`	`return -1;`
`2394`	`2394`	`}`
`2395`	`2395`
`2396`		`- if ((attrs = GetFileAttributesW(wpnew)) != INVALID_FILE_ATTRIBUTES) {`
	`2396`	`+ if (attrs == INVALID_FILE_ATTRIBUTES &&`
	`2397`	`+ (attrs = GetFileAttributesW(wpnew)) != INVALID_FILE_ATTRIBUTES) {`
`2397`	`2398`	`if (attrs & FILE_ATTRIBUTE_DIRECTORY) {`
`2398`	`2399`	`DWORD attrsold = GetFileAttributesW(wpold);`
`2399`	`2400`	`if (attrsold == INVALID_FILE_ATTRIBUTES \|\|`