From 42a954206db8add37df6d400cbcb563a74bfdff9 Mon Sep 17 00:00:00 2001 From: Adrian Date: Wed, 10 Apr 2024 09:40:19 +0200 Subject: [PATCH 1/5] add append example --- README.md | 1 + examples/append.rs | 68 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 examples/append.rs diff --git a/README.md b/README.md index f06cdbb5..a45234ac 100644 --- a/README.md +++ b/README.md @@ -72,6 +72,7 @@ See the [examples directory](examples) for: * How to extract a zip file. * How to extract a single file from a zip. * How to read a zip from the standard input. + * How to append a directory to an existing archive Fuzzing ------- diff --git a/examples/append.rs b/examples/append.rs new file mode 100644 index 00000000..eb79e111 --- /dev/null +++ b/examples/append.rs @@ -0,0 +1,68 @@ +use std::{ + fs::{File, OpenOptions}, + io::{Read, Write}, + path::{Path, PathBuf}, + str::FromStr, +}; +use zip; + +fn gather_files<'a, T: Into<&'a Path>>(path: T, files: &mut Vec) { + let path: &Path = path.into(); + + for entry in path.read_dir().unwrap() { + match entry { + Ok(e) => { + if e.path().is_dir() { + gather_files(e.path().as_ref(), files); + } else if e.path().is_file() { + files.push(e.path()); + } + } + Err(_) => todo!(), + } + } +} + +fn real_main() -> i32 { + let args: Vec<_> = std::env::args().collect(); + if args.len() < 3 { + println!("Usage: {} ", args[0]); + return 1; + } + + let existing_archive_path = &*args[1]; + let append_dir_path = &*args[2]; + let archive = PathBuf::from_str(existing_archive_path).unwrap(); + let to_append = PathBuf::from_str(append_dir_path).unwrap(); + + let existing_zip = OpenOptions::new() + .read(true) + .write(true) + .open(&archive) + .unwrap(); + let mut append_zip = zip::ZipWriter::new_append(existing_zip).unwrap(); + + let mut files: Vec = vec![]; + gather_files(to_append.as_ref(), &mut files); + + let mut buf: Vec = vec![]; + for file in files { + append_zip + .start_file(file.to_string_lossy(), Default::default()) + .unwrap(); + + let mut f = File::open(file).unwrap(); + f.read_to_end(&mut buf).unwrap(); + + append_zip.write_all(&buf).unwrap(); + buf.clear(); + } + + append_zip.finish().unwrap(); + + 0 +} + +fn main() { + std::process::exit(real_main()); +} From f6a34093fcd2c32a976890fc98e795f75b64eaee Mon Sep 17 00:00:00 2001 From: Adrian Date: Mon, 15 Apr 2024 10:34:49 +0200 Subject: [PATCH 2/5] use io::copy instead of read_to_end --- examples/append.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/examples/append.rs b/examples/append.rs index eb79e111..560136d3 100644 --- a/examples/append.rs +++ b/examples/append.rs @@ -45,17 +45,13 @@ fn real_main() -> i32 { let mut files: Vec = vec![]; gather_files(to_append.as_ref(), &mut files); - let mut buf: Vec = vec![]; for file in files { append_zip .start_file(file.to_string_lossy(), Default::default()) .unwrap(); let mut f = File::open(file).unwrap(); - f.read_to_end(&mut buf).unwrap(); - - append_zip.write_all(&buf).unwrap(); - buf.clear(); + let _ = std::io::copy(&mut f, &mut append_zip); } append_zip.finish().unwrap(); From b944c3ad8600b978871e53764fcabe20e1ec7e65 Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Wed, 1 May 2024 09:55:07 -0700 Subject: [PATCH 3/5] Fix failing build Signed-off-by: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> --- examples/append.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/examples/append.rs b/examples/append.rs index 560136d3..8bb1e4d8 100644 --- a/examples/append.rs +++ b/examples/append.rs @@ -1,6 +1,5 @@ use std::{ fs::{File, OpenOptions}, - io::{Read, Write}, path::{Path, PathBuf}, str::FromStr, }; @@ -47,7 +46,7 @@ fn real_main() -> i32 { for file in files { append_zip - .start_file(file.to_string_lossy(), Default::default()) + .start_file_from_path(file, Default::default()) .unwrap(); let mut f = File::open(file).unwrap(); From da3bbc87d7cde34bff29ca191d9fa43662b76c0a Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Thu, 2 May 2024 12:58:31 -0700 Subject: [PATCH 4/5] doc(examples): Fix a bug where type SimpleFileOptions must be specified --- examples/append.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/append.rs b/examples/append.rs index 8bb1e4d8..6c5e41d9 100644 --- a/examples/append.rs +++ b/examples/append.rs @@ -1,9 +1,11 @@ use std::{ fs::{File, OpenOptions}, + io::{Read, Write}, path::{Path, PathBuf}, str::FromStr, }; use zip; +use zip::write::SimpleFileOptions; fn gather_files<'a, T: Into<&'a Path>>(path: T, files: &mut Vec) { let path: &Path = path.into(); @@ -46,7 +48,7 @@ fn real_main() -> i32 { for file in files { append_zip - .start_file_from_path(file, Default::default()) + .start_file(file.to_string_lossy(), SimpleFileOptions::default()) .unwrap(); let mut f = File::open(file).unwrap(); From 08d30e976aeee41ef501e2d4ae3a05488db54027 Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Thu, 2 May 2024 13:31:38 -0700 Subject: [PATCH 5/5] style: Fix Clippy warnings: unused imports --- examples/append.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/examples/append.rs b/examples/append.rs index 6c5e41d9..88a5147e 100644 --- a/examples/append.rs +++ b/examples/append.rs @@ -1,10 +1,8 @@ use std::{ fs::{File, OpenOptions}, - io::{Read, Write}, path::{Path, PathBuf}, str::FromStr, }; -use zip; use zip::write::SimpleFileOptions; fn gather_files<'a, T: Into<&'a Path>>(path: T, files: &mut Vec) { @@ -39,7 +37,7 @@ fn real_main() -> i32 { let existing_zip = OpenOptions::new() .read(true) .write(true) - .open(&archive) + .open(archive) .unwrap(); let mut append_zip = zip::ZipWriter::new_append(existing_zip).unwrap();