neurocyte/thespian
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: handle error.WouldBlock correctly from stdin/stderr reads in subprocess

Browse source
This commit is contained in:
CJ van den Berg 2024-04-04 21:43:05 +02:00
parent 0559a75dbb
commit a738c98f33
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/subprocess.zig
View file

@ -215,7 +215,10 @@ const Proc = struct {
fn dispatch_stdout(self: *Proc) tp.result {
var buffer: [max_chunk_size]u8 = undefined;
const bytes = self.child.stdout.?.read(&buffer) catch |e| return tp.exit_error(e);
const bytes = self.child.stdout.?.read(&buffer) catch |e| switch (e) {
error.WouldBlock => return,
else => return tp.exit_error(e),
};
if (bytes == 0)
return self.handle_terminate();
try self.parent.send(.{ self.tag, "stdout", buffer[0..bytes] });
@ -223,7 +226,10 @@ const Proc = struct {
fn dispatch_stderr(self: *Proc) tp.result {
var buffer: [max_chunk_size]u8 = undefined;
const bytes = self.child.stderr.?.read(&buffer) catch |e| return tp.exit_error(e);
const bytes = self.child.stderr.?.read(&buffer) catch |e| switch (e) {
error.WouldBlock => return,
else => return tp.exit_error(e),
};
if (bytes == 0)
return;
try self.parent.send(.{ self.tag, "stderr", buffer[0..bytes] });