Use an atomic rename on windows. Refs mitsuhiko#4

typst · May 18, 2023 · 50230b5 · 50230b5
1 parent e69094e
commit 50230b5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All notable changes to `self-replace` are documented here.
 
+## Unreleased
+
+- Use an atomic rename on Windows in the self replacement case for the
+  final step to avoid accidentally leaving partial executables behind.
+
 ## 1.3.1
 
 - Fixes a bug that caused the wrong path to be calculated internally

diff --git a/src/windows.rs b/src/windows.rs
@@ -32,6 +32,7 @@ extern "C" {
 
 static SELFDELETE_SUFFIX: &str = ".__selfdelete__.exe";
 static RELOCATED_SUFFIX: &str = ".__relocated__.exe";
+static TEMP_SUFFIX: &str = ".__temp__.exe";
 
 /// Utility function that delays the deletion of a file until the process shuts down.
 /// The way this works is that it marks the given executable as DELETE_ON_CLOSE, and
@@ -304,6 +305,8 @@ pub fn self_replace(new_executable: &Path) -> Result<(), io::Error> {
     let old_exe = get_temp_executable_name(get_directory_of(&exe)?, RELOCATED_SUFFIX);
     fs::rename(&exe, &old_exe)?;
     schedule_self_deletion_on_shutdown(&old_exe, None)?;
-    fs::copy(new_executable, &exe)?;
+    let temp_exe = get_temp_executable_name(get_directory_of(&exe)?, TEMP_SUFFIX);
+    fs::copy(new_executable, &temp_exe)?;
+    fs::rename(&temp_exe, &exe)?;
     Ok(())
 }