Merge pull request #96639 from bruvzg/symlink_ren

akien-mga · akien-mga · commit a87ceed16370 · 2024-09-06T22:38:58.000+02:00
Fix renaming directory symlinks on Linux.
diff --git a/drivers/unix/dir_access_unix.cpp b/drivers/unix/dir_access_unix.cpp
@@ -397,12 +397,18 @@ Error DirAccessUnix::rename(String p_path, String p_new_path) {
 	}
 
 	p_path = fix_path(p_path);
+	if (p_path.ends_with("/")) {
+		p_path = p_path.left(-1);
+	}
 
 	if (p_new_path.is_relative_path()) {
 		p_new_path = get_current_dir().path_join(p_new_path);
 	}
 
 	p_new_path = fix_path(p_new_path);
+	if (p_new_path.ends_with("/")) {
+		p_new_path = p_new_path.left(-1);
+	}
 
 	return ::rename(p_path.utf8().get_data(), p_new_path.utf8().get_data()) == 0 ? OK : FAILED;
 }

Original file line number	Diff line number	Diff line change
`@@ -397,12 +397,18 @@ Error DirAccessUnix::rename(String p_path, String p_new_path) {`
`397`	`397`	`}`
`398`	`398`
`399`	`399`	`p_path = fix_path(p_path);`
	`400`	`+ if (p_path.ends_with("/")) {`
	`401`	`+ p_path = p_path.left(-1);`
	`402`	`+ }`
`400`	`403`
`401`	`404`	`if (p_new_path.is_relative_path()) {`
`402`	`405`	`p_new_path = get_current_dir().path_join(p_new_path);`
`403`	`406`	`}`
`404`	`407`
`405`	`408`	`p_new_path = fix_path(p_new_path);`
	`409`	`+ if (p_new_path.ends_with("/")) {`
	`410`	`+ p_new_path = p_new_path.left(-1);`
	`411`	`+ }`
`406`	`412`
`407`	`413`	`return ::rename(p_path.utf8().get_data(), p_new_path.utf8().get_data()) == 0 ? OK : FAILED;`
`408`	`414`	`}`