superrob1500
/
mirror-ghostty
mirror of https://github.com/ghostty-org/ghostty
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

take kitty-shell-cwd scheme into account

pull/7029/head
Kristófer R 2025-05-01 00:18:42 -04:00
parent b66368b4d6
commit 64bfaf23f9
No known key found for this signature in database
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/termio/stream_handler.zig
View File

@ -1107,24 +1107,34 @@ pub const StreamHandler = struct {
// Example: file://12:34:56:78:90:12/path/to/file
if (e != error.InvalidPort) return;
const url_without_scheme = url: {
if (std.mem.startsWith(u8, url, "file://")) break :url url[7..];
if (std.mem.startsWith(u8, url, "kitty-shell-cwd://")) break :url url[18..];
log.warn("invalid url in OSC 7: invalid scheme", .{});
return;
};
// The first '/' after the scheme marks the end of the hostname. If the first '/'
// following the end of the `file://` scheme is not at position 24 this is not a
// following the end of the scheme is not at the right position this is not a
// valid mac address.
if (std.mem.indexOfScalarPos(u8, url, 7, '/') != 24) {
if (std.mem.indexOfScalarPos(u8, url_without_scheme, 0, '/') != 17) {
log.warn("invalid url in OSC 7: {}", .{e});
return;
}
// At this point we may have a mac address as the hostname.
const mac_address = url[7..24];
const mac_address = url_without_scheme[0..17];
if (!isValidMacAddress(mac_address)) {
log.warn("ivalid url in OSC 7: {}", .{e});
return;
}
var uri_path_end_idx: usize = 24;
while (uri_path_end_idx < url.len and !isUriPathSeparator(url[uri_path_end_idx])) {
var uri_path_end_idx: usize = 17;
while (uri_path_end_idx < url_without_scheme.len and
!isUriPathSeparator(url_without_scheme[uri_path_end_idx]))
{
uri_path_end_idx += 1;
}
@ -1133,7 +1143,7 @@ pub const StreamHandler = struct {
break :uri .{
.scheme = "file",
.host = .{ .percent_encoded = mac_address },
.path = .{ .percent_encoded = url[24..uri_path_end_idx] },
.path = .{ .percent_encoded = url_without_scheme[17..uri_path_end_idx] },
};
};