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

src/pxar/encoder.rs: minor refactoring

Browse Source 
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
This commit is contained in:
Christian Ebner 2019-06-05 14:37:25 +02:00 committed by Dietmar Maurer
parent a4cc8eb7c5
commit 9b77388f2a
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pxar/encoder.rs
View File

@ -619,16 +619,15 @@ impl <'a, W: Write> Encoder<'a, W> {
self.full_path(), MAX_DIRECTORY_ENTRIES); self.full_path(), MAX_DIRECTORY_ENTRIES);
} }
let entry = match entry { let entry = entry.map_err(|err| {
Ok(entry) => entry, format_err!("readir {:?} failed - {}", self.full_path(), err)
Err(err) => bail!("readir {:?} failed - {}", self.full_path(), err), })?;
};
let filename = entry.file_name().to_owned(); let filename = entry.file_name().to_owned();
let name = filename.to_bytes_with_nul(); let name = filename.to_bytes_with_nul();
let name_len = name.len(); if name == b".\0" || name == b"..\0" {
if name_len == 2 && name[0] == b'.' && name[1] == 0u8 { continue; } continue;
if name_len == 3 && name[0] == b'.' && name[1] == b'.' && name[2] == 0u8 { continue; } }
name_list.push(filename); name_list.push(filename);
} }