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

src/pxar/sequential_decoder.rs: refactoring of simple match statements to map_err()

Browse Source 
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
This commit is contained in:
Christian Ebner 2019-07-01 17:24:23 +02:00 committed by Dietmar Maurer
parent 9d227350a3
commit 6e1c31163b
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/pxar/sequential_decoder.rs
View File

@ -460,10 +460,8 @@ impl <'a, R: Read> SequentialDecoder<'a, R> {
let _ = std::fs::create_dir(path); let _ = std::fs::create_dir(path);
let dir = match nix::dir::Dir::open(path, nix::fcntl::OFlag::O_DIRECTORY, nix::sys::stat::Mode::empty()) { let dir = nix::dir::Dir::open(path, nix::fcntl::OFlag::O_DIRECTORY, nix::sys::stat::Mode::empty())
Ok(dir) => dir, .map_err(|err| format_err!("unable to open target directory {:?} - {}", path, err))?;
Err(err) => bail!("unable to open target directory {:?} - {}", path, err),
};
let mut relative_path = PathBuf::new(); let mut relative_path = PathBuf::new();
self.restore_sequential(path, &mut relative_path, &OsString::new(), &dir, callback) self.restore_sequential(path, &mut relative_path, &OsString::new(), &dir, callback)
@ -509,18 +507,14 @@ impl <'a, R: Read> SequentialDecoder<'a, R> {
if filename.is_empty() { if filename.is_empty() {
dir = nix::dir::Dir::openat(parent_fd, ".", OFlag::O_DIRECTORY, Mode::empty())?; dir = nix::dir::Dir::openat(parent_fd, ".", OFlag::O_DIRECTORY, Mode::empty())?;
} else { } else {
dir = match dir_mkdirat(parent_fd, filename, true) { dir = dir_mkdirat(parent_fd, filename, true)
Ok(dir) => dir, .map_err(|err| format_err!("unable to open directory {:?} - {}", full_path, err))?;
Err(err) => bail!("unable to open directory {:?} - {}", full_path, err),
};
} }
self.restore_ugid(&entry, dir.as_raw_fd())?; self.restore_ugid(&entry, dir.as_raw_fd())?;
// fcaps have to be restored after restore_ugid as chown clears security.capability xattr, see CVE-2015-1350 // fcaps have to be restored after restore_ugid as chown clears security.capability xattr, see CVE-2015-1350
let mut head = match self.restore_attributes(&entry, dir.as_raw_fd()) { let mut head = self.restore_attributes(&entry, dir.as_raw_fd())
Ok(head) => head, .map_err(|err| format_err!("Restoring of directory attributes failed - {}", err))?;
Err(err) => bail!("Restoring of directory attributes failed - {}", err),
};
while head.htype == CA_FORMAT_FILENAME { while head.htype == CA_FORMAT_FILENAME {
let name = self.read_filename(head.size)?; let name = self.read_filename(head.size)?;
@ -624,20 +618,16 @@ impl <'a, R: Read> SequentialDecoder<'a, R> {
let flags = OFlag::O_CREAT|OFlag::O_WRONLY|OFlag::O_EXCL; let flags = OFlag::O_CREAT|OFlag::O_WRONLY|OFlag::O_EXCL;
let open_mode = Mode::from_bits_truncate(0o0600 | mode); let open_mode = Mode::from_bits_truncate(0o0600 | mode);
let mut file = match file_openat(parent_fd, filename, flags, open_mode) { let mut file = file_openat(parent_fd, filename, flags, open_mode)
Ok(file) => file, .map_err(|err| format_err!("open file {:?} failed - {}", full_path, err))?;
Err(err) => bail!("open file {:?} failed - {}", full_path, err),
};
self.restore_ugid(&entry, file.as_raw_fd())?; self.restore_ugid(&entry, file.as_raw_fd())?;
// fcaps have to be restored after restore_ugid as chown clears security.capability xattr, see CVE-2015-1350 // fcaps have to be restored after restore_ugid as chown clears security.capability xattr, see CVE-2015-1350
let head = match self.restore_attributes(&entry, file.as_raw_fd()) { let head = self.restore_attributes(&entry, file.as_raw_fd())
Ok(head) => head, .map_err(|err| format_err!("Restoring of file attributes failed - {}", err))?;
Err(err) => bail!("Restoring of file attributes failed - {}", err),
};
if head.htype != CA_FORMAT_PAYLOAD { if head.htype != CA_FORMAT_PAYLOAD {
bail!("got unknown header type for file entry {:016x}", head.htype); bail!("got unknown header type for file entry {:016x}", head.htype);
} }
if head.size < HEADER_SIZE { if head.size < HEADER_SIZE {