From d8d00eb146241978ef21ed4d6c35ac9c68b1a86e Mon Sep 17 00:00:00 2001 From: metamuffin Date: Mon, 10 Feb 2025 17:38:55 +0100 Subject: read serialized file tables --- src/helper.rs | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'src/helper.rs') diff --git a/src/helper.rs b/src/helper.rs index 0b126ad..cb52b8c 100644 --- a/src/helper.rs +++ b/src/helper.rs @@ -1,4 +1,4 @@ -use std::io::{Read, Result}; +use std::io::{Read, Result, Seek}; #[derive(Debug, Clone, Copy, PartialEq)] pub enum Endianness { @@ -23,9 +23,13 @@ pub trait ReadExt { fn read_u64(&mut self, e: Endianness) -> Result; fn read_u64_be(&mut self) -> Result; fn read_u64_le(&mut self) -> Result; + fn read_i64(&mut self, e: Endianness) -> Result; + fn read_i64_be(&mut self) -> Result; + fn read_i64_le(&mut self) -> Result; fn read_u128_be(&mut self) -> Result; fn read_cstr(&mut self) -> Result; } + impl ReadExt for T { fn read_u8(&mut self) -> Result { let mut buf = [0; 1]; @@ -112,6 +116,22 @@ impl ReadExt for T { self.read_exact(&mut buf)?; Ok(u64::from_le_bytes(buf)) } + fn read_i64(&mut self, e: Endianness) -> Result { + match e { + Endianness::Big => self.read_i64_be(), + Endianness::Little => self.read_i64_le(), + } + } + fn read_i64_be(&mut self) -> Result { + let mut buf = [0; 8]; + self.read_exact(&mut buf)?; + Ok(i64::from_be_bytes(buf)) + } + fn read_i64_le(&mut self) -> Result { + let mut buf = [0; 8]; + self.read_exact(&mut buf)?; + Ok(i64::from_le_bytes(buf)) + } fn read_u128_be(&mut self) -> Result { let mut buf = [0; 16]; self.read_exact(&mut buf)?; @@ -130,3 +150,16 @@ impl ReadExt for T { Ok(String::from_utf8_lossy(&s).to_string()) } } + +pub trait AlignExt { + fn align(&mut self, size: u64) -> Result<()>; +} +impl AlignExt for T { + fn align(&mut self, size: u64) -> Result<()> { + let off = self.stream_position()? % size; + if off != 0 { + self.seek_relative((size - off) as i64)?; + } + Ok(()) + } +} -- cgit v1.2.3-70-g09d2