github/ouch
1
1
Fork 0
mirror of https://github.com/ouch-org/ouch.git synced 2025-06-07 12:05:46 +00:00
Code Issues 15 Packages Projects Releases Wiki Activity

Fix archives panicking when asked to overwrite file

Browse Source
This commit is contained in:
Spyros Roum 2021-11-02 13:34:38 +02:00
parent 547b8c91e5
commit 7f5ff0faf1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/archive/tar.rs
View File

@ -35,10 +35,10 @@ pub fn unpack_archive(
} }
if file_path.is_dir() { if file_path.is_dir() {
// We can't just use `fs::File::create(&file_path)` because it would return io::ErrorKind::IsADirectory
// ToDo: Maybe we should emphasise that `file_path` is a directory and everything inside it will be gone? // ToDo: Maybe we should emphasise that `file_path` is a directory and everything inside it will be gone?
fs::remove_dir_all(&file_path)?; fs::remove_dir_all(&file_path)?;
fs::File::create(&file_path)?; } else if file_path.is_file() {
fs::remove_file(&file_path)?;
} }
file.unpack_in(output_folder)?; file.unpack_in(output_folder)?;

4
src/archive/zip.rs
View File

@ -42,10 +42,10 @@ where
} }
if file_path.is_dir() { if file_path.is_dir() {
// We can't just use `fs::File::create(&file_path)` because it would return io::ErrorKind::IsADirectory
// ToDo: Maybe we should emphasise that `file_path` is a directory and everything inside it will be gone? // ToDo: Maybe we should emphasise that `file_path` is a directory and everything inside it will be gone?
fs::remove_dir_all(&file_path)?; fs::remove_dir_all(&file_path)?;
fs::File::create(&file_path)?; } else if file_path.is_file() {
fs::remove_file(&file_path)?;
} }
check_for_comments(&file); check_for_comments(&file);