Done Stream refactor.

NEED TEST: BufferStream, AutoReadStream, SubProcess.

2 files changed, 3 insertions, 11 deletions

diff --git a/src/base/platform/unix/PosixSpawnSubProcess.cpp b/src/base/platform/unix/PosixSpawnSubProcess.cpp
index 75d48cc2..5e09c494 100644
--- a/src/base/platform/unix/PosixSpawnSubProcess.cpp
+++ b/src/base/platform/unix/PosixSpawnSubProcess.cpp
@@ -28,9 +28,9 @@ PosixSpawnSubProcessImpl::PosixSpawnSubProcessImpl()
       stderr_pipe_.GetSelfFileDescriptor(), false, true, false, true);
 
   stdout_buffer_stream_ =
-      std::make_unique<io::AutoReadStream>(stdout_stream_.get(), false);
+      std::make_unique<io::AutoReadStream>(stdout_stream_.get(), true, false);
   stderr_buffer_stream_ =
-      std::make_unique<io::AutoReadStream>(stderr_stream_.get(), false);
+      std::make_unique<io::AutoReadStream>(stderr_stream_.get(), true, false);
 }
 
 PosixSpawnSubProcessImpl::~PosixSpawnSubProcessImpl() {}
diff --git a/src/base/platform/unix/UnixFileStream.cpp b/src/base/platform/unix/UnixFileStream.cpp
index c53bbbaa..6d8bab25 100644
--- a/src/base/platform/unix/UnixFileStream.cpp
+++ b/src/base/platform/unix/UnixFileStream.cpp
@@ -61,15 +61,7 @@ UnixFileStream::UnixFileStream(int fd, bool can_seek, bool can_read,
   auto_close_ = auto_close;
 }
 
-UnixFileStream::~UnixFileStream() {
-  if (auto_close_ && file_descriptor_ >= 0) {
-    if (::close(file_descriptor_) == -1) {
-      // We are in destructor, so we can not throw.
-      CRU_LOG_WARN(u"Failed to close file descriptor {}, errno {}.",
-                   file_descriptor_, errno);
-    }
-  }
-}
+UnixFileStream::~UnixFileStream() { DoClose(); }
 
 Index UnixFileStream::DoSeek(Index offset, SeekOrigin origin) {
   off_t result = ::lseek(file_descriptor_, offset, MapSeekOrigin(origin));