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

src/pxar/decoder.rs: return also payload size in lookup 

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
This commit is contained in:
Christian Ebner 2019-11-14 17:42:15 +01:00 committed by Dietmar Maurer
parent 45cc157f7c
commit b6ca690095
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pxar/decoder.rs
View File

@ -266,7 +266,7 @@ impl<R: Read + Seek, F: Fn(&Path) -> Result<(), Error>> Decoder<R, F> {
&mut self, &mut self,
dir: &DirectoryEntry, dir: &DirectoryEntry,
filename: &OsStr, filename: &OsStr,
) -> Result<Option<(DirectoryEntry, PxarAttributes)>, Error> { ) -> Result<Option<(DirectoryEntry, PxarAttributes, u64)>, Error> {
let gbt = self.goodbye_table(Some(dir.start), dir.end)?; let gbt = self.goodbye_table(Some(dir.start), dir.end)?;
let hash = compute_goodbye_hash(filename.as_bytes()); let hash = compute_goodbye_hash(filename.as_bytes());
@ -284,7 +284,7 @@ impl<R: Read + Seek, F: Fn(&Path) -> Result<(), Error>> Decoder<R, F> {
// the start of an item (PXAR_FILENAME) or the GOODBYE_TAIL_MARKER in // the start of an item (PXAR_FILENAME) or the GOODBYE_TAIL_MARKER in
// case of directories, so the use of start offset is fine for both // case of directories, so the use of start offset is fine for both
// cases. // cases.
let (entry_name, entry, attr, _payload_size) = self.attributes(*start)?; let (entry_name, entry, attr, payload_size) = self.attributes(*start)?;
// Possible hash collision, need to check if the found entry is indeed // Possible hash collision, need to check if the found entry is indeed
// the filename to lookup. // the filename to lookup.
@ -295,7 +295,7 @@ impl<R: Read + Seek, F: Fn(&Path) -> Result<(), Error>> Decoder<R, F> {
filename: entry_name, filename: entry_name,
entry, entry,
}; };
return Ok(Some((dir_entry, attr))); return Ok(Some((dir_entry, attr, payload_size)));
} }
} }
} }