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)
144 lines
4.0 KiB
Rust
144 lines
4.0 KiB
Rust
#[cfg(unix)]
|
|
use rustix::process::{Resource, Rlimit as RustixRlimit, getrlimit, setrlimit};
|
|
|
|
/// Resource limit (`rlimit` in Zig). `None` means infinity.
|
|
#[cfg(unix)]
|
|
pub type Rlimit = RustixRlimit;
|
|
|
|
/// rlim_t value for infinity in the Zig implementation.
|
|
#[cfg(unix)]
|
|
const INFINITY: u64 = u64::MAX;
|
|
|
|
#[cfg(unix)]
|
|
fn cur(l: &Rlimit) -> u64 {
|
|
l.current.unwrap_or(INFINITY)
|
|
}
|
|
#[cfg(unix)]
|
|
fn max(l: &Rlimit) -> u64 {
|
|
l.maximum.unwrap_or(INFINITY)
|
|
}
|
|
#[cfg(unix)]
|
|
fn mk(cur: u64, max: Option<u64>) -> Rlimit {
|
|
Rlimit {
|
|
current: if cur == INFINITY { None } else { Some(cur) },
|
|
maximum: max,
|
|
}
|
|
}
|
|
|
|
/// This maximizes the number of file descriptors we can have open. We
|
|
/// need to do this because each window consumes at least a handful of fds.
|
|
/// This is extracted from the Zig compiler source code.
|
|
#[cfg(unix)]
|
|
pub fn fix_max_files() -> Option<Rlimit> {
|
|
let old = getrlimit(Resource::Nofile);
|
|
|
|
// If we're already at the max, we're done.
|
|
if cur(&old) >= max(&old) {
|
|
log::debug!("file handle limit already maximized value={}", cur(&old));
|
|
return Some(old);
|
|
}
|
|
|
|
// Do a binary search for the limit.
|
|
let mut lim = old;
|
|
let mut min_v: u64 = cur(&lim);
|
|
let mut max_v: u64 = 1 << 20;
|
|
// But if there's a defined upper bound, don't search, just set it.
|
|
if max(&lim) != INFINITY {
|
|
min_v = max(&lim);
|
|
max_v = max(&lim);
|
|
}
|
|
|
|
loop {
|
|
let c = min_v + (max_v - min_v) / 2;
|
|
lim = mk(c, lim.maximum);
|
|
if setrlimit(Resource::Nofile, lim).is_ok() {
|
|
min_v = c;
|
|
} else {
|
|
max_v = c;
|
|
}
|
|
if min_v + 1 >= max_v {
|
|
break;
|
|
}
|
|
}
|
|
|
|
log::debug!("file handle limit raised value={}", cur(&lim));
|
|
Some(old)
|
|
}
|
|
|
|
#[cfg(unix)]
|
|
pub fn restore_max_files(lim: Rlimit) {
|
|
let _ = setrlimit(Resource::Nofile, lim);
|
|
}
|
|
|
|
/// Resource limit placeholder on platforms without `rlimit` (Zig:
|
|
/// `rlimit = if (@hasDecl(posix.system, "rlimit")) posix.rlimit else struct {}`).
|
|
#[cfg(not(unix))]
|
|
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq)]
|
|
pub struct Rlimit;
|
|
|
|
/// Unsupported-platform fallback: returns `None` like Zig.
|
|
#[cfg(not(unix))]
|
|
pub fn fix_max_files() -> Option<Rlimit> {
|
|
None
|
|
}
|
|
|
|
/// Unsupported-platform fallback: no-op like Zig.
|
|
#[cfg(not(unix))]
|
|
pub fn restore_max_files(_lim: Rlimit) {}
|
|
|
|
/// Return the recommended path for temporary files (byte-preserving).
|
|
pub fn alloc_tmp_dir_os() -> Option<std::path::PathBuf> {
|
|
if cfg!(windows) {
|
|
// TODO: what is a good fallback path on windows? (same as Zig)
|
|
return std::env::var_os("TMP").map(Into::into);
|
|
}
|
|
if let Some(v) = std::env::var_os("TMPDIR") {
|
|
return Some(v.into());
|
|
}
|
|
if let Some(v) = std::env::var_os("TMP") {
|
|
return Some(v.into());
|
|
}
|
|
Some("/tmp".into())
|
|
}
|
|
|
|
#[cfg(all(test, unix))]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[cfg(unix)]
|
|
#[test]
|
|
fn tmp_dir_env_precedence() {
|
|
temp_env::with_vars([("TMPDIR", Some("/a")), ("TMP", Some("/b"))], || {
|
|
assert_eq!(alloc_tmp_dir_os(), Some("/a".into()));
|
|
});
|
|
temp_env::with_vars([("TMPDIR", None), ("TMP", Some("/b"))], || {
|
|
assert_eq!(alloc_tmp_dir_os(), Some("/b".into()));
|
|
});
|
|
temp_env::with_vars([("TMPDIR", None::<&str>), ("TMP", None)], || {
|
|
assert_eq!(alloc_tmp_dir_os(), Some("/tmp".into()));
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn tmp_dir_non_utf8() {
|
|
use std::os::unix::ffi::{OsStrExt, OsStringExt};
|
|
let v = std::ffi::OsString::from_vec(b"/tmp/\xff".to_vec());
|
|
temp_env::with_vars([("TMPDIR", Some(v.clone())), ("TMP", None)], || {
|
|
assert_eq!(
|
|
alloc_tmp_dir_os().unwrap().as_os_str().as_bytes(),
|
|
b"/tmp/\xff"
|
|
);
|
|
});
|
|
}
|
|
|
|
#[cfg(unix)]
|
|
#[test]
|
|
fn fix_and_restore_max_files() {
|
|
let old = fix_max_files().unwrap();
|
|
let now = getrlimit(Resource::Nofile);
|
|
assert!(cur(&now) >= cur(&old));
|
|
restore_max_files(old);
|
|
assert_eq!(getrlimit(Resource::Nofile), old);
|
|
}
|
|
}
|