diff options
| -rw-r--r-- | lib/std/child_process.zig | 2 | ||||
| -rw-r--r-- | lib/std/os.zig | 22 |
2 files changed, 15 insertions, 9 deletions
diff --git a/lib/std/child_process.zig b/lib/std/child_process.zig index 335574485d..3b8913af50 100644 --- a/lib/std/child_process.zig +++ b/lib/std/child_process.zig @@ -269,7 +269,7 @@ pub const ChildProcess = struct { } fn waitUnwrapped(self: *ChildProcess) void { - const status = os.waitpid(self.pid, 0); + const status = os.waitpid(self.pid, 0).status; self.cleanupStreams(); self.handleWaitResult(status); } diff --git a/lib/std/os.zig b/lib/std/os.zig index bc7dae031c..4a06d3c0bb 100644 --- a/lib/std/os.zig +++ b/lib/std/os.zig @@ -3121,16 +3121,24 @@ pub fn getsockoptError(sockfd: fd_t) ConnectError!void { } } -pub fn waitpid(pid: i32, flags: u32) u32 { - // TODO allow implicit pointer cast from *u32 to *c_uint ? +pub const WaitPidResult = struct { + pid: pid_t, + status: u32, +}; + +pub fn waitpid(pid: pid_t, flags: u32) WaitPidResult { const Status = if (builtin.link_libc) c_uint else u32; var status: Status = undefined; while (true) { - switch (errno(system.waitpid(pid, &status, flags))) { - 0 => return @bitCast(u32, status), + const rc = system.waitpid(pid, &status, flags); + switch (errno(rc)) { + 0 => return .{ + .pid = @intCast(pid_t, rc), + .status = @bitCast(u32, status), + }, EINTR => continue, ECHILD => unreachable, // The process specified does not exist. It would be a race condition to handle this error. - EINVAL => unreachable, // The options argument was invalid + EINVAL => unreachable, // Invalid flags. else => unreachable, } } @@ -5434,9 +5442,7 @@ pub fn getrlimit(resource: rlimit_resource) GetrlimitError!rlimit { } } -pub const SetrlimitError = error{ - PermissionDenied, -} || UnexpectedError; +pub const SetrlimitError = error{PermissionDenied} || UnexpectedError; pub fn setrlimit(resource: rlimit_resource, limits: rlimit) SetrlimitError!void { // TODO implement for systems other than linux and enable test |