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

Ignore high 16 bits of cluster number in FAT12/16 dir entry.

Browse Source
This commit is contained in:
Rafał Harabień 2017-11-07 22:52:56 +01:00
parent de9977e571
commit 288da370b3
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/dir.rs
View File

@ -11,7 +11,7 @@ use chrono::{TimeZone, Local};
#[cfg(feature = "chrono")] #[cfg(feature = "chrono")]
use chrono; use chrono;
use fs::{FileSystemRef, DiskSlice}; use fs::{FileSystemRef, DiskSlice, FatType};
use file::File; use file::File;
#[derive(Clone)] #[derive(Clone)]
@ -107,14 +107,17 @@ pub(crate) struct DirFileEntryData {
} }
impl DirFileEntryData { impl DirFileEntryData {
pub(crate) fn first_cluster(&self) -> Option<u32> { pub(crate) fn first_cluster(&self, fat_type: FatType) -> Option<u32> {
let n = ((self.first_cluster_hi as u32) << 16) | self.first_cluster_lo as u32; let first_cluster_hi = if fat_type == FatType::Fat32 { self.first_cluster_hi } else { 0 };
let n = ((first_cluster_hi as u32) << 16) | self.first_cluster_lo as u32;
if n == 0 { None } else { Some(n) } if n == 0 { None } else { Some(n) }
} }
pub(crate) fn set_first_cluster(&mut self, cluster: Option<u32>) { pub(crate) fn set_first_cluster(&mut self, cluster: Option<u32>, fat_type: FatType) {
let n = cluster.unwrap_or(0); let n = cluster.unwrap_or(0);
self.first_cluster_hi = (n >> 16) as u16; if fat_type == FatType::Fat32 {
self.first_cluster_hi = (n >> 16) as u16;
}
self.first_cluster_lo = (n & 0xFFFF) as u16; self.first_cluster_lo = (n & 0xFFFF) as u16;
} }
@ -715,7 +718,7 @@ impl <'a, 'b> Dir<'a, 'b> {
attrs, attrs,
..Default::default() ..Default::default()
}; };
raw_entry.set_first_cluster(first_cluster); raw_entry.set_first_cluster(first_cluster, self.fs.fat_type);
raw_entry.serialize(&mut stream)?; raw_entry.serialize(&mut stream)?;
let end_pos = stream.seek(io::SeekFrom::Current(0))?; let end_pos = stream.seek(io::SeekFrom::Current(0))?;
let abs_pos = stream.abs_pos().map(|p| p - DIR_ENTRY_SIZE); let abs_pos = stream.abs_pos().map(|p| p - DIR_ENTRY_SIZE);

4
src/file.rs
View File

@ -56,7 +56,7 @@ impl <'a, 'b> File<'a, 'b> {
e.data.set_size(self.offset); e.data.set_size(self.offset);
if self.offset == 0 { if self.offset == 0 {
e.data.set_first_cluster(None); e.data.set_first_cluster(None, self.fs.fat_type);
} }
self.entry_dirty = true; self.entry_dirty = true;
}, },
@ -124,7 +124,7 @@ impl <'a, 'b> File<'a, 'b> {
self.first_cluster = Some(cluster); self.first_cluster = Some(cluster);
match self.entry { match self.entry {
Some(ref mut e) => { Some(ref mut e) => {
e.data.set_first_cluster(self.first_cluster); e.data.set_first_cluster(self.first_cluster, self.fs.fat_type);
}, },
None => {}, None => {},
} }