fix(windows): normalize temp socket paths (#4923)

3 files changed, 20 insertions, 3 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 8fc53c96..42b08736 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4960,6 +4960,7 @@ dependencies = [
  "crossterm",
  "curl-sys",
  "directories",
+ "dunce",
  "expect-test",
  "humantime",
  "include_dir",
diff --git a/zellij-utils/Cargo.toml b/zellij-utils/Cargo.toml
index 4c659cf9..24f0e8c2 100644
--- a/zellij-utils/Cargo.toml
+++ b/zellij-utils/Cargo.toml
@@ -65,6 +65,7 @@ windows-sys = { workspace = true, features = [
     "Win32_System_Threading",
 ] }
 winapi = { version = "0.3.9", default-features = false }
+dunce = "1.0"
 
 [dev-dependencies]
 insta = { version = "1.6.0", features = ["backtrace"] }
diff --git a/zellij-utils/src/consts.rs b/zellij-utils/src/consts.rs
index 0ef1f2bf..64c3ad95 100644
--- a/zellij-utils/src/consts.rs
+++ b/zellij-utils/src/consts.rs
@@ -307,24 +307,39 @@ mod not_unix {
     use super::*;
     use crate::envs;
     pub use crate::shared::set_permissions;
+    #[cfg(windows)]
+    use dunce;
     use lazy_static::lazy_static;
     use std::env::temp_dir;
 
+    #[cfg(windows)]
+    fn canonicalize_path(path: PathBuf) -> PathBuf {
+        dunce::canonicalize(&path).unwrap_or(path)
+    }
+
+    #[cfg(not(windows))]
+    fn canonicalize_path(path: PathBuf) -> PathBuf {
+        path
+    }
+
     pub const ZELLIJ_SOCK_MAX_LENGTH: usize = 256;
 
     lazy_static! {
-        pub static ref ZELLIJ_TMP_DIR: PathBuf = temp_dir().join("zellij");
+        pub static ref ZELLIJ_TMP_DIR: PathBuf = {
+            let tmp_dir = canonicalize_path(temp_dir());
+            tmp_dir.join("zellij")
+        };
         pub static ref ZELLIJ_TMP_LOG_DIR: PathBuf = ZELLIJ_TMP_DIR.join("zellij-log");
         pub static ref ZELLIJ_TMP_LOG_FILE: PathBuf = ZELLIJ_TMP_LOG_DIR.join("zellij.log");
         pub static ref ZELLIJ_SOCK_DIR: PathBuf = {
-            let mut ipc_dir = envs::get_socket_dir().map_or_else(
+            let mut ipc_dir = canonicalize_path(envs::get_socket_dir().map_or_else(
                 |_| {
                     ZELLIJ_PROJ_DIR
                         .runtime_dir()
                         .map_or_else(|| ZELLIJ_TMP_DIR.clone(), |p| p.to_owned())
                 },
                 PathBuf::from,
-            );
+            ));
             ipc_dir.push(CLIENT_SERVER_CONTRACT_DIR.clone());
             ipc_dir
         };