From 97481c52f35810d5431d1e638818e09e816a908a Mon Sep 17 00:00:00 2001
From: Fredrik Medley <fredrik@meroton.com>
Date: Fri, 20 Mar 2026 11:11:06 +0100
Subject: [PATCH] Support escaped runfile paths

Add support for spaces, newlines and backslashes in paths written to the
runfiles MANIFEST file.
---
 rust/runfiles/runfiles.rs | 57 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 55 insertions(+), 2 deletions(-)

diff --git a/rust/runfiles/runfiles.rs b/rust/runfiles/runfiles.rs
index c2c4efb581..3e7e203358 100644
--- a/rust/runfiles/runfiles.rs
+++ b/rust/runfiles/runfiles.rs
@@ -232,10 +232,26 @@ impl Runfiles {
         let path_mapping = manifest_content
             .lines()
             .flat_map(|line| {
-                let pair = line
+                let raw_pair = line
+                    .strip_prefix(' ')
+                    .unwrap_or(line)
                     .split_once(' ')
                     .ok_or(RunfilesError::RunfilesManifestInvalidFormat)?;
-                Ok::<(PathBuf, PathBuf), RunfilesError>((pair.0.into(), pair.1.into()))
+                let pair = if line.starts_with(' ') {
+                    // Unescape according to src/main/java/com/google/devtools/build/lib/analysis/SourceManifestAction.java.
+                    (
+                        raw_pair
+                            .0
+                            .replace("\\s", " ")
+                            .replace("\\n", "\n")
+                            .replace("\\b", "\\")
+                            .into(),
+                        raw_pair.1.replace("\\n", "\n").replace("\\b", "\\").into(),
+                    )
+                } else {
+                    (raw_pair.0.into(), raw_pair.1.into())
+                };
+                Ok::<(PathBuf, PathBuf), RunfilesError>(pair)
             })
             .collect::<HashMap<_, _>>();
         Ok(Mode::ManifestBased(path_mapping))
@@ -633,6 +649,43 @@ mod test {
         );
     }
 
+    #[test]
+    fn test_manifest_parsing() {
+        let temp_dir = PathBuf::from(std::env::var("TEST_TMPDIR").unwrap());
+        std::fs::create_dir_all(&temp_dir).unwrap();
+
+        let manifest_file = temp_dir.join("test_manifest_parsing.manifest");
+        std::fs::write(
+            &manifest_file,
+            [
+                "a/b c/d\n",
+                " a\\sb/c\\nd\\be f g/h\\ni\\bj\n",
+                "empty-file \n",
+            ]
+            .join("\n"),
+        )
+        .unwrap();
+
+        with_mock_env(
+            [
+                (MANIFEST_FILE_ENV_VAR, Some(manifest_file.to_str().unwrap())),
+                (RUNFILES_DIR_ENV_VAR, None::<&str>),
+                (TEST_SRCDIR_ENV_VAR, None::<&str>),
+            ],
+            || {
+                let r = Runfiles::create().unwrap();
+                assert_eq!(r.rlocation("a/b"), Some(PathBuf::from("c/d")));
+                // Note that the `\s` is not escaped in the link, so not testing for it.
+                assert_eq!(
+                    r.rlocation("a b/c\nd\\e"),
+                    Some(PathBuf::from("f g/h\ni\\j"))
+                );
+                assert_eq!(r.rlocation("empty-file"), Some(PathBuf::from("")));
+                assert_eq!(r.rlocation("does/not/exist"), None);
+            },
+        );
+    }
+
     #[test]
     fn test_manifest_based_can_read_data_from_runfiles() {
         let mut path_mapping = HashMap::new();