filenamegen: more fun with path fixup on windows

wez · Apr 14, 2020 · d793284 · d793284
1 parent 9dea0ee
commit d793284
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/filenamegen/src/lib.rs b/filenamegen/src/lib.rs
@@ -128,12 +128,20 @@ fn normalize_slashes(path: PathBuf) -> PathBuf {
     use std::ffi::OsString;
     use std::os::windows::ffi::{OsStrExt, OsStringExt};
 
-    let normalized: Vec<u16> = path
+    let mut normalized: Vec<u16> = path
         .into_os_string()
         .encode_wide()
         .map(|c| if c == b'\\' as u16 { b'/' as u16 } else { c })
         .collect();
 
+    // Strip off the normalized long filename prefix.
+    const LONG_FILE_NAME_PREFIX: [u16; 4] = [b'/' as u16, b'/' as u16, b'?' as u16, b'/' as u16];
+    if normalized.starts_with(&LONG_FILE_NAME_PREFIX) {
+        for _ in 0..LONG_FILE_NAME_PREFIX.len() {
+            normalized.remove(0);
+        }
+    }
+
     OsString::from_wide(&normalized).into()
 }