mingw: avoid infinite loop in rename()

dscho · dscho · commit e2ddb4f9d83a · 2018-08-23T21:19:32.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
@@ -2428,7 +2428,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
`@@ -2428,7 +2428,8 @@ int mingw_rename(const char pold, const char pnew)`
`2428`	`2428`	`return -1;`
`2429`	`2429`	`}`
`2430`	`2430`
`2431`		`- if ((attrs = GetFileAttributesW(wpnew)) != INVALID_FILE_ATTRIBUTES) {`
	`2431`	`+ if (attrs == INVALID_FILE_ATTRIBUTES &&`
	`2432`	`+ (attrs = GetFileAttributesW(wpnew)) != INVALID_FILE_ATTRIBUTES) {`
`2432`	`2433`	`if (attrs & FILE_ATTRIBUTE_DIRECTORY) {`
`2433`	`2434`	`DWORD attrsold = GetFileAttributesW(wpold);`
`2434`	`2435`	`if (attrsold == INVALID_FILE_ATTRIBUTES \|\|`