Skip to content

Commit

Permalink
Handle # and ? characters in directory path
Browse files Browse the repository at this point in the history
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
  • Loading branch information
loops authored and wez committed Sep 21, 2024
1 parent c65dc63 commit c63195f
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions mux/src/localpane.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1045,17 +1045,14 @@ impl LocalPane {
{
let leader = self.get_leader(policy);
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;
}

#[cfg(windows)]
if let Some(fg) = self.divine_foreground_process(policy) {
// Since windows paths typically start with something like C:\,
// 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();
return Url::from_directory_path(fg.cwd).ok();
}

#[allow(unreachable_code)]
Expand Down

0 comments on commit c63195f

Please sign in to comment.