tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pxar: decoder: cleanup un-needed Decoder::get_dir()

Browse Source 
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
This commit is contained in:
Christian Ebner 2019-10-17 17:12:22 +02:00 committed by Dietmar Maurer
parent 9c25c0330a
commit 8abd12f1f3
1 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/pxar/decoder.rs
View File

@ -248,38 +248,6 @@ impl<R: Read + Seek, F: Fn(&Path) -> Result<(), Error>> Decoder<R, F> {
Ok(())
}
/// Get the `DirectoryEntry` located at `offset`.
///
/// `offset` is expected to point to the directories `PXAR_GOODBYE_TAIL_MARKER`.
pub fn get_dir(&mut self, offset: u64) -> Result<DirectoryEntry, Error> {
self.seek(SeekFrom::Start(offset))?;
let gb: PxarGoodbyeItem = self.inner.read_item()?;
if gb.hash != PXAR_GOODBYE_TAIL_MARKER {
bail!("Expected goodbye tail marker, encountered 0x{:x?}", gb.hash);
}
let distance = i64::try_from(gb.offset + gb.size)?;
let start = self.seek(SeekFrom::Current(0 - distance))?;
let mut header: PxarHeader = self.inner.read_item()?;
let filename = if header.htype == PXAR_FILENAME {
let name = self.inner.read_filename(header.size)?;
header = self.inner.read_item()?;
name
} else {
OsString::new()
};
check_ca_header::<PxarEntry>(&header, PXAR_ENTRY)?;
let entry: PxarEntry = self.inner.read_item()?;
Ok(DirectoryEntry {
start,
end: offset + GOODBYE_ITEM_SIZE,
filename,
entry,
})
}
/// Get attributes for the archive item located at `offset`.
///
/// Returns the entry, attributes and the payload size for the item.