Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-21 11:16:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

termio: fix pty close error so close doesn't hang on macOS

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-02-06 16:05:41 -08:00
parent 469d395997
commit 695a9f3cb9
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/termio/Exec.zig
View File

@ -429,12 +429,6 @@ const Subprocess = struct {
/// Stop the subprocess. This is safe to call anytime. This will wait
/// for the subprocess to end so it will block.
pub fn stop(self: *Subprocess) void {
// Close our PTY
if (self.pty) |*pty| {
pty.deinit();
self.pty = null;
}
// Kill our command
if (self.command) |*cmd| {
killCommand(cmd) catch |err|
@ -443,6 +437,14 @@ const Subprocess = struct {
log.err("error waiting for command to exit: {}", .{err});
self.command = null;
}
// Close our PTY. We do this after killing our command because on
// macOS, close will block until all blocking operations read/write
// are done with it and our reader thread is probably still alive.
if (self.pty) |*pty| {
pty.deinit();
self.pty = null;
}
}
/// Resize the pty subprocess. This is safe to call anytime.
@ -519,7 +521,10 @@ const ReadThread = struct {
// gracefully shutting down.
error.NotOpenForReading => log.info("io reader exiting", .{}),
else => log.err("READ ERROR err={}", .{err}),
else => {
log.err("io reader error err={}", .{err});
unreachable;
},
}
return;
};