summaryrefslogtreecommitdiffstats
path: root/alacritty_terminal
diff options
context:
space:
mode:
authorDavid Hewitt <1939362+davidhewitt@users.noreply.github.com>2020-01-15 12:47:15 +0000
committerChristian Duerr <contact@christianduerr.com>2020-01-15 13:47:15 +0100
commit7dc406252b06a19b8d5c4f2a2fdebe90a5ad65e2 (patch)
tree7686bcbf16a58ca49626ab9540b6d8d6b2d29161 /alacritty_terminal
parentc1664b348d97d6ab1a1a6956e1823ca70e64351c (diff)
Remove Windows working directory canonicalization
Fixes #3198.
Diffstat (limited to 'alacritty_terminal')
-rw-r--r--alacritty_terminal/src/tty/windows/conpty.rs5
-rw-r--r--alacritty_terminal/src/tty/windows/winpty.rs3
2 files changed, 2 insertions, 6 deletions
diff --git a/alacritty_terminal/src/tty/windows/conpty.rs b/alacritty_terminal/src/tty/windows/conpty.rs
index 0bed412b..99d52b05 100644
--- a/alacritty_terminal/src/tty/windows/conpty.rs
+++ b/alacritty_terminal/src/tty/windows/conpty.rs
@@ -203,10 +203,7 @@ pub fn new<C>(config: &Config<C>, size: &SizeInfo, _window_id: Option<usize>) ->
}
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 {
diff --git a/alacritty_terminal/src/tty/windows/winpty.rs b/alacritty_terminal/src/tty/windows/winpty.rs
index 2eccecbf..5fa6feea 100644
--- a/alacritty_terminal/src/tty/windows/winpty.rs
+++ b/alacritty_terminal/src/tty/windows/winpty.rs
@@ -42,14 +42,13 @@ pub fn new<C>(config: &Config<C>, size: &SizeInfo, _window_id: Option<usize>) ->
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();