Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-14 15:56:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

cli: fix macOS builds

Browse Source
This commit is contained in:
Mitchell Hashimoto
2025-07-09 06:45:26 -07:00
parent f6319efaa1
commit bcb4e624a4
1 changed files with 71 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
src/cli/ssh_cache.zig
View File

@ -82,7 +82,8 @@ fn getCachePath(allocator: Allocator) ![]const u8 {
// Supports both standalone hostnames and user@hostname format // Supports both standalone hostnames and user@hostname format
fn isValidCacheKey(key: []const u8) bool { fn isValidCacheKey(key: []const u8) bool {
if (key.len == 0 or key.len > 320) return false; // 253 + 1 + 64 for user@hostname // 253 + 1 + 64 for user@hostname
if (key.len == 0 or key.len > 320) return false;
// Check for user@hostname format // Check for user@hostname format
if (std.mem.indexOf(u8, key, "@")) |at_pos| { if (std.mem.indexOf(u8, key, "@")) |at_pos| {
@ -94,7 +95,8 @@ fn isValidCacheKey(key: []const u8) bool {
return isValidHostname(key); return isValidHostname(key);
} }
// Basic hostname validation - accepts domains and IPs (including IPv6 in brackets) // Basic hostname validation - accepts domains and IPs
// (including IPv6 in brackets)
fn isValidHostname(host: []const u8) bool { fn isValidHostname(host: []const u8) bool {
if (host.len == 0 or host.len > 253) return false; if (host.len == 0 or host.len > 253) return false;
@ -438,24 +440,27 @@ pub fn run(alloc_gpa: Allocator) !u8 {
} }
if (opts.add) |host| { if (opts.add) |host| {
const result = addHost(alloc, host) catch |err| switch (err) { const result = addHost(alloc, host) catch |err| {
CacheError.InvalidCacheKey => { const Error = error{PermissionDenied} || @TypeOf(err);
try stderr.print("Error: Invalid hostname format '{s}'\n", .{host}); switch (@as(Error, err)) {
try stderr.print("Expected format: hostname or user@hostname\n", .{}); CacheError.InvalidCacheKey => {
return 1; try stderr.print("Error: Invalid hostname format '{s}'\n", .{host});
}, try stderr.print("Expected format: hostname or user@hostname\n", .{});
CacheError.CacheLocked => { return 1;
try stderr.print("Error: Cache is busy, try again\n", .{}); },
return 1; CacheError.CacheLocked => {
}, try stderr.print("Error: Cache is busy, try again\n", .{});
error.AccessDenied, error.PermissionDenied => { return 1;
try stderr.print("Error: Permission denied\n", .{}); },
return 1; error.AccessDenied, error.PermissionDenied => {
}, try stderr.print("Error: Permission denied\n", .{});
else => { return 1;
try stderr.print("Error: Unable to add '{s}' to cache\n", .{host}); },
return 1; else => {
}, try stderr.print("Error: Unable to add '{s}' to cache\n", .{host});
return 1;
},
}
}; };
switch (result) { switch (result) {
@ -466,51 +471,63 @@ pub fn run(alloc_gpa: Allocator) !u8 {
} }
if (opts.remove) |host| { if (opts.remove) |host| {
removeHost(alloc, host) catch |err| switch (err) { removeHost(alloc, host) catch |err| {
CacheError.InvalidCacheKey => { const Error = error{PermissionDenied} || @TypeOf(err);
try stderr.print("Error: Invalid hostname format '{s}'\n", .{host}); switch (@as(Error, err)) {
try stderr.print("Expected format: hostname or user@hostname\n", .{}); CacheError.InvalidCacheKey => {
return 1; try stderr.print("Error: Invalid hostname format '{s}'\n", .{host});
}, try stderr.print("Expected format: hostname or user@hostname\n", .{});
CacheError.CacheLocked => { return 1;
try stderr.print("Error: Cache is busy, try again\n", .{}); },
return 1; CacheError.CacheLocked => {
}, try stderr.print("Error: Cache is busy, try again\n", .{});
error.AccessDenied, error.PermissionDenied => { return 1;
try stderr.print("Error: Permission denied\n", .{}); },
return 1; error.AccessDenied, error.PermissionDenied => {
}, try stderr.print("Error: Permission denied\n", .{});
else => { return 1;
try stderr.print("Error: Unable to remove '{s}' from cache\n", .{host}); },
return 1; else => {
}, try stderr.print("Error: Unable to remove '{s}' from cache\n", .{host});
return 1;
},
}
}; };
try stdout.print("Removed '{s}' from cache.\n", .{host}); try stdout.print("Removed '{s}' from cache.\n", .{host});
return 0; return 0;
} }
if (opts.host) |host| { if (opts.host) |host| {
const cached = checkHost(alloc, host) catch |err| switch (err) { const cached = checkHost(alloc, host) catch |err| {
CacheError.InvalidCacheKey => { const Error = error{PermissionDenied} || @TypeOf(err);
try stderr.print("Error: Invalid hostname format '{s}'\n", .{host}); switch (@as(Error, err)) {
try stderr.print("Expected format: hostname or user@hostname\n", .{}); CacheError.InvalidCacheKey => {
return 1; try stderr.print("Error: Invalid hostname format '{s}'\n", .{host});
}, try stderr.print("Expected format: hostname or user@hostname\n", .{});
error.AccessDenied, error.PermissionDenied => { return 1;
try stderr.print("Error: Permission denied\n", .{}); },
return 1; error.AccessDenied, error.PermissionDenied => {
}, try stderr.print("Error: Permission denied\n", .{});
else => { return 1;
try stderr.print("Error: Unable to check host '{s}' in cache\n", .{host}); },
return 1; else => {
}, try stderr.print("Error: Unable to check host '{s}' in cache\n", .{host});
return 1;
},
}
}; };
if (cached) { if (cached) {
try stdout.print("'{s}' has Ghostty terminfo installed.\n", .{host}); try stdout.print(
"'{s}' has Ghostty terminfo installed.\n",
.{host},
);
return 0; return 0;
} else { } else {
try stdout.print("'{s}' does not have Ghostty terminfo installed.\n", .{host}); try stdout.print(
"'{s}' does not have Ghostty terminfo installed.\n",
.{host},
);
return 1; return 1;
} }
} }