Reencode user.dir

bazelbuild · Oct 16, 2024 · 793fd28 · 793fd28
1 parent b777843
commit 793fd28
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/com/google/devtools/build/lib/vfs/BUILD b/src/main/java/com/google/devtools/build/lib/vfs/BUILD
@@ -74,6 +74,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec",
         "//src/main/java/com/google/devtools/build/lib/util:detailed_exit_code",
         "//src/main/java/com/google/devtools/build/lib/util:filetype",
+        "//src/main/java/com/google/devtools/build/lib/util:string",
         "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:failure_details_java_proto",

diff --git a/src/main/java/com/google/devtools/build/lib/vfs/FileSystemUtils.java b/src/main/java/com/google/devtools/build/lib/vfs/FileSystemUtils.java
@@ -22,6 +22,7 @@
 import com.google.common.io.ByteStreams;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.ConditionallyThreadSafe;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe;
+import com.google.devtools.build.lib.util.StringUtil;
 import com.google.errorprone.annotations.InlineMe;
 import java.io.IOException;
 import java.io.InputStream;
@@ -245,7 +246,11 @@ public static Path getWorkingDirectory(FileSystem fs) {
    * 'user.dir'. This version does not require a {@link FileSystem}.
    */
   public static PathFragment getWorkingDirectory() {
-    return PathFragment.create(System.getProperty("user.dir", "/"));
+    // System properties obtained from host are encoded using sun.jnu.encoding, so reencode them to
+    // the internal representation.
+    // https://github.com/openjdk/jdk/blob/285385247aaa262866697ed848040f05f4d94988/src/java.base/share/native/libjava/System.c#L121
+    return PathFragment.create(
+        StringUtil.reencodeJavaToInternal(System.getProperty("user.dir", "/")));
   }
 
   /**