open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bad leak when using WalkDir on linux

Browse Source
This commit is contained in:
Federico Terzi 2019-09-27 22:12:34 +02:00
parent 909ad6b6ee
commit 35ee1950cf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils.rs
View File

@ -23,14 +23,14 @@ use walkdir::WalkDir;
use std::fs::create_dir; use std::fs::create_dir;
pub fn copy_dir(source_dir: &Path, dest_dir: &Path) -> Result<(), Box<dyn Error>> { pub fn copy_dir(source_dir: &Path, dest_dir: &Path) -> Result<(), Box<dyn Error>> {
for entry in WalkDir::new(source_dir) { for entry in std::fs::read_dir(source_dir)? {
let entry = entry?; let entry = entry?;
let entry = entry.path(); let entry = entry.path();
if entry.is_dir() { if entry.is_dir() {
let name = entry.file_name().expect("Error obtaining the filename"); let name = entry.file_name().expect("Error obtaining the filename");
let target_dir = dest_dir.join(name); let target_dir = dest_dir.join(name);
create_dir(&target_dir)?; create_dir(&target_dir)?;
copy_dir(entry, &target_dir); copy_dir(&entry, &target_dir);
}else if entry.is_file() { }else if entry.is_file() {
let target_entry = dest_dir.join(entry.file_name().expect("Error obtaining the filename")); let target_entry = dest_dir.join(entry.file_name().expect("Error obtaining the filename"));
std::fs::copy(entry, target_entry); std::fs::copy(entry, target_entry);