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
@@ -15,9 +15,9 @@ macro_rules! cli_options {
|
||||
fn parse_into_field(
|
||||
&mut self,
|
||||
key: &str,
|
||||
value: ::core::option::Option<&str>,
|
||||
value: ::core::option::Option<&[u8]>,
|
||||
) -> ::core::result::Result<(), ::ghostty_config::cli_args::ArgError> {
|
||||
self.parse_field(key, value)
|
||||
self.parse_field_bytes(key, value)
|
||||
}
|
||||
fn valid_values(&self, key: &str) -> ::core::option::Option<&'static [&'static str]> {
|
||||
Self::valid_values_for(key)
|
||||
@@ -43,9 +43,9 @@ macro_rules! cli_options {
|
||||
fn parse_into_field(
|
||||
&mut self,
|
||||
key: &str,
|
||||
value: ::core::option::Option<&str>,
|
||||
value: ::core::option::Option<&[u8]>,
|
||||
) -> ::core::result::Result<(), ::ghostty_config::cli_args::ArgError> {
|
||||
self.parse_field(key, value)
|
||||
self.parse_field_bytes(key, value)
|
||||
}
|
||||
fn valid_values(&self, key: &str) -> ::core::option::Option<&'static [&'static str]> {
|
||||
Self::valid_values_for(key)
|
||||
@@ -66,9 +66,9 @@ macro_rules! cli_options {
|
||||
fn parse_into_field(
|
||||
&mut self,
|
||||
key: &str,
|
||||
value: ::core::option::Option<&str>,
|
||||
value: ::core::option::Option<&[u8]>,
|
||||
) -> ::core::result::Result<(), ::ghostty_config::cli_args::ArgError> {
|
||||
self.parse_field(key, value)
|
||||
self.parse_field_bytes(key, value)
|
||||
}
|
||||
fn valid_values(&self, key: &str) -> ::core::option::Option<&'static [&'static str]> {
|
||||
Self::valid_values_for(key)
|
||||
@@ -87,8 +87,8 @@ macro_rules! cli_options {
|
||||
/// Parse the CLI arguments `args` (the full argv, including `argv[0]`,
|
||||
/// which is skipped; `+action` arguments are ignored) into `opts`
|
||||
/// (Zig: `args.argsIterator` + `args.parse`).
|
||||
pub fn parse_options<T: CliTarget>(opts: &mut T, args: &[String]) -> Result<(), Error> {
|
||||
let mut iter = ArgsIterator::new(args.iter().skip(1).cloned());
|
||||
pub fn parse_options<T: CliTarget>(opts: &mut T, args: &[impl AsRef<[u8]>]) -> Result<(), Error> {
|
||||
let mut iter = ArgsIterator::new(args.iter().skip(1).map(AsRef::as_ref));
|
||||
cli_args::parse(opts, &mut iter)?;
|
||||
Ok(())
|
||||
}
|
||||
@@ -101,7 +101,7 @@ impl CliTarget for NoOptions {
|
||||
fn parse_into_field(
|
||||
&mut self,
|
||||
_key: &str,
|
||||
_value: Option<&str>,
|
||||
_value: Option<&[u8]>,
|
||||
) -> Result<(), cli_args::ArgError> {
|
||||
Err(cli_args::ArgError::InvalidField)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user