commit 70a60665fa8df8d778ac8d49dc24ec36715f541d
author Yifan Hong <elsk@google.com> Tue Mar 26 14:29:48 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Mar 26 14:29:48 2019 -0700
tree 7fd37fad57f5a083afb8912528a306caa1bdd8c3
parent 2ade5a8938b10f0efe9107e4bda3fef4fa4ecb1b
parent 60d79518d42405c66eec302992ff299841570405

Merge changes from topic "lpdumpd"
am: f959fffc1c

Change-Id: I024ccc86df450b21115b76b8062975f2ba18378e

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;
   }