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

catar/decoder.rs: restore_sequential - read payload

Browse Source
This commit is contained in:
Dietmar Maurer 2019-01-08 09:26:07 +01:00
parent c6a0d3fc6b
commit 676bf71ad4
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/catar/decoder.rs
View File

@ -122,13 +122,14 @@ impl <'a, R: Read + Seek> CaTarDecoder<'a, R> {
) -> Result<(), Error> { ) -> Result<(), Error> {
let start = dir.start; let start = dir.start;
let end = dir.end;
self.reader.seek(SeekFrom::Start(start))?; self.reader.seek(SeekFrom::Start(start))?;
let mut path = PathBuf::from("."); let mut path = PathBuf::from(".");
self.restore_sequential(&mut path, &callback) self.restore_sequential(&mut path, &callback)?;
Ok(())
} }
pub fn restore_sequential<F: Fn(&Path) -> Result<(), Error>>( pub fn restore_sequential<F: Fn(&Path) -> Result<(), Error>>(
@ -146,6 +147,8 @@ impl <'a, R: Read + Seek> CaTarDecoder<'a, R> {
let is_dir = (mode & libc::S_IFMT) == libc::S_IFDIR; let is_dir = (mode & libc::S_IFMT) == libc::S_IFDIR;
let mut read_buffer: [u8; 64*1024] = unsafe { std::mem::uninitialized() };
loop { loop {
let head: CaFormatHeader = self.read_item()?; let head: CaFormatHeader = self.read_item()?;
match head.htype { match head.htype {
@ -172,8 +175,23 @@ impl <'a, R: Read + Seek> CaTarDecoder<'a, R> {
bail!("detected enexpected paylod item."); bail!("detected enexpected paylod item.");
} }
println!("Skip Payload"); println!("Skip Payload");
if head.size < HEADER_SIZE { bail!("detected short payload"); } if head.size < HEADER_SIZE {
self.reader.seek(SeekFrom::Current((head.size - HEADER_SIZE) as i64))?; bail!("detected short payload");
}
let need = (head.size - HEADER_SIZE) as usize;
//self.reader.seek(SeekFrom::Current(need as i64))?;
// fixme:: create file
let mut done = 0;
while (done < need) {
let todo = need - done;
let n = if todo > read_buffer.len() { read_buffer.len() } else { todo };
self.reader.read_exact(&mut read_buffer[..n])?;
// fixme: restore read_buffer[..n]
done += n;
}
return Ok(()); return Ok(());
} }
CA_FORMAT_GOODBYE => { CA_FORMAT_GOODBYE => {