From f0360efbfa9be15652ef0d1618e7b2a452e1d9ae Mon Sep 17 00:00:00 2001
From: ridiculousfish <rf@fishshell.com>
Date: Sun, 9 Apr 2023 18:13:01 -0700
Subject: [PATCH] Add path_make_canonical in Rust

---
 fish-rust/src/path.rs | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/fish-rust/src/path.rs b/fish-rust/src/path.rs
index 383ba250b..886a0bb91 100644
--- a/fish-rust/src/path.rs
+++ b/fish-rust/src/path.rs
@@ -53,3 +53,44 @@ pub fn append_path_component(path: &mut WString, component: &wstr) {
         path.push_utfstr(component);
     }
 }
+
+/// Remove double slashes and trailing slashes from a path, e.g. transform foo//bar/ into foo/bar.
+/// The string is modified in-place.
+pub fn path_make_canonical(path: &mut WString) {
+    let chars: &mut [char] = path.as_char_slice_mut();
+
+    // Ignore trailing slashes, unless it's the first character.
+    let mut len = chars.len();
+    while len > 1 && chars[len - 1] == '/' {
+        len -= 1;
+    }
+
+    // Turn runs of slashes into a single slash.
+    let mut trailing = 0;
+    let mut prev_was_slash = false;
+    for leading in 0..len {
+        let c = chars[leading];
+        let is_slash = c == '/';
+        if !prev_was_slash || !is_slash {
+            // This is either the first slash in a run, or not a slash at all.
+            chars[trailing] = c;
+            trailing += 1;
+        }
+        prev_was_slash = is_slash;
+    }
+    assert!(trailing <= len);
+    if trailing < len {
+        path.truncate(trailing);
+    }
+}
+
+#[test]
+fn test_path_make_canonical() {
+    let mut path = L!("//foo//////bar/").to_owned();
+    path_make_canonical(&mut path);
+    assert_eq!(path, "/foo/bar");
+
+    path = L!("/").to_owned();
+    path_make_canonical(&mut path);
+    assert_eq!(path, "/");
+}