2 files changed, 24 insertions, 2 deletions
diff --git a/src/common/platform/unix/PosixSpawnSubProcess.cpp b/src/common/platform/unix/PosixSpawnSubProcess.cpp
index 6a8a8d0f..a356de77 100644
--- a/src/common/platform/unix/PosixSpawnSubProcess.cpp
+++ b/src/common/platform/unix/PosixSpawnSubProcess.cpp
@@ -2,11 +2,24 @@
 #include "cru/common/SubProcess.h"
 
 #include <spawn.h>
+#include <memory>
 
 namespace cru::platform::unix {
 PosixSpawnSubProcess::PosixSpawnSubProcess(
     const PlatformSubProcessStartInfo& start_info)
-    : PlatformSubProcessBase(start_info), pid_(0), exit_code_(0) {}
+    : PlatformSubProcessBase(start_info),
+      pid_(0),
+      exit_code_(0),
+      stdin_pipe_(UnixPipe::Usage::Send),
+      stdout_pipe_(UnixPipe::Usage::Receive),
+      stderr_pipe_(UnixPipe::Usage::Receive) {
+  stdin_stream_ = std::make_unique<UnixFileStream>(
+      stdin_pipe_.GetSelfFileDescriptor(), false, false, true, false);
+  stdout_stream_ = std::make_unique<UnixFileStream>(
+      stdout_pipe_.GetSelfFileDescriptor(), false, true, false, false);
+  stderr_stream_ = std::make_unique<UnixFileStream>(
+      stderr_pipe_.GetSelfFileDescriptor(), false, true, false, false);
+}
 
 PosixSpawnSubProcess::~PosixSpawnSubProcess() {}
 
diff --git a/src/common/platform/unix/UnixPipe.cpp b/src/common/platform/unix/UnixPipe.cpp
index 8393f022..4d081d5e 100644
--- a/src/common/platform/unix/UnixPipe.cpp
+++ b/src/common/platform/unix/UnixPipe.cpp
@@ -2,14 +2,23 @@
 #include "cru/common/Exception.h"
 #include "cru/common/log/Logger.h"
 
+#include <fcntl.h>
+#include <sys/fcntl.h>
 #include <unistd.h>
 
 namespace cru::platform::unix {
-UnixPipe::UnixPipe(Usage usage) : usage_(usage) {
+UnixPipe::UnixPipe(Usage usage, UnixPipeFlag flags)
+    : usage_(usage), flags_(flags) {
   int fds[2];
   if (pipe(fds) != 0) {
     throw ErrnoException(u"Failed to create unix pipe.");
   }
+
+  if (flags & UnixPipeFlags::NonBlock) {
+    fcntl(fds[0], F_SETFL, O_NONBLOCK);
+    fcntl(fds[1], F_SETFL, O_NONBLOCK);
+  }
+
   read_fd_ = fds[0];
   write_fd_ = fds[1];
 }