summaryrefslogtreecommitdiff
path: root/src/host_io.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/host_io.zig')
-rw-r--r--src/host_io.zig35
1 files changed, 14 insertions, 21 deletions
diff --git a/src/host_io.zig b/src/host_io.zig
index 2b2e1fe3..ad7c77dd 100644
--- a/src/host_io.zig
+++ b/src/host_io.zig
@@ -2075,7 +2075,6 @@ pub fn forkShell(
cwd: []const u8,
rows: u16,
cols: u16,
- fs: ?*const ninep_io.Listener,
) !Child {
const native_cwd = filesystem.localPath(cwd) orelse cwd;
if (std.mem.indexOfScalar(u8, native_cwd, 0) != null) return error.InvalidPath;
@@ -2116,12 +2115,6 @@ pub fn forkShell(
command_buf[line.len] = 0;
spawn.argv = Shell.commandArgv(spawn.path, command_buf[0..line.len :0].ptr);
}
- // The last argument is whether this session takes its children's Looks —
- // every session does but a `--nested` one, and a fork with no core at all
- // (the tests below) is nobody's parent.
- // shortcut: `fs` is read by nothing now (exportEnv takes this process's
- // own socket); its argument goes from the frontends' calls with them.
- _ = fs;
ninep_io.exportEnv(
if (core) |c| (if (c.panes[pane]) |pn| pn.serial else 0) else 0,
if (core) |c| !c.opts.nested else false,
@@ -2201,9 +2194,9 @@ pub fn forkShell(
test "shell spawn rejects invalid directories before creating a child" {
const rcs: Shell.PromptFiles = .{};
- try std.testing.expectError(error.InvalidPath, forkShell(null, 0, &rcs, "/bin/sh", "/tmp\x00/ignored", 24, 80, null));
+ try std.testing.expectError(error.InvalidPath, forkShell(null, 0, &rcs, "/bin/sh", "/tmp\x00/ignored", 24, 80));
const too_long = @as([4096]u8, @splat('x'));
- try std.testing.expectError(error.NameTooLong, forkShell(null, 0, &rcs, "/bin/sh", &too_long, 24, 80, null));
+ try std.testing.expectError(error.NameTooLong, forkShell(null, 0, &rcs, "/bin/sh", &too_long, 24, 80));
var tmp = std.testing.tmpDir(.{});
defer tmp.cleanup();
@@ -2212,12 +2205,12 @@ test "shell spawn rejects invalid directories before creating a child" {
const directory = directory_buf[0..try tmp.dir.realPath(std.testing.io, &directory_buf)];
var path_buf: [4096]u8 = undefined;
const file = try std.fmt.bufPrint(&path_buf, "{s}/file", .{directory});
- try std.testing.expectError(error.NotDir, forkShell(null, 0, &rcs, "/bin/sh", file, 24, 80, null));
+ try std.testing.expectError(error.NotDir, forkShell(null, 0, &rcs, "/bin/sh", file, 24, 80));
const explicit_file = try std.fmt.bufPrint(&path_buf, "/n/os{s}/file", .{directory});
- try std.testing.expectError(error.NotDir, forkShell(null, 0, &rcs, "/bin/sh", explicit_file, 24, 80, null));
+ try std.testing.expectError(error.NotDir, forkShell(null, 0, &rcs, "/bin/sh", explicit_file, 24, 80));
const missing = try std.fmt.bufPrint(&path_buf, "{s}/missing/" ++ (std.mem.asBytes(&@as([50][6]u8, @splat("child/".*)))), .{directory});
try std.testing.expect(missing.len > 256);
- try std.testing.expectError(error.FileNotFound, forkShell(null, 0, &rcs, "/bin/sh", missing, 24, 80, null));
+ try std.testing.expectError(error.FileNotFound, forkShell(null, 0, &rcs, "/bin/sh", missing, 24, 80));
}
test "a forked shell is told which terminal it is talking to" {
@@ -2240,7 +2233,7 @@ test "a forked shell is told which terminal it is talking to" {
_ = Shell.setenv("TERM", "dumb", 1);
const rcs: Shell.PromptFiles = .{};
- const child = try forkShell(null, 0, &rcs, "/bin/sh", "", 24, 80, null);
+ const child = try forkShell(null, 0, &rcs, "/bin/sh", "", 24, 80);
defer {
_ = libc.kill(child.pid, libc.SIG.KILL);
_ = libc.waitpid(child.pid, null, 0);
@@ -2268,7 +2261,7 @@ test "shell spawn uses an explicit OS directory longer than 256 bytes" {
var explicit_buf: [4096]u8 = undefined;
const explicit = try std.fmt.bufPrint(&explicit_buf, "/n/os{s}", .{directory});
const rcs: Shell.PromptFiles = .{};
- const child = try forkShell(null, 0, &rcs, "/bin/sh", explicit, 24, 80, null);
+ const child = try forkShell(null, 0, &rcs, "/bin/sh", explicit, 24, 80);
defer {
_ = libc.kill(child.pid, libc.SIG.KILL);
_ = libc.waitpid(child.pid, null, 0);
@@ -2420,7 +2413,7 @@ test "a terminal is where its shell is: under a wrapper the foreground shell, ne
// A wrapper exec'd over the shell (timeout standing in for 9ns) runs
// another, two directories down, in the foreground.
{
- const child = try forkShell(null, 0, &rcs, "/bin/sh", start, 24, 80, null);
+ const child = try forkShell(null, 0, &rcs, "/bin/sh", start, 24, 80);
defer {
_ = libc.kill(child.pid, libc.SIG.KILL);
_ = libc.waitpid(child.pid, null, 0);
@@ -2439,7 +2432,7 @@ test "a terminal is where its shell is: under a wrapper the foreground shell, ne
// A job of the shell's own, gone into a/b, leaves the pane where the
// shell is.
{
- const child = try forkShell(null, 0, &rcs, "/bin/sh", start, 24, 80, null);
+ const child = try forkShell(null, 0, &rcs, "/bin/sh", start, 24, 80);
defer {
_ = libc.kill(child.pid, libc.SIG.KILL);
_ = libc.waitpid(child.pid, null, 0);
@@ -2464,7 +2457,7 @@ test "shell cwd rejects truncation and preserves an owned child path longer than
const directory = path_buf[0..try tmp.dir.realPathFile(io, nested, &path_buf)];
try std.testing.expect(directory.len > 1024);
const rcs: Shell.PromptFiles = .{};
- const child = try forkShell(null, 0, &rcs, "/bin/sh", directory, 24, 80, null);
+ const child = try forkShell(null, 0, &rcs, "/bin/sh", directory, 24, 80);
defer {
_ = libc.kill(child.pid, libc.SIG.KILL);
_ = libc.waitpid(child.pid, null, 0);
@@ -2491,7 +2484,7 @@ test "a shell whose directory was removed is not named `... (deleted)`" {
var path_buf: [4096]u8 = undefined;
const directory = path_buf[0..try tmp.dir.realPathFile(io, "gone", &path_buf)];
const rcs: Shell.PromptFiles = .{};
- const child = try forkShell(null, 0, &rcs, "/bin/sh", directory, 24, 80, null);
+ const child = try forkShell(null, 0, &rcs, "/bin/sh", directory, 24, 80);
defer {
_ = libc.kill(child.pid, libc.SIG.KILL);
_ = libc.waitpid(child.pid, null, 0);
@@ -3296,7 +3289,7 @@ test "a command pane's child is its shell running the one line, and its exit sta
_ = try core.newCommand(id, "", "printf 'said '; exit 7");
while (core.nextEffect()) |_| {}
const rcs: Shell.PromptFiles = .{};
- const child = try forkShell(core, id, &rcs, "/bin/sh", "", 24, 80, null);
+ const child = try forkShell(core, id, &rcs, "/bin/sh", "", 24, 80);
defer _ = libc.close(child.file.handle);
var got: [256]u8 = undefined;
var n: usize = 0;
@@ -3326,7 +3319,7 @@ test "a command's exit is its process's, told by its watcher, whether or not its
const id = core.freeSlot().?;
_ = try core.newCommand(id, "", c.line);
while (core.nextEffect()) |_| {}
- const child = try forkShell(core, id, &rcs, "/bin/sh", "", 24, 80, null);
+ const child = try forkShell(core, id, &rcs, "/bin/sh", "", 24, 80);
defer _ = libc.close(child.file.handle);
try std.testing.expect(watchExit(child.pid));
var got: ?libc.pid_t = null;
@@ -3366,7 +3359,7 @@ test "a command's background job outlives it and its pty, and Kill stops its who
const id = core.freeSlot().?;
_ = try core.newCommand(id, dir, c.line);
while (core.nextEffect()) |_| {}
- const child = try forkShell(core, id, &rcs, "/bin/sh", dir, 24, 80, null);
+ const child = try forkShell(core, id, &rcs, "/bin/sh", dir, 24, 80);
if (c.kill) {
sleepMs(150);
signalTty(child.pid, child.file.handle, .term, true);