Try again if write(2) reports an recoverable error.
authorBenjamin Kramer <benny.kra@googlemail.com>
Wed, 5 May 2010 15:17:47 +0000 (15:17 +0000)
committerBenjamin Kramer <benny.kra@googlemail.com>
Wed, 5 May 2010 15:17:47 +0000 (15:17 +0000)
This should fix mysteriously crashing boost regression tests when stderr is
managed by bjam (PR7043).

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@103085 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Support/raw_ostream.cpp

index 0b05c5449ae6bda987d982b7d16597ea46c305b4..f8ac65d7e136ae73e6f35ecbd1b56f2f18c4c73c 100644 (file)
@@ -21,6 +21,7 @@
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/ADT/STLExtras.h"
 #include <cctype>
+#include <cerrno>
 #include <sys/stat.h>
 #include <sys/types.h>
 
@@ -420,7 +421,11 @@ raw_fd_ostream::~raw_fd_ostream() {
 void raw_fd_ostream::write_impl(const char *Ptr, size_t Size) {
   assert(FD >= 0 && "File already closed.");
   pos += Size;
-  if (::write(FD, Ptr, Size) != (ssize_t) Size)
+  ssize_t ret;
+  do {
+    ret = ::write(FD, Ptr, Size);
+  } while (ret < 0 && (errno == EAGAIN || errno == EINTR));
+  if (ret != (ssize_t) Size)
     error_detected();
 }