@@ -0,0 +1,5 @@
+---
+"fnm": patch
+---
+
+Allow reading non-unicode paths from environment variables
@@ -185,18 +185,20 @@ fn warn_if_multishell_path_not_in_path_env_var(
     multishell_path: &std::path::Path,
     config: &FnmConfig,
 ) {
-    let bin_path = if cfg!(unix) {
-        multishell_path.join("bin")
-    } else {
-        multishell_path.to_path_buf()
-    };
-
-    let fixed_path = bin_path.to_str().and_then(shell::maybe_fix_windows_path);
-    let fixed_path = fixed_path.as_ref().map(|x| &x[..]);
-
-    for path in std::env::split_paths(&std::env::var("PATH").unwrap_or_default()) {
-        if bin_path == path || fixed_path == path.to_str() {
-            return;
+    if let Some(path_var) = std::env::var_os("PATH") {
+        let bin_path = if cfg!(unix) {
+            multishell_path.join("bin")
+        } else {
+            multishell_path.to_path_buf()
+        };
+
+        let fixed_path = bin_path.to_str().and_then(shell::maybe_fix_windows_path);
+        let fixed_path = fixed_path.as_deref();
+
+        for path in std::env::split_paths(&path_var) {
+            if bin_path == path || fixed_path == path.to_str() {
+                return;
+            }
         }
     }
 
 
@@ -5,7 +5,7 @@ use crate::path_ext::PathExt;
 
 fn xdg_dir(env: &str) -> Option<PathBuf> {
     if cfg!(windows) {
-        let env_var = std::env::var(env).ok()?;
+        let env_var = std::env::var_os(env)?;
         Some(PathBuf::from(env_var))
     } else {
         // On non-Windows platforms, `etcetera` already handles XDG variables
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"fnm": patch
 +---
++
 +Allow reading non-unicode paths from environment variables