srenblad/rust-fatfs
1
0
Fork 0
forked from M-Labs/rust-fatfs
Code Pull Requests Activity

Properly handle short names with spaces in the middle

Browse Source
This commit is contained in:
Rafał Harabień 2018-06-25 00:07:11 +02:00
parent f5bf959aa7
commit be96ba8122
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/dir_entry.rs
View File

@ -47,12 +47,13 @@ pub(crate) struct ShortName {
} }
impl ShortName { impl ShortName {
const PADDING: u8 = ' ' as u8;
pub(crate) fn new(raw_name: &[u8; 11]) -> Self { pub(crate) fn new(raw_name: &[u8; 11]) -> Self {
// get name components length by looking for space character // get name components length by looking for space character
const SPACE: u8 = ' ' as u8; let name_len = raw_name[0..8].iter().rposition(|x| *x != Self::PADDING).map(|p| p + 1).unwrap_or(0);
let name_len = raw_name[0..8].iter().position(|x| *x == SPACE).unwrap_or(8); let ext_len = raw_name[8..11].iter().rposition(|x| *x != Self::PADDING).map(|p| p + 1).unwrap_or(0);
let ext_len = raw_name[8..11].iter().position(|x| *x == SPACE).unwrap_or(3); let mut name = [Self::PADDING; 12];
let mut name = [SPACE; 12];
name[..name_len].copy_from_slice(&raw_name[..name_len]); name[..name_len].copy_from_slice(&raw_name[..name_len]);
let total_len = if ext_len > 0 { let total_len = if ext_len > 0 {
name[name_len] = '.' as u8; name[name_len] = '.' as u8;
@ -63,8 +64,7 @@ impl ShortName {
// No extension - return length of name part // No extension - return length of name part
name_len name_len
}; };
// Short names in FAT filesystem are encoded in OEM code-page. Rust operates on UTF-8 strings // Short names in FAT filesystem are encoded in OEM code-page
// and there is no built-in conversion so strip non-ascii characters in the name.
ShortName { ShortName {
name, name,
len: total_len as u8, len: total_len as u8,
@ -785,6 +785,8 @@ mod tests {
let mut raw_short_name = [0u8;11]; let mut raw_short_name = [0u8;11];
raw_short_name.copy_from_slice("FOO BAR".as_bytes()); raw_short_name.copy_from_slice("FOO BAR".as_bytes());
assert_eq!(ShortName::new(&raw_short_name).to_string(), "FOO.BAR"); assert_eq!(ShortName::new(&raw_short_name).to_string(), "FOO.BAR");
raw_short_name.copy_from_slice("LOOK AT M E".as_bytes());
assert_eq!(ShortName::new(&raw_short_name).to_string(), "LOOK AT.M E");
} }
#[test] #[test]
@ -792,6 +794,8 @@ mod tests {
let mut raw_short_name = [0u8;11]; let mut raw_short_name = [0u8;11];
raw_short_name.copy_from_slice("FOO ".as_bytes()); raw_short_name.copy_from_slice("FOO ".as_bytes());
assert_eq!(ShortName::new(&raw_short_name).to_string(), "FOO"); assert_eq!(ShortName::new(&raw_short_name).to_string(), "FOO");
raw_short_name.copy_from_slice("LOOK AT ".as_bytes());
assert_eq!(ShortName::new(&raw_short_name).to_string(), "LOOK AT");
} }
#[test] #[test]