able/ext2-rs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

add offset argument to find_* functions

Browse source
This commit is contained in:
Szymon Walter 2018-03-18 19:04:57 +01:00
parent c5f0edeabc
commit e0163e2b9e
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/superblock.rs
View file

@ -154,8 +154,9 @@ pub struct Superblock {
impl Superblock { impl Superblock {
pub fn find<'a>( pub fn find<'a>(
haystack: &'a mut [u8], haystack: &'a mut [u8],
offset: isize,
) -> Result<&'a mut Superblock, Error> { ) -> Result<&'a mut Superblock, Error> {
let offset = 1024; let offset = (1024 + offset) as usize;
let end = offset + mem::size_of::<Superblock>(); let end = offset + mem::size_of::<Superblock>();
if haystack.len() < end { if haystack.len() < end {
return Err(Error::OutOfBounds(end)); return Err(Error::OutOfBounds(end));
@ -177,12 +178,13 @@ impl Superblock {
pub fn find_block_table<'a>( pub fn find_block_table<'a>(
&self, &self,
haystack: &'a mut [u8], haystack: &'a mut [u8],
offset: isize,
) -> Result<&'a mut [BlockGroupDescriptor], Error> { ) -> Result<&'a mut [BlockGroupDescriptor], Error> {
let count = self.block_group_count() let count = self.block_group_count()
.map_err(|(a, b)| Error::BadBlockGroupCount(a, b))? .map_err(|(a, b)| Error::BadBlockGroupCount(a, b))?
as usize; as usize;
let offset = 2048; let offset = (2048 + offset) as usize;
let end = offset + count * mem::size_of::<BlockGroupDescriptor>(); let end = offset + count * mem::size_of::<BlockGroupDescriptor>();
if haystack.len() < end { if haystack.len() < end {
return Err(Error::OutOfBounds(end)); return Err(Error::OutOfBounds(end));
@ -277,7 +279,7 @@ mod tests {
// magic // magic
buffer[1024 + 56] = EXT2_MAGIC as u8; buffer[1024 + 56] = EXT2_MAGIC as u8;
buffer[1024 + 57] = (EXT2_MAGIC >> 8) as u8; buffer[1024 + 57] = (EXT2_MAGIC >> 8) as u8;
let superblock = Superblock::find(&mut buffer); let superblock = Superblock::find(&mut buffer, 0);
assert!( assert!(
superblock.is_ok(), superblock.is_ok(),
"Err({:?})", "Err({:?})",