commit 30bed8f81b6b02cdef3f65aef925637e011c2af7
author Lukacs Berki <lberki@google.com> Mon Oct 26 12:18:24 2015 +0000
committer Florian Weikert <fwe@google.com> Tue Oct 27 11:46:32 2015 +0000
tree 13a81560ce78051ff662a07f8e161a2305ceeff6
parent 7d6a381c7e5282c88d38e501976521e5425e4cfc

Read $HOME first to determine the home directory (and when not present, fall back to getpwuid())

Also a minor compatibility fix in a sed invocation.

--
MOS_MIGRATED_REVID=106291639

src/main/cpp/blaze_util_linux.cc

diff --git a/src/main/cpp/blaze_util_linux.cc b/src/main/cpp/blaze_util_linux.cc
index 08bd075..867fbb2 100644
--- a/src/main/cpp/blaze_util_linux.cc
+++ b/src/main/cpp/blaze_util_linux.cc
@@ -36,15 +36,25 @@
 
 string GetOutputRoot() {
   char buf[2048];
-  struct passwd pwbuf;
-  struct passwd *pw = NULL;
-  int uid = getuid();
-  int r = getpwuid_r(uid, &pwbuf, buf, 2048, &pw);
-  if (r != -1 && pw != NULL) {
-    return blaze_util::JoinPath(pw->pw_dir, ".cache/bazel");
+  string base;
+  const char* home = getenv("HOME");
+  if (home != NULL) {
+    base = home;
   } else {
-    return "/tmp";
+    struct passwd pwbuf;
+    struct passwd *pw = NULL;
+    int uid = getuid();
+    int r = getpwuid_r(uid, &pwbuf, buf, 2048, &pw);
+    if (r != -1 && pw != NULL) {
+      base = pw->pw_dir;
+    }
   }
+
+  if (base != "") {
+    return blaze_util::JoinPath(base, ".cache/bazel");
+  }
+
+  return "/tmp";
 }
 
 void WarnFilesystemType(const string& output_base) {