From 75e387be664d808cd4eae7c9223eeb6789525d79 Mon Sep 17 00:00:00 2001
From: Lukacs Berki <lberki@google.com>
Date: Thu, 7 Jul 2016 09:41:12 +0000
Subject: Propagate the system root to every process created in
 WindowsSubprocessFactory.

This is apparently required by some versions MSVCRT.DLL including the one used in the CL.EXE we happen to be using for testing.

This was learned by reading the source code of OpenJDK.

Fixes #1480.

--
MOS_MIGRATED_REVID=126786461
---
 .../lib/windows/WindowsSubprocessFactory.java      | 35 ++++++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/windows/WindowsSubprocessFactory.java')

diff --git a/src/main/java/com/google/devtools/build/lib/windows/WindowsSubprocessFactory.java b/src/main/java/com/google/devtools/build/lib/windows/WindowsSubprocessFactory.java
index 6e7f5290ea..7b4a7d8b7e 100644
--- a/src/main/java/com/google/devtools/build/lib/windows/WindowsSubprocessFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/windows/WindowsSubprocessFactory.java
@@ -15,7 +15,6 @@
 package com.google.devtools.build.lib.windows;
 
 import com.google.common.base.Charsets;
-import com.google.common.collect.Ordering;
 import com.google.devtools.build.lib.shell.Subprocess;
 import com.google.devtools.build.lib.shell.SubprocessBuilder;
 import com.google.devtools.build.lib.shell.SubprocessBuilder.StreamAction;
@@ -23,6 +22,7 @@ import com.google.devtools.build.lib.shell.SubprocessBuilder.StreamAction;
 import java.io.File;
 import java.io.IOException;
 import java.util.Map;
+import java.util.TreeMap;
 
 /**
  * A subprocess factory that uses the Win32 API.
@@ -71,23 +71,46 @@ public class WindowsSubprocessFactory implements Subprocess.Factory {
     }
   }
 
+  private String getSystemRoot(Map<String, String> env) {
+    // Windows environment variables are case-insensitive, so we can't just say
+    // System.getenv().get("SystemRoot")
+    for (String key : env.keySet()) {
+      if (key.toUpperCase().equals("SYSTEMROOT")) {
+        return env.get(key);
+      }
+    }
+
+    return null;
+  }
+
   /**
    * Converts an environment map to the format expected in lpEnvironment by CreateProcess().
    */
   private byte[] convertEnvToNative(Map<String, String> env) throws IOException {
-    if (env.isEmpty()) {
+    Map<String, String> realEnv = new TreeMap<>();
+    realEnv.putAll(env == null ? System.getenv() : env);
+    if (getSystemRoot(realEnv) == null) {
+      // Some versions of MSVCRT.DLL require SystemRoot to be set. It's quite a common library to
+      // link in, so we add this environment variable regardless of whether the caller requested
+      // it or not.
+      String systemRoot = getSystemRoot(System.getenv());
+      if (systemRoot != null) {
+        realEnv.put("SystemRoot", systemRoot);
+      }
+    }
+
+    if (realEnv.isEmpty()) {
       // Special case: CreateProcess() always expects the environment block to be terminated
       // with two zeros.
       return new byte[] { 0, 0, };
     }
 
     StringBuilder result = new StringBuilder();
-
-    for (String key : Ordering.natural().sortedCopy(env.keySet())) {
-      if (key.contains("=")) {
+    for (Map.Entry<String, String> entry : realEnv.entrySet()) {
+      if (entry.getKey().contains("=")) {
         throw new IOException("Environment variable names must not contain '='");
       }
-      result.append(key + "=" + env.get(key) + "\0");
+      result.append(entry.getKey() + "=" + entry.getValue() + "\0");
     }
 
     result.append("\0");
-- 
cgit v1.2.3