diff options
| -rw-r--r-- | lib/Support/raw_ostream.cpp | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/lib/Support/raw_ostream.cpp b/lib/Support/raw_ostream.cpp index f8ac65d..ad47cb6 100644 --- a/lib/Support/raw_ostream.cpp +++ b/lib/Support/raw_ostream.cpp @@ -422,11 +422,30 @@ void raw_fd_ostream::write_impl(const char *Ptr, size_t Size) { assert(FD >= 0 && "File already closed."); pos += Size; ssize_t ret; + do { ret = ::write(FD, Ptr, Size); - } while (ret < 0 && (errno == EAGAIN || errno == EINTR)); - if (ret != (ssize_t) Size) - error_detected(); + + if (ret < 0) { + // If it's a recoverable error, swallow it and retry the write. + // EAGAIN and EWOULDBLOCK are not unambiguously recoverable, but + // some programs, such as bjam, assume that their child processes + // will treat them as if they are. If you don't want this code to + // spin, don't use O_NONBLOCK file descriptors with raw_ostream. + if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK) + continue; + + // Otherwise it's a non-recoverable error. Note it and quit. + error_detected(); + break; + } + + // The write may have written some or all of the data. Update the + // size and buffer pointer to reflect the remainder that needs + // to be written. If there are no bytes left, we're done. + Ptr += ret; + Size -= ret; + } while (Size > 0); } void raw_fd_ostream::close() { |