Merge branch 'pascalkuthe/main'

Byron · Byron · commit d47cebe3b230 · 2023-03-30T16:37:28.000+02:00
diff --git a/cargo-smart-release/src/crates_index.rs b/cargo-smart-release/src/crates_index.rs
@@ -36,7 +36,7 @@ fn default_path() -> PathBuf {
         .or_else(|| {
             std::env::var_os("CARGO_HOME")
                 .map(PathBuf::from)
-                .or_else(|| std::env::var_os("HOME").map(|dir| Path::new(&dir).join(".cargo")))
+                .or_else(|| home::home_dir().map(|dir| Path::new(&dir).join(".cargo")))
         })
         .expect("one of these paths works")
         .join("registry/index")
diff --git a/gix-config/src/file/init/comfort.rs b/gix-config/src/file/init/comfort.rs
@@ -1,5 +1,3 @@
-use std::path::PathBuf;
-
 use crate::{
     file::{init, Metadata},
     path, source, File, Source,
@@ -30,7 +28,7 @@ impl File<'static> {
             .flat_map(|kind| kind.sources())
             .filter_map(|source| {
                 let path = source
-                    .storage_location(&mut |name| std::env::var_os(name))
+                    .storage_location(&mut gix_path::env_var)
                     .and_then(|p| p.is_file().then_some(p))
                     .map(|p| p.into_owned());
 
@@ -43,7 +41,7 @@ impl File<'static> {
                 .into()
             });
 
-        let home = std::env::var("HOME").ok().map(PathBuf::from);
+        let home = gix_path::home_dir();
         let options = init::Options {
             includes: init::includes::Options::follow_without_conditional(home.as_deref()),
             ..Default::default()
@@ -59,7 +57,7 @@ impl File<'static> {
     ///
     /// [`gix-config`'s documentation]: https://git-scm.com/docs/gix-config#Documentation/gix-config.txt-GITCONFIGCOUNT
     pub fn from_environment_overrides() -> Result<File<'static>, init::from_env::Error> {
-        let home = std::env::var("HOME").ok().map(PathBuf::from);
+        let home = gix_path::home_dir();
         let options = init::Options {
             includes: init::includes::Options::follow_without_conditional(home.as_deref()),
             ..Default::default()
@@ -88,7 +86,7 @@ impl File<'static> {
             let mut path = dir.into();
             path.push(
                 source
-                    .storage_location(&mut |n| std::env::var_os(n))
+                    .storage_location(&mut gix_path::env_var)
                     .expect("location available for local"),
             );
             let local = Self::from_path_no_includes(&path, source)?;
@@ -101,7 +99,7 @@ impl File<'static> {
                 let source = Source::Worktree;
                 let path = git_dir.join(
                     source
-                        .storage_location(&mut |n| std::env::var_os(n))
+                        .storage_location(&mut gix_path::env_var)
                         .expect("location available for worktree"),
                 );
                 Self::from_path_no_includes(path, source)
@@ -110,7 +108,7 @@ impl File<'static> {
         }
         .transpose()?;
 
-        let home = std::env::var("HOME").ok().map(PathBuf::from);
+        let home = gix_path::home_dir();
         let options = init::Options {
             includes: init::includes::Options::follow(
                 path::interpolate::Context {
diff --git a/gix-path/src/lib.rs b/gix-path/src/lib.rs
@@ -56,6 +56,10 @@
 pub struct Spec(bstr::BString);
 
 mod convert;
+use std::env::var_os;
+use std::ffi::OsString;
+use std::path::PathBuf;
+
 pub use convert::*;
 
 mod util;
@@ -66,3 +70,40 @@ mod spec;
 ///
 pub mod realpath;
 pub use realpath::function::{realpath, realpath_opts};
+
+/// Returns a platform independent home directory.
+///
+/// On unix this simply returns $HOME on windows this uses %HOMEDRIVE%\%HOMEPATH% or %USERPROFILE%
+pub fn home_dir() -> Option<PathBuf> {
+    if let Some(home) = var_os("HOME") {
+        return Some(home.into());
+    }
+
+    // NOTE: technically we should also check HOMESHARE in case HOME is a UNC path
+    //       but git doesn't do this either so probably best to wait for an upstream fix.
+    #[cfg(windows)]
+    {
+        if let Some(homedrive) = var_os("HOMEDRIVE") {
+            if let Some(home_path) = var_os("HOMEPATH") {
+                let home = PathBuf::from(homedrive).join(home_path);
+                if home.metadata().map_or(false, |home| home.is_dir()) {
+                    return Some(home);
+                }
+            }
+        }
+        if let Some(userprofile) = var_os("USERPROFILE") {
+            return Some(userprofile.into());
+        }
+    }
+    None
+}
+
+/// Returns the contents of an environment variable of `name` with some special handling
+/// for certain environment variables (like `HOME`) for platform compatibility.
+pub fn env_var(name: &str) -> Option<OsString> {
+    if name == "HOME" {
+        home_dir().map(PathBuf::into_os_string)
+    } else {
+        std::env::var_os(name)
+    }
+}
diff --git a/gix-path/tests/path.rs b/gix-path/tests/path.rs
@@ -2,4 +2,15 @@ pub type Result<T = ()> = std::result::Result<T, Box<dyn std::error::Error>>;
 
 mod convert;
 mod realpath;
+mod home_dir {
+    #[test]
+    fn returns_existing_directory() {
+        if let Some(home) = gix_path::home_dir() {
+            assert!(
+                home.is_dir(),
+                "the home directory would typically exist, even though on unix we don't test for that."
+            );
+        }
+    }
+}
 mod util;
diff --git a/gix/src/config/cache/access.rs b/gix/src/config/cache/access.rs
@@ -203,10 +203,9 @@ impl Cache {
         std::env::var_os("XDG_CONFIG_HOME")
             .map(|path| (PathBuf::from(path), &self.xdg_config_home_env))
             .or_else(|| {
-                std::env::var_os("HOME").map(|path| {
+                gix_path::home_dir().map(|mut p| {
                     (
                         {
-                            let mut p = PathBuf::from(path);
                             p.push(".config");
                             p
                         },
@@ -226,8 +225,6 @@ impl Cache {
     /// We never fail for here even if the permission is set to deny as we `gix-config` will fail later
     /// if it actually wants to use the home directory - we don't want to fail prematurely.
     pub(crate) fn home_dir(&self) -> Option<PathBuf> {
-        std::env::var_os("HOME")
-            .map(PathBuf::from)
-            .and_then(|path| self.home_env.check_opt(path))
+        gix_path::home_dir().and_then(|path| self.home_env.check_opt(path))
     }
 }
diff --git a/gix/src/config/cache/init.rs b/gix/src/config/cache/init.rs
@@ -95,7 +95,7 @@ impl Cache {
                             "HOME" => Some(home_env),
                             _ => None,
                         }
-                        .and_then(|perm| perm.check_opt(name).and_then(std::env::var_os))
+                        .and_then(|perm| perm.check_opt(name).and_then(gix_path::env_var))
                     })
                     .map(|p| (source, p.into_owned()))
             })
diff --git a/gix/src/open/repository.rs b/gix/src/open/repository.rs
@@ -180,9 +180,7 @@ impl ThreadSafeRepository {
         };
         let head = refs.find("HEAD").ok();
         let git_install_dir = crate::path::install_dir().ok();
-        let home = std::env::var_os("HOME")
-            .map(PathBuf::from)
-            .and_then(|home| env.home.check_opt(home));
+        let home = gix_path::home_dir().and_then(|home| env.home.check_opt(home));
 
         let mut filter_config_section = filter_config_section.unwrap_or(config::section::is_trusted);
         let config = config::Cache::from_stage_one(

Original file line number	Diff line number	Diff line change
`@@ -203,10 +203,9 @@ impl Cache {`
`203`	`203`	`std::env::var_os("XDG_CONFIG_HOME")`
`204`	`204`	`.map(\|path\| (PathBuf::from(path), &self.xdg_config_home_env))`
`205`	`205`	`.or_else(\|\| {`
`206`		`- std::env::var_os("HOME").map(\|path\| {`
	`206`	`+ gix_path::home_dir().map(\|mut p\| {`
`207`	`207`	`(`
`208`	`208`	`{`
`209`		`- let mut p = PathBuf::from(path);`
`210`	`209`	`p.push(".config");`
`211`	`210`	`p`
`212`	`211`	`},`
`@@ -226,8 +225,6 @@ impl Cache {`
`226`	`225`	/// We never fail for here even if the permission is set to deny as we `gix-config` will fail later
`227`	`226`	`/// if it actually wants to use the home directory - we don't want to fail prematurely.`
`228`	`227`	`pub(crate) fn home_dir(&self) -> Option<PathBuf> {`
`229`		`- std::env::var_os("HOME")`
`230`		`- .map(PathBuf::from)`
`231`		`- .and_then(\|path\| self.home_env.check_opt(path))`
	`228`	`+ gix_path::home_dir().and_then(\|path\| self.home_env.check_opt(path))`
`232`	`229`	`}`
`233`	`230`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ impl Cache {`
`95`	`95`	`"HOME" => Some(home_env),`
`96`	`96`	`_ => None,`
`97`	`97`	`}`
`98`		`- .and_then(\|perm\| perm.check_opt(name).and_then(std::env::var_os))`
	`98`	`+ .and_then(\|perm\| perm.check_opt(name).and_then(gix_path::env_var))`
`99`	`99`	`})`
`100`	`100`	`.map(\|p\| (source, p.into_owned()))`
`101`	`101`	`})`