1
1
mirror of https://github.com/wez/wezterm.git synced 2024-11-22 04:56:12 +03:00

Handle # and ? characters in directory path

When referencing the current-working-directory, before
it is set by an OSC 7 escape sequence, we ask the OS
for the correct path.  This path was then being parsed
as a URL; where a "#" or "?" character would be
interpreted as the start of a fragment or query
component of a URL -- which is a mistake.

So this change parses the returned directory as such,
where those characters will be treated as a normal
character in the path.

Nothing is changed for the OSC 7 escape sequence case.
In that case, the application must percent-encode the
path before sending, so that those characters are not
misinterpreted.

As per issue #6158 reported by Syntaxheld
This commit is contained in:
Sean Estabrooks 2024-09-21 13:51:20 -04:00 committed by Wez Furlong
parent c65dc63495
commit c63195f880

View File

@ -1045,17 +1045,14 @@ impl LocalPane {
{ {
let leader = self.get_leader(policy); let leader = self.get_leader(policy);
if let Some(path) = &leader.current_working_dir { if let Some(path) = &leader.current_working_dir {
return Url::parse(&format!("file://localhost{}", path.display())).ok(); return Url::from_directory_path(path).ok();
} }
return None; return None;
} }
#[cfg(windows)] #[cfg(windows)]
if let Some(fg) = self.divine_foreground_process(policy) { if let Some(fg) = self.divine_foreground_process(policy) {
// Since windows paths typically start with something like C:\, return Url::from_directory_path(fg.cwd).ok();
// we cannot simply stick `localhost` on the front; we have to
// omit the hostname otherwise the url parser is unhappy.
return Url::parse(&format!("file://{}", fg.cwd.display())).ok();
} }
#[allow(unreachable_code)] #[allow(unreachable_code)]