Escaped config strings (ghostty_os::osbytes) kept reaching OS boundaries undecoded, and decoding was occasionally applied to plain text. The root cause was that both were plain `String`s. Now: - `EncodedOs` is a newtype (no Display/AsRef<Path>) that decodes only via to_os/to_path/to_bytes/to_wide; plain text enters via from_plain_text. OS helpers (env, home, xdg, passwd, resources dir, path expansion), config::Path, WorkingDirectory, theme/file_load/edit paths, terminal pwd, OpenUrl/Pwd actions and termio cwd use it, so the compiler forces decoding at every boundary. os::open takes &OsStr. Config output is unchanged. Fixes all rows of docs/rewrite/notes/review-rv5-codex.md (final-Z7.md): screen-file copy; regex/OSC 8 URLs no longer decoded (regression); lossless Windows WTF-8/WTF-16 for args, env and CreateProcessW; Windows resources dir/TERMINFO; color OSC request lists and X11 color lookup no longer allocate globally (C zero-allocation test extended); macOS Mach handler resumes all threads before KERN_FAILURE (hang regression) and SIGABRT minidumps go through the exception thread; plus open-config, background images, crash dir, ssh cache, exe dir/PATH, fontconfig filenames, file links, kitty TMPDIR, .hushlogin and benchmark paths. The typing also surfaced and fixed gtk-custom-css, bell audio, bash HISTFILE, OSC 52 writes and the C config getters. Test Plan: - cargo test --workspace (3376 passed) - just check-macos (both), just check-windows, just check-wasm - diff <(ghostty-rs +show-config --default --docs) \ <(ghostty +show-config --default --docs)
201 lines
6.5 KiB
Rust
201 lines
6.5 KiB
Rust
//! Implementation of the XDG Base Directory specification
|
|
//! (https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html)
|
|
|
|
use std::ffi::CStr;
|
|
|
|
use crate::{env::getenv_not_empty, homedir, osbytes::EncodedOs};
|
|
|
|
#[derive(Debug, Clone, Default)]
|
|
pub struct Options<'a> {
|
|
/// Subdirectories to join to the base. This avoids extra allocations
|
|
/// when building up the directory. This is commonly the application.
|
|
pub subdir: Option<&'a str>,
|
|
|
|
/// The home directory for the user (encoded OS string). If this is not set, we will attempt
|
|
/// to look it up which is an expensive process. By setting this, you can
|
|
/// avoid lookups.
|
|
pub home: Option<&'a EncodedOs>,
|
|
}
|
|
|
|
#[derive(Debug, thiserror::Error)]
|
|
pub enum Error {
|
|
#[error("no home directory could be determined")]
|
|
NoHomeDir,
|
|
/// A macOS Foundation API (e.g. `NSFileManager`) failed (Zig:
|
|
/// `error.AppleAPIFailed`).
|
|
#[error("apple api failed")]
|
|
AppleApiFailed,
|
|
}
|
|
|
|
/// Get the XDG user config directory.
|
|
pub fn config(opts: &Options<'_>) -> Result<EncodedOs, Error> {
|
|
dir(opts, "XDG_CONFIG_HOME", ".config")
|
|
}
|
|
|
|
/// Get the XDG cache directory.
|
|
pub fn cache(opts: &Options<'_>) -> Result<EncodedOs, Error> {
|
|
dir(opts, "XDG_CACHE_HOME", ".cache")
|
|
}
|
|
|
|
/// Get the XDG state directory.
|
|
pub fn state(opts: &Options<'_>) -> Result<EncodedOs, Error> {
|
|
dir(opts, "XDG_STATE_HOME", ".local/state")
|
|
}
|
|
|
|
/// Unified helper to get XDG directories that follow a common pattern.
|
|
fn dir(opts: &Options<'_>, env: &str, default_subdir: &str) -> Result<EncodedOs, Error> {
|
|
// If we have a cached home dir, use that.
|
|
if let Some(home) = opts.home {
|
|
return Ok(home.join_plain(&[default_subdir, opts.subdir.unwrap_or("")]));
|
|
}
|
|
|
|
// First check the env var. On Windows we treat `LOCALAPPDATA` as a
|
|
// fallback for the XDG variable.
|
|
let env_value = getenv_not_empty(env);
|
|
#[cfg(windows)]
|
|
let env_value = env_value.or_else(|| getenv_not_empty("LOCALAPPDATA"));
|
|
if let Some(env) = env_value {
|
|
// If we have a subdir, then we join it.
|
|
if let Some(subdir) = opts.subdir {
|
|
return Ok(env.join_plain(&[subdir]));
|
|
}
|
|
|
|
return Ok(env);
|
|
}
|
|
|
|
// Get our home dir
|
|
if let Ok(Some(home)) = homedir::home() {
|
|
return Ok(home.join_plain(&[default_subdir, opts.subdir.unwrap_or("")]));
|
|
}
|
|
|
|
Err(Error::NoHomeDir)
|
|
}
|
|
|
|
/// Parses the xdg-terminal-exec specification. This expects argv[0] to
|
|
/// be "xdg-terminal-exec".
|
|
pub fn parse_terminal_exec<'a>(argv: &'a [&'a CStr]) -> Option<&'a [&'a CStr]> {
|
|
let first = argv.first()?.to_bytes();
|
|
let base = first.rsplit(|&b| b == b'/').next().unwrap_or(first);
|
|
if base != b"xdg-terminal-exec" {
|
|
return None;
|
|
}
|
|
|
|
// We expect at least one argument
|
|
if argv.len() < 2 {
|
|
return Some(&[]);
|
|
}
|
|
|
|
// If the first argument is "-e" we skip it.
|
|
let start = if argv[1].to_bytes() == b"-e" { 2 } else { 1 };
|
|
Some(&argv[start..])
|
|
}
|
|
|
|
#[cfg(all(test, unix))]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn config_default() {
|
|
let value = crate::testutil::with_env_lock(|| config(&Options::default()).unwrap());
|
|
assert!(!value.is_empty());
|
|
}
|
|
|
|
#[test]
|
|
fn cache_directory_paths() {
|
|
let mock_home = &EncodedOs::from_plain_text("/Users/test");
|
|
|
|
// Test base path
|
|
let p = cache(&Options {
|
|
home: Some(mock_home),
|
|
..Default::default()
|
|
})
|
|
.unwrap();
|
|
assert_eq!(p, "/Users/test/.cache");
|
|
|
|
// Test with subdir
|
|
let p = cache(&Options {
|
|
home: Some(mock_home),
|
|
subdir: Some("ghostty"),
|
|
})
|
|
.unwrap();
|
|
assert_eq!(p, "/Users/test/.cache/ghostty");
|
|
}
|
|
|
|
type DirFn = fn(&Options<'_>) -> Result<EncodedOs, Error>;
|
|
const CASES: [(&str, DirFn, &str); 3] = [
|
|
("XDG_CONFIG_HOME", config, ".config"),
|
|
("XDG_CACHE_HOME", cache, ".cache"),
|
|
("XDG_STATE_HOME", state, ".local/state"),
|
|
];
|
|
|
|
#[test]
|
|
fn fallback_when_xdg_env_empty() {
|
|
let temp_home = "/tmp/ghostty-test-home";
|
|
for (name, func, default_subdir) in CASES {
|
|
temp_env::with_vars([("HOME", Some(temp_home)), (name, Some(""))], || {
|
|
let expected = crate::path_join(&[temp_home, default_subdir]);
|
|
let actual = func(&Options::default()).unwrap();
|
|
assert_eq!(actual, expected.as_str());
|
|
});
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn fallback_when_xdg_env_empty_and_subdir() {
|
|
let temp_home = "/tmp/ghostty-test-home";
|
|
for (name, func, default_subdir) in CASES {
|
|
temp_env::with_vars([("HOME", Some(temp_home)), (name, Some(""))], || {
|
|
let expected = crate::path_join(&[temp_home, default_subdir, "ghostty"]);
|
|
let actual = func(&Options {
|
|
subdir: Some("ghostty"),
|
|
..Default::default()
|
|
})
|
|
.unwrap();
|
|
assert_eq!(actual, expected.as_str());
|
|
});
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn env_var_used_when_set() {
|
|
temp_env::with_vars([("XDG_CONFIG_HOME", Some("/x/cfg"))], || {
|
|
assert_eq!(config(&Options::default()).unwrap(), "/x/cfg");
|
|
let o = Options {
|
|
subdir: Some("ghostty"),
|
|
..Default::default()
|
|
};
|
|
assert_eq!(config(&o).unwrap(), "/x/cfg/ghostty");
|
|
});
|
|
}
|
|
|
|
fn c(s: &str) -> std::ffi::CString {
|
|
std::ffi::CString::new(s).unwrap()
|
|
}
|
|
|
|
#[test]
|
|
fn parse_terminal_exec_cases() {
|
|
fn run(args: &[&str]) -> Option<Vec<String>> {
|
|
let owned: Vec<std::ffi::CString> = args.iter().map(|s| c(s)).collect();
|
|
let refs: Vec<&CStr> = owned.iter().map(std::ffi::CString::as_c_str).collect();
|
|
parse_terminal_exec(&refs)
|
|
.map(|s| s.iter().map(|x| x.to_str().unwrap().to_owned()).collect())
|
|
}
|
|
|
|
assert_eq!(run(&["a", "b", "c"]), None);
|
|
assert_eq!(run(&["xdg-terminal-exec"]), Some(vec![]));
|
|
assert_eq!(
|
|
run(&["xdg-terminal-exec", "a", "b", "c"]),
|
|
Some(vec!["a".into(), "b".into(), "c".into()])
|
|
);
|
|
assert_eq!(
|
|
run(&["xdg-terminal-exec", "-e", "a", "b", "c"]),
|
|
Some(vec!["a".into(), "b".into(), "c".into()])
|
|
);
|
|
assert_eq!(
|
|
run(&["xdg-terminal-exec", "a", "-e", "b", "c"]),
|
|
Some(vec!["a".into(), "-e".into(), "b".into(), "c".into()])
|
|
);
|
|
assert_eq!(run(&["/usr/bin/xdg-terminal-exec"]), Some(vec![]));
|
|
}
|
|
}
|