refactor(config): parse config values from raw bytes like Zig
Zig parses config values (cli/args.zig, Config.zig field parsers, config/string.zig) from raw byte slices, and each field type decides whether it requires UTF-8 (InvalidValue otherwise) or stores bytes. The port escape-encoded raw bytes into Strings at the line reader and let fields parse the escaped text, so fields could observe encoding artifacts; successive audits kept finding such leaks (RV5-RV8). Field parsers now receive the original bytes: text fields validate UTF-8 where Zig does, byte/path fields store bytes (EncodedOs/OsString). This resolves all 9 RV8 findings (docs/rewrite/notes/review-rv8-codex.md), each with a regression test: Windows path conversion fails with BadPathName instead of substituting U+FFFD; Windows process launch uses strict UTF-8 like Zig's Command; the WTF-8 decoder accepts paired- surrogate encodings like Zig; literal U+FDD0 Unicode key triggers; selection-word-chars and clipboard-codepoint-map reject invalid UTF-8; font style / codepoint-map family names use original bytes; C title actions forward bytes; D-Bus new-window/Flatpak conversions match Zig. Design, sweep and validation: docs/rewrite/notes/final-bytes-refactor.md. Also moves the bundled iTerm2-Color-Schemes license out of resources/themes/ so +list-themes no longer lists it as a theme (output is now byte-identical to Ghostty 1.3.1). Done by Codex (gpt-6-astra), reviewed and verified by the orchestrator. Test Plan: - cargo test --workspace --no-fail-fast (3428 passed, exit 0) - just check-macos (both), just check-windows, just check-wasm - +show-config --default --docs, +list-keybinds, +list-actions --docs, +list-themes --plain compared with /usr/bin/ghostty
This commit is contained in:
1 parent
70c250cf2d
commit
6f9b3129e1
100 files changed
+2310
-1054
No files matched your search
@@ -53,7 +53,7 @@ pub trait ActionEnum: Sized + Copy {
|
||||
|
||||
/// Detect the action from the process CLI args (Zig: `detectArgs`).
|
||||
pub fn detect_args<E: ActionEnum>() -> Result<Option<E>, DetectError> {
|
||||
detect_iter(ghostty_os::args::collect_config_strings())
|
||||
detect_iter(ghostty_os::args::collect_bytes())
|
||||
}
|
||||
|
||||
/// Detect the action from any iterator. Each iterator value should yield
|
||||
@@ -61,7 +61,7 @@ pub fn detect_args<E: ActionEnum>() -> Result<Option<E>, DetectError> {
|
||||
pub fn detect_iter<E: ActionEnum, I, S>(iter: I) -> Result<Option<E>, DetectError>
|
||||
where
|
||||
I: IntoIterator<Item = S>,
|
||||
S: AsRef<str>,
|
||||
S: AsRef<[u8]>,
|
||||
{
|
||||
let mut fallback: Option<E> = None;
|
||||
let mut pending: Option<E> = None;
|
||||
@@ -69,7 +69,10 @@ where
|
||||
let arg = arg.as_ref();
|
||||
|
||||
// Allow handling of special cases.
|
||||
if let Some(special) = E::detect_special_case(arg) {
|
||||
if let Some(special) = std::str::from_utf8(arg)
|
||||
.ok()
|
||||
.and_then(E::detect_special_case)
|
||||
{
|
||||
match special {
|
||||
SpecialCase::Action(a) => return Ok(Some(a)),
|
||||
SpecialCase::Fallback(a) => fallback = Some(a),
|
||||
@@ -82,13 +85,18 @@ where
|
||||
}
|
||||
|
||||
// Commands must start with "+"
|
||||
let Some(name) = arg.strip_prefix('+') else {
|
||||
let Some(name) = arg.strip_prefix(b"+") else {
|
||||
continue;
|
||||
};
|
||||
if pending.is_some() {
|
||||
return Err(DetectError::MultipleActions);
|
||||
}
|
||||
pending = Some(E::from_name(name).ok_or(DetectError::InvalidAction)?);
|
||||
pending = Some(
|
||||
std::str::from_utf8(name)
|
||||
.ok()
|
||||
.and_then(E::from_name)
|
||||
.ok_or(DetectError::InvalidAction)?,
|
||||
);
|
||||
}
|
||||
|
||||
// If we have an action, we always return that action, even if we've
|
||||
|
||||
Reference in new issue
Block a user