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

tools: use scan_subdir iterator for scandir 

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-02-12 14:21:49 +01:00
parent 32286b039c
commit 121f18efb7
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/tools.rs
View File

@ -349,34 +349,21 @@ pub fn complete_file_name(arg: &str) -> Vec<String> {
/// names. This function simply skips non-UTF8 encoded names. /// names. This function simply skips non-UTF8 encoded names.
pub fn scandir<P, F>( pub fn scandir<P, F>(
dirfd: RawFd, dirfd: RawFd,
path: P, path: &P,
regex: &regex::Regex, regex: &regex::Regex,
mut callback: F mut callback: F
) -> Result<(), Error> ) -> Result<(), Error>
where F: FnMut(RawFd, &str, nix::dir::Type) -> Result<(), Error>, where F: FnMut(RawFd, &str, nix::dir::Type) -> Result<(), Error>,
P: AsRef<Path> P: ?Sized + nix::NixPath,
{ {
use nix::fcntl::OFlag; for entry in self::fs::scan_subdir(dirfd, path, regex)? {
use nix::sys::stat::Mode;
let mut subdir = nix::dir::Dir::openat(dirfd, path.as_ref(), OFlag::O_RDONLY, Mode::empty())?;
let subdir_fd = subdir.as_raw_fd();
for entry in subdir.iter() {
let entry = entry?; let entry = entry?;
let file_type = match entry.file_type() { let file_type = match entry.file_type() {
Some(file_type) => file_type, Some(file_type) => file_type,
None => bail!("unable to detect file type"), None => bail!("unable to detect file type"),
}; };
let filename = entry.file_name();
let filename_str = match filename.to_str() {
Ok(name) => name,
Err(_) => continue /* ignore non utf8 entries*/,
};
if !regex.is_match(filename_str) { continue; } callback(entry.parent_fd(), unsafe { entry.file_name_utf8_unchecked() }, file_type)?;
(callback)(subdir_fd, filename_str, file_type)?;
} }
Ok(()) Ok(())
} }