Skip to content

Commit c63195f

Browse files
loopswez
authored andcommitted
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 wezterm#6158 reported by Syntaxheld
1 parent c65dc63 commit c63195f

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

mux/src/localpane.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,17 +1045,14 @@ impl LocalPane {
10451045
{
10461046
let leader = self.get_leader(policy);
10471047
if let Some(path) = &leader.current_working_dir {
1048-
return Url::parse(&format!("file://localhost{}", path.display())).ok();
1048+
return Url::from_directory_path(path).ok();
10491049
}
10501050
return None;
10511051
}
10521052

10531053
#[cfg(windows)]
10541054
if let Some(fg) = self.divine_foreground_process(policy) {
1055-
// Since windows paths typically start with something like C:\,
1056-
// we cannot simply stick `localhost` on the front; we have to
1057-
// omit the hostname otherwise the url parser is unhappy.
1058-
return Url::parse(&format!("file://{}", fg.cwd.display())).ok();
1055+
return Url::from_directory_path(fg.cwd).ok();
10591056
}
10601057

10611058
#[allow(unreachable_code)]

0 commit comments

Comments
 (0)