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

pxar: add error handling for MatchPattern::matches_filename()

Browse Source 
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
This commit is contained in:
Christian Ebner
2019-08-05 14:28:03 +02:00
committed by Dietmar Maurer
parent 8c70e3eb18
commit 43e892d293
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pxar/match_pattern.rs
View File

@ -143,7 +143,7 @@ impl MatchPattern {
}
}
pub fn matches_filename(&self, filename: &CStr, is_dir: bool) -> MatchType {
pub fn matches_filename(&self, filename: &CStr, is_dir: bool) -> Result<MatchType, Error> {
let mut res = MatchType::None;
let (front, _) = &self.split_pattern;
@ -152,7 +152,9 @@ impl MatchPattern {
let filename_ptr = filename.as_ptr() as *const libc::c_char;
fnmatch(front_ptr, filename_ptr , 0)
};
// TODO error cases
if fnmatch_res < 0 {
bail!("error in fnmatch inside of MatchPattern");
}
if fnmatch_res == 0 {
res = if self.match_positive {
MatchType::PartialPositive
@ -171,7 +173,9 @@ impl MatchPattern {
let filename_ptr = filename.as_ptr() as *const libc::c_char;
fnmatch(full_ptr, filename_ptr, 0)
};
// TODO error cases
if fnmatch_res < 0 {
bail!("error in fnmatch inside of MatchPattern");
}
if fnmatch_res == 0 {
res = if self.match_positive {
MatchType::Positive
@ -188,7 +192,7 @@ impl MatchPattern {
res = MatchType::None;
}
res
Ok(res)
}
}