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

pxar: more concise EOF handling 

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2020-11-05 10:32:48 +01:00
parent 3c2dd8ad05
commit e144810d73
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pxar/create.rs
View File

@ -658,6 +658,7 @@ impl<'a, 'b> Archiver<'a, 'b> {
let mut out = encoder.create_file(metadata, file_name, file_size)?; let mut out = encoder.create_file(metadata, file_name, file_size)?;
while remaining != 0 { while remaining != 0 {
let mut got = match file.read(&mut self.file_copy_buffer[..]) { let mut got = match file.read(&mut self.file_copy_buffer[..]) {
Ok(0) => break,
Ok(got) => got, Ok(got) => got,
Err(err) if err.kind() == std::io::ErrorKind::Interrupted => continue, Err(err) if err.kind() == std::io::ErrorKind::Interrupted => continue,
Err(err) => bail!(err), Err(err) => bail!(err),
@ -665,8 +666,6 @@ impl<'a, 'b> Archiver<'a, 'b> {
if got as u64 > remaining { if got as u64 > remaining {
self.report_file_grew_while_reading()?; self.report_file_grew_while_reading()?;
got = remaining as usize; got = remaining as usize;
} else if got == 0 {
break; // we reached eof
} }
out.write_all(&self.file_copy_buffer[..got])?; out.write_all(&self.file_copy_buffer[..got])?;
remaining -= got as u64; remaining -= got as u64;