Breadway/bread-ecosystem
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

bread-utils: expose xdg::home_dir(); document two more tilde-fallback bug sites

Browse source 
home_dir() was already computed internally (home_or_root) but not exposed
— breadarr-shared's own expand_home() helper needs it to fix the same bug
class documented in this module: its own fallback (when HOME itself isn't
set) returned the literal unexpanded "~/..." input string instead of a
real path. Also documented breadmon/src/profile.rs's profiles_dir(),
fixed in that repo's own commit.
This commit is contained in:
Breadway 2026-07-17 10:11:53 +08:00
parent 49b384c549
commit 6ae7edb83c
1 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

19
bread-utils/src/xdg.rs
View file

@ -11,6 +11,11 @@
//! - `breadpad-shared/src/classifier.rs:34-39` (`model_dir`) //! - `breadpad-shared/src/classifier.rs:34-39` (`model_dir`)
//! - `breadpad-shared/src/config.rs:214-219` and `:221-226` //! - `breadpad-shared/src/config.rs:214-219` and `:221-226`
//! (`config_path`, `style_css_path`) //! (`config_path`, `style_css_path`)
//! - `breadmon/src/profile.rs:31-35` (`profiles_dir`)
//! - `breadarr-shared/src/config.rs:316-321`'s own `expand_home` helper,
//! which had the same bug in a different shape: its *own* fallback (when
//! `HOME` itself isn't set) returned the literal, unexpanded input string
//! rather than a real path.
//! //!
//! The helpers here resolve a real `$HOME` (via `dirs::home_dir()`, which //! The helpers here resolve a real `$HOME` (via `dirs::home_dir()`, which
//! itself falls back to reading `HOME` directly) before ever falling back, //! itself falls back to reading `HOME` directly) before ever falling back,
@ -18,6 +23,13 @@
use std::path::PathBuf; use std::path::PathBuf;
/// A real, absolute home directory — `dirs::home_dir()`, falling back to
/// `/root` only if that itself fails (no `HOME` env var *and* no passwd-db
/// entry, e.g. some minimal container contexts). Never a literal `"~"`.
pub fn home_dir() -> PathBuf {
home_or_root()
}
fn home_or_root() -> PathBuf { fn home_or_root() -> PathBuf {
dirs::home_dir().unwrap_or_else(|| PathBuf::from("/root")) dirs::home_dir().unwrap_or_else(|| PathBuf::from("/root"))
} }
@ -80,6 +92,13 @@ mod tests {
assert!(d.is_absolute()); assert!(d.is_absolute());
} }
#[test]
fn home_dir_is_absolute_and_never_a_literal_tilde() {
let d = home_dir();
assert!(d.is_absolute());
assert!(!d.components().any(|c| c.as_os_str() == "~"));
}
#[test] #[test]
fn data_dir_never_contains_literal_tilde() { fn data_dir_never_contains_literal_tilde() {
// Regression guard for the exact bug this module replaces: the // Regression guard for the exact bug this module replaces: the