commit 71ae36cb17eb7147ee513ecd98a206e4ba23f2de
author Yifan Hong <elsk@google.com> Tue Mar 26 15:37:49 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Mar 26 15:37:49 2019 -0700
tree 7fd37fad57f5a083afb8912528a306caa1bdd8c3
parent fe6179ad9ac93f399fcfae0a96d0b08d6001e783
parent 70a60665fa8df8d778ac8d49dc24ec36715f541d

Merge changes from topic "lpdumpd" am: f959fffc1c
am: ee7da7c711

Change-Id: Ia75e9367484478b5df5482ce949b9c6b7a89f9c7

base/file.cpp

diff --git a/base/file.cpp b/base/file.cpp
index 2f4a517..adc8984 100644
--- a/base/file.cpp
+++ b/base/file.cpp
@@ -385,7 +385,12 @@
 bool Realpath(const std::string& path, std::string* result) {
   result->clear();
 
-  char* realpath_buf = realpath(path.c_str(), nullptr);
+  // realpath may exit with EINTR. Retry if so.
+  char* realpath_buf = nullptr;
+  do {
+    realpath_buf = realpath(path.c_str(), nullptr);
+  } while (realpath_buf == nullptr && errno == EINTR);
+
   if (realpath_buf == nullptr) {
     return false;
   }