M-Labs/rust-fatfs
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make short name generation more compatible to WinNT

Browse Source
This commit is contained in:
Rafał Harabień 2018-05-31 00:17:01 +02:00
parent b53882a2ad
commit 7355ac462c
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/dir.rs
View File

@ -635,10 +635,11 @@ impl ShortNameGenerator {
} }
// Make sure character is allowed in 8.3 name // Make sure character is allowed in 8.3 name
let fixed_c = match c { let fixed_c = match c {
// strip spaces // strip spaces and dots
' ' => continue, ' ' | '.' => {
// strip leading dots lossy_conv = true;
'.' if dst_pos == 0 => continue, continue;
},
// copy allowed characters // copy allowed characters
'A'...'Z' | 'a'...'z' | '0'...'9' | 'A'...'Z' | 'a'...'z' | '0'...'9' |
'!' | '#' | '$' | '%' | '&' | '\'' | '(' | ')' | '!' | '#' | '$' | '%' | '&' | '\'' | '(' | ')' |
@ -757,10 +758,8 @@ mod tests {
assert_eq!(&ShortNameGenerator::new("Foo.b").generate().unwrap(), "FOO B ".as_bytes()); assert_eq!(&ShortNameGenerator::new("Foo.b").generate().unwrap(), "FOO B ".as_bytes());
assert_eq!(&ShortNameGenerator::new("Foo.baR").generate().unwrap(), "FOO BAR".as_bytes()); assert_eq!(&ShortNameGenerator::new("Foo.baR").generate().unwrap(), "FOO BAR".as_bytes());
assert_eq!(&ShortNameGenerator::new("Foo+1.baR").generate().unwrap(), "FOO_1~1 BAR".as_bytes()); assert_eq!(&ShortNameGenerator::new("Foo+1.baR").generate().unwrap(), "FOO_1~1 BAR".as_bytes());
// Note: Wikipedia says its 'VER_12~1.TEX' (TODO: check) assert_eq!(&ShortNameGenerator::new("ver +1.2.text").generate().unwrap(), "VER_12~1TEX".as_bytes());
assert_eq!(&ShortNameGenerator::new("ver +1.2.text").generate().unwrap(), "VER_1_~1TEX".as_bytes()); assert_eq!(&ShortNameGenerator::new(".bashrc.swp").generate().unwrap(), "BASHRC~1SWP".as_bytes());
// Note: Wikipedia says its 'BASHRC~1.SWP' (TODO: check)
assert_eq!(&ShortNameGenerator::new(".bashrc.swp").generate().unwrap(), "BASHRC SWP".as_bytes());
} }
#[test] #[test]