Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport some fixes to 0.8 branch #164

Merged
merged 3 commits into from
Nov 3, 2024
Merged

Backport some fixes to 0.8 branch #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20fc821
Fix .. entry in new directories.
thejpster Oct 30, 2024
fa664f4
Write to the second FAT.
thejpster Oct 30, 2024
169bb26
Write out the update info sector when the volume is closed.
thejpster Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions src/fat/volume.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ pub struct FatVolume {
/// The block the FAT starts in. Relative to start of partition (so add
/// `self.lba_offset` before passing to volume manager)
pub(crate) fat_start: BlockCount,
/// The block the second FAT starts in (if present). Relative to start of
/// partition (so add `self.lba_offset` before passing to volume manager)
pub(crate) second_fat_start: Option<BlockCount>,
/// Expected number of free clusters
pub(crate) free_clusters_count: Option<u32>,
/// Number of the next expected free cluster
Expand Down Expand Up @@ -118,10 +121,15 @@ impl FatVolume {
{
let mut blocks = [Block::new()];
let this_fat_block_num;
let mut second_fat_block_num = None;
match &self.fat_specific_info {
FatSpecificInfo::Fat16(_fat16_info) => {
let fat_offset = cluster.0 * 2;
this_fat_block_num = self.lba_start + self.fat_start.offset_bytes(fat_offset);
if let Some(fat_start) = self.second_fat_start {
second_fat_block_num =
Some(self.lba_start + fat_start.offset_bytes(fat_offset));
}
let this_fat_ent_offset = (fat_offset % Block::LEN_U32) as usize;
block_device
.read(&mut blocks, this_fat_block_num, "read_fat")
Expand All @@ -143,6 +151,10 @@ impl FatVolume {
// FAT32 => 4 bytes per entry
let fat_offset = cluster.0 * 4;
this_fat_block_num = self.lba_start + self.fat_start.offset_bytes(fat_offset);
if let Some(fat_start) = self.second_fat_start {
second_fat_block_num =
Some(self.lba_start + fat_start.offset_bytes(fat_offset));
}
let this_fat_ent_offset = (fat_offset % Block::LEN_U32) as usize;
block_device
.read(&mut blocks, this_fat_block_num, "read_fat")
Expand All @@ -166,6 +178,11 @@ impl FatVolume {
block_device
.write(&blocks, this_fat_block_num)
.map_err(Error::DeviceError)?;
if let Some(second_fat_block_num) = second_fat_block_num {
block_device
.write(&blocks, second_fat_block_num)
.map_err(Error::DeviceError)?;
}
Ok(())
}

Expand Down Expand Up @@ -1098,6 +1115,13 @@ where
blocks_per_cluster: bpb.blocks_per_cluster(),
first_data_block: (first_data_block),
fat_start: BlockCount(u32::from(bpb.reserved_block_count())),
second_fat_start: if bpb.num_fats() == 2 {
Some(BlockCount(
u32::from(bpb.reserved_block_count()) + bpb.fat_size(),
))
} else {
None
},
free_clusters_count: None,
next_free_cluster: None,
cluster_count: bpb.total_clusters(),
Expand Down Expand Up @@ -1135,6 +1159,13 @@ where
blocks_per_cluster: bpb.blocks_per_cluster(),
first_data_block: BlockCount(first_data_block),
fat_start: BlockCount(u32::from(bpb.reserved_block_count())),
second_fat_start: if bpb.num_fats() == 2 {
Some(BlockCount(
u32::from(bpb.reserved_block_count()) + bpb.fat_size(),
))
} else {
None
},
free_clusters_count: info_sector.free_clusters_count(),
next_free_cluster: info_sector.next_free_cluster(),
cluster_count: bpb.total_clusters(),
Expand Down
25 changes: 15 additions & 10 deletions src/volume_mgr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use byteorder::{ByteOrder, LittleEndian};
use core::convert::TryFrom;

use crate::fat::{self, BlockCache, FatType, OnDiskDirEntry, RESERVED_ENTRIES};
use crate::fat::{self, BlockCache, OnDiskDirEntry, RESERVED_ENTRIES};

use crate::filesystem::{
Attributes, ClusterId, DirEntry, DirectoryInfo, FileInfo, Mode, RawDirectory, RawFile,
Expand Down Expand Up @@ -324,6 +324,13 @@ where
}

let volume_idx = self.get_volume_by_id(volume)?;

match &mut self.open_volumes[volume_idx].volume_type {
VolumeType::Fat(fat_volume) => {
fat_volume.update_info_sector(&self.block_device)?;
}
}

self.open_volumes.swap_remove(volume_idx);

Ok(())
Expand Down Expand Up @@ -978,16 +985,13 @@ where
ctime: now,
attributes: att,
// point at our parent
cluster: match fat_type {
FatType::Fat16 => {
// On FAT16, indicate parent is root using Cluster(0)
if parent_directory_info.cluster == ClusterId::ROOT_DIR {
ClusterId::EMPTY
} else {
parent_directory_info.cluster
}
cluster: {
// On FAT16, indicate parent is root using Cluster(0)
if parent_directory_info.cluster == ClusterId::ROOT_DIR {
ClusterId::EMPTY
} else {
parent_directory_info.cluster
}
FatType::Fat32 => parent_directory_info.cluster,
},
size: 0,
entry_block: new_dir_start_block,
Expand Down Expand Up @@ -1384,6 +1388,7 @@ mod tests {
blocks_per_cluster: 8,
first_data_block: BlockCount(15136),
fat_start: BlockCount(32),
second_fat_start: Some(BlockCount(32 + 0x0000_1D80)),
name: fat::VolumeName::new(*b"Pictures "),
free_clusters_count: None,
next_free_cluster: None,
Expand Down