Merge branch 'fix-some-imports' of github.com:Its-Just-Nans/zip2 into fix-some-imports

Author: Its-Just-Nans

Cargo.toml

@@ -50,8 +50,8 @@ zeroize = { version = "1.8", optional = true, features = ["zeroize_derive"] }
 zstd = { version = "0.13", optional = true, default-features = false }
 zopfli = { version = "0.8", optional = true }
 deflate64 = { version = "0.1.9", optional = true }
-lzma-rust2 = { version = "0.13", optional = true, default-features = false, features = ["std", "encoder", "optimization", "xz"] }
-bitstream-io =  { version = "4.5.0", optional = true }
+lzma-rust2 = { version = "0.15", optional = true, default-features = false, features = ["std", "encoder", "optimization", "xz"] }
+bitstream-io = { version = "4.5.0", optional = true }
 
 [target.'cfg(fuzzing)'.dependencies]
 arbitrary = { version = "1.4.1", features = ["derive"] }

src/spec.rs

@@ -111,23 +111,28 @@ impl ExtraFieldMagic {
 ///
 /// let big_len: usize = (zip::ZIP64_BYTES_THR as usize) + 1;
 /// let big_buf = vec![0u8; big_len];
+/// {
 /// zip.start_file("zero.dat", options)?;
 /// // This is too big!
 /// let res = zip.write_all(&big_buf[..]).err().unwrap();
 /// assert_eq!(res.kind(), io::ErrorKind::Other);
 /// let description = format!("{}", &res);
 /// assert_eq!(description, "Large file option has not been set");
+/// }
+/// {
 /// // Attempting to write anything further to the same zip will still succeed, but the previous
 /// // failing entry has been removed.
 /// zip.start_file("one.dat", options)?;
 /// let zip = zip.finish_into_readable()?;
 /// let names: Vec<_> = zip.file_names().collect();
 /// assert_eq!(&names, &["one.dat"]);
+/// }
 ///
 /// // Create a new zip output.
 /// let mut zip = ZipWriter::new(Cursor::new(Vec::new()));
 /// // This time, create a zip64 record for the file.
-/// let options = options.large_file(true);
+/// let options = SimpleFileOptions::default()
+///      .compression_method(zip::CompressionMethod::Stored).large_file(true);
 /// zip.start_file("zero.dat", options)?;
 /// // This succeeds because we specified that it could be a large file.
 /// assert!(zip.write_all(&big_buf[..]).is_ok());

src/types.rs

@@ -974,17 +974,23 @@ impl ZipFileData {
         )
     }
 
-    pub(crate) fn data_descriptor_block(&self) -> Option<ZipDataDescriptorBlock> {
+    pub(crate) fn write_data_descriptor<W: std::io::Write>(
+        &self,
+        writer: &mut W,
+    ) -> Result<(), ZipError> {
         if self.large_file {
-            return None;
+            return self.zip64_data_descriptor_block().write(writer);
         }
+        self.data_descriptor_block().write(writer)
+    }
 
-        Some(ZipDataDescriptorBlock {
+    pub(crate) fn data_descriptor_block(&self) -> ZipDataDescriptorBlock {
+        ZipDataDescriptorBlock {
             magic: ZipDataDescriptorBlock::MAGIC,
             crc32: self.crc32,
             compressed_size: self.compressed_size as u32,
             uncompressed_size: self.uncompressed_size as u32,
-        })
+        }
     }
 
     pub(crate) fn zip64_data_descriptor_block(&self) -> Zip64DataDescriptorBlock {

src/write.rs

@@ -1075,7 +1075,7 @@ impl<W: Write + Seek> ZipWriter<W> {
             };
             update_aes_extra_data(writer, file)?;
             if file.using_data_descriptor {
-                write_data_descriptor(writer, file)?;
+                file.write_data_descriptor(writer)?;
             } else {
                 update_local_file_header(writer, file)?;
                 writer.seek(SeekFrom::Start(file_end))?;
@@ -2004,23 +2004,6 @@ fn update_aes_extra_data<W: Write + Seek>(writer: &mut W, file: &mut ZipFileData
     Ok(())
 }
 
-fn write_data_descriptor<T: Write>(writer: &mut T, file: &ZipFileData) -> ZipResult<()> {
-    if let Some(block) = file.data_descriptor_block() {
-        block.write(writer)?;
-    } else {
-        // check compressed size as well as it can also be slightly larger than uncompressed size
-        if file.compressed_size > spec::ZIP64_BYTES_THR {
-            return Err(ZipError::Io(io::Error::other(
-                "Large file option has not been set",
-            )));
-        }
-
-        file.zip64_data_descriptor_block().write(writer)?;
-    }
-
-    Ok(())
-}
-
 fn update_local_file_header<T: Write + Seek>(
     writer: &mut T,
     file: &mut ZipFileData,