commit 7dc406252b06a19b8d5c4f2a2fdebe90a5ad65e2
author David Hewitt <1939362+davidhewitt@users.noreply.github.com> Wed Jan 15 12:47:15 2020 +0000
committer Christian Duerr <contact@christianduerr.com> Wed Jan 15 13:47:15 2020 +0100
tree 7686bcbf16a58ca49626ab9540b6d8d6b2d29161
parent c1664b348d97d6ab1a1a6956e1823ca70e64351c

Remove Windows working directory canonicalization

Fixes #3198.

CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9f0db4..d7e77a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 - Font size resetting when Alacritty is moved between screens
 - Limited payload length in clipboard escape (used for Tmux copy/paste)
 - Alacritty not ignoring keyboard events for changing WM focus on X11
+- Regression which added a UNC path prefix to the working directory on Windows
 
 ## 0.4.1
 

alacritty_terminal/src/tty/windows/conpty.rs

diff --git a/alacritty_terminal/src/tty/windows/conpty.rs b/alacritty_terminal/src/tty/windows/conpty.rs
index 0bed412..99d52b0 100644
--- a/alacritty_terminal/src/tty/windows/conpty.rs
+++ b/alacritty_terminal/src/tty/windows/conpty.rs
@@ -203,10 +203,7 @@
     }
 
     let cmdline = win32_string(&cmdline(&config));
-    let cwd = config
-        .working_directory
-        .as_ref()
-        .map(|pb| win32_string(&pb.as_path().canonicalize().unwrap()));
+    let cwd = config.working_directory.as_ref().map(win32_string);
 
     let mut proc_info: PROCESS_INFORMATION = Default::default();
     unsafe {

alacritty_terminal/src/tty/windows/winpty.rs

diff --git a/alacritty_terminal/src/tty/windows/winpty.rs b/alacritty_terminal/src/tty/windows/winpty.rs
index 2eccecb..5fa6fee 100644
--- a/alacritty_terminal/src/tty/windows/winpty.rs
+++ b/alacritty_terminal/src/tty/windows/winpty.rs
@@ -42,14 +42,13 @@
     let (conin, conout) = (agent.conin_name(), agent.conout_name());
 
     let cmdline = cmdline(&config);
-    let cwd = config.working_directory.as_ref().map(|pb| pb.as_path().canonicalize().unwrap());
 
     // Spawn process
     let spawnconfig = SpawnConfig::new(
         SpawnFlags::AUTO_SHUTDOWN | SpawnFlags::EXIT_AFTER_SHUTDOWN,
         None, // appname
         Some(&cmdline),
-        cwd.as_ref().map(|p| p.as_ref()),
+        config.working_directory.as_ref().map(|p| p.as_path()),
         None, // Env
     )
     .unwrap();