From acae35d08598b10a7f3bb8620d8e04eaa02833b2 Mon Sep 17 00:00:00 2001 From: Gabriel Schneider Date: Thu, 5 Nov 2026 09:40:43 -0300 Subject: after the processes merge: the QUIC remnants go (9p_io.quic_enabled and Options.ninep_quic, read by nothing once --9p-quic left main.zig); forkShell's fs argument goes from its signature and every caller (tui, gui, macos and the tests), as exportEnv takes this process's own socket; rollback's note on the frame statistics says what they are now Co-Authored-By: Claude Fable 5.1 Claude-Session: https://claude.ai/code/session_016Y9MNAtZenFv4weoMD3cge --- src/gui/gui.zig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gui/gui.zig') diff --git a/src/gui/gui.zig b/src/gui/gui.zig index 7d77ed2a..dc95a584 100644 --- a/src/gui/gui.zig +++ b/src/gui/gui.zig @@ -831,7 +831,7 @@ test "GUI PTY reader delivers a real shell tail before EOF and joins on close" { shell.queue = &queue; defer shell.shutdownPtys(); const rcs: host_io.Shell.PromptFiles = .{}; - const child = try host_io.forkShell(null, 0, &rcs, "/bin/sh", "", 24, 80, null); + const child = try host_io.forkShell(null, 0, &rcs, "/bin/sh", "", 24, 80); ptys[0] = .{ .fd = child.file.handle, .pid = child.pid, .serial = core.panes[0].?.serial }; ptys[0].?.reader = try queue.startReader(.{ .handle = ptys[0].?.fd, .flags = .{ .nonblocking = false } }, 0, 1); try std.testing.expect(host_io.writeFd(child.file.handle, "printf '\\120\\101\\122\\104\\105\\123\\055\\124\\101\\111\\114'; exit\n")); @@ -882,7 +882,7 @@ test "GUI PTY Restore joins a real reader waiting for queue space" { shell.queue = &queue; defer shell.shutdownPtys(); const rcs: host_io.Shell.PromptFiles = .{}; - const child = try host_io.forkShell(null, 0, &rcs, "/bin/sh", "", 24, 80, null); + const child = try host_io.forkShell(null, 0, &rcs, "/bin/sh", "", 24, 80); ptys[0] = .{ .fd = child.file.handle, .pid = child.pid, .serial = core.panes[0].?.serial }; ptys[0].?.reader = try queue.startReader(.{ .handle = ptys[0].?.fd, .flags = .{ .nonblocking = false } }, 0, 1); try std.testing.expect(host_io.writeFd(child.file.handle, "printf 'after-full'; exit\n")); @@ -924,7 +924,7 @@ test "GUI PTY deletion joins an idle reader and its shell is reaped by exit" { shell.queue = &queue; defer shell.shutdownPtys(); const rcs: host_io.Shell.PromptFiles = .{}; - const child = try host_io.forkShell(null, 0, &rcs, "/bin/sh", "", 24, 80, null); + const child = try host_io.forkShell(null, 0, &rcs, "/bin/sh", "", 24, 80); ptys[0] = .{ .fd = child.file.handle, .pid = child.pid, .serial = core.panes[0].?.serial }; ptys[0].?.reader = try queue.startReader(.{ .handle = ptys[0].?.fd, .flags = .{ .nonblocking = false } }, 0, 1); try core.removePane(0, null); @@ -4403,7 +4403,7 @@ fn spawnPane(ctx: ?*anyopaque, pane: u8, cwd: []const u8) void { // The new shell starts before a running one goes: one that cannot // start leaves the running one be (pty/ctl's exec). const running = s.ptys[pane] != null; - const child = host_io.forkShell(s.core, pane, s.prompt_rcs, s.core.shellBin(), cwd, s.core.screen_h, s.core.screen_w, s.fs) catch |err| { + const child = host_io.forkShell(s.core, pane, s.prompt_rcs, s.core.shellBin(), cwd, s.core.screen_h, s.core.screen_w) catch |err| { if (running) return s.core.restartFailed(pane, err); return s.core.shellFailed(pane, err); }; -- cgit v1.3