From ae69f4b74955cde3024cee7c2741b67445476c28 Mon Sep 17 00:00:00 2001 From: Laytan Laats Date: Fri, 4 Oct 2024 10:50:14 +0200 Subject: [PATCH] general cleanup --- core/os/os2/process.odin | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/core/os/os2/process.odin b/core/os/os2/process.odin index a071fd288..c8f91fdb7 100644 --- a/core/os/os2/process.odin +++ b/core/os/os2/process.odin @@ -404,13 +404,13 @@ process_exec :: proc( stderr_b: [dynamic]byte stderr_b.allocator = allocator - has_stdout, has_stderr: bool - read_data: for !has_stdout || !has_stderr { - buf: [1024]u8 = --- - n: int - has_data: bool + buf: [1024]u8 = --- + n: int - if !has_stdout { + stdout_done, stderr_done, has_data: bool + for !stdout_done || !stderr_done { + + if !stdout_done { has_data, err = pipe_has_data(stdout_r) if has_data { n, err = read(stdout_r, buf[:]) @@ -419,14 +419,14 @@ process_exec :: proc( switch err { case nil: // nothing case .EOF, .Broken_Pipe: - stdout = stdout_b[:] - has_stdout = true + stdout = stdout_b[:] + stdout_done = true case: return } } - if !has_stderr { + if !stderr_done { has_data, err = pipe_has_data(stderr_r) if has_data { n, err = read(stderr_r, buf[:]) @@ -435,8 +435,8 @@ process_exec :: proc( switch err { case nil: // nothing case .EOF, .Broken_Pipe: - stderr = stderr_b[:] - has_stderr = true + stderr = stderr_b[:] + stderr_done = true case: return }