DevComp/zip-rs-wasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Handle special naming convention for directories

Browse source
This commit is contained in:
Chris Hennick 2023-05-14 18:21:55 -07:00
parent 0594f5ef32
commit 3e87a376b9
No known key found for this signature in database
GPG key ID: 25653935CC8B6C74
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
fuzz/fuzz_targets/fuzz_write.rs
View file

@ -28,13 +28,23 @@ pub struct FileOperation {
reopen: bool, reopen: bool,
} }
impl FileOperation {
fn referenceable_name(&self) -> &str {
if let WriteDirectory(_) = self.basic {
self.name + "/"
} else {
self.name
}
}
}
fn do_operation<T>(writer: &mut RefCell<zip_next::ZipWriter<T>>, fn do_operation<T>(writer: &mut RefCell<zip_next::ZipWriter<T>>,
operation: FileOperation) -> Result<(), Box<dyn std::error::Error>> operation: FileOperation) -> Result<(), Box<dyn std::error::Error>>
where T: Read + Write + Seek { where T: Read + Write + Seek {
let name = operation.name; let name = operation.name;
match operation.basic { match operation.basic {
BasicFileOperation::WriteNormalFile {contents, mut options, ..} => { BasicFileOperation::WriteNormalFile {contents, mut options, ..} => {
if contents.iter().map(Vec::len).sum::<usize>() >= u32::MAX as usize { if file.contents.iter().map(Vec::len).sum::<usize>() >= u32::MAX as usize {
options = options.large_file(true); options = options.large_file(true);
} }
writer.borrow_mut().start_file(name, options)?; writer.borrow_mut().start_file(name, options)?;
@ -49,12 +59,12 @@ fn do_operation<T>(writer: &mut RefCell<zip_next::ZipWriter<T>>,
writer.borrow_mut().add_symlink(name, target.to_string_lossy(), options)?; writer.borrow_mut().add_symlink(name, target.to_string_lossy(), options)?;
} }
BasicFileOperation::ShallowCopy(base) => { BasicFileOperation::ShallowCopy(base) => {
let base_name = base.name.to_owned(); let base_name = base.referenceable_name().to_owned();
do_operation(writer, *base)?; do_operation(writer, *base)?;
writer.borrow_mut().shallow_copy_file(&base_name, &name)?; writer.borrow_mut().shallow_copy_file(&base_name, &name)?;
} }
BasicFileOperation::DeepCopy(base) => { BasicFileOperation::DeepCopy(base) => {
let base_name = base.name.to_owned(); let base_name = base.referenceable_name().to_owned();
do_operation(writer, *base)?; do_operation(writer, *base)?;
writer.borrow_mut().deep_copy_file(&base_name, &name)?; writer.borrow_mut().deep_copy_file(&base_name, &name)?;
} }