Fix remaining build errors

This commit is contained in:
Chris Hennick 2024-05-09 13:17:34 -07:00 committed by GitHub
parent 169b802136
commit 0f086dcc75
Signed by: DevComp
GPG key ID: B5690EEEBB952194

View file

@ -796,7 +796,7 @@ impl<W: Write + Seek> ZipWriter<W> {
crc32: raw_values.crc32,
compressed_size: raw_values.compressed_size,
uncompressed_size: raw_values.uncompressed_size,
file_name: Box::new(""), // Never used for saving
file_name: "".into(), // Never used for saving
file_name_raw: name.into().bytes().collect(),
extra_field,
central_extra_field: options.extended_options.central_extra_data().cloned(),
@ -1755,8 +1755,10 @@ fn write_local_file_header<T: Write>(writer: &mut T, file: &ZipFileData) -> ZipR
// file name length
writer.write_u16_le(file.file_name_raw.len() as u16)?;
// extra field length
let extra_field_length = if file.large_file { 20 } else { 0 }
+ file.extra_field.map(|field| field.len()).unwrap_or(0) as u16;
let mut extra_field_length = if file.large_file { 20 } else { 0 };
if let Some(field) = file.extra_field {
extra_field_length += field.len();
}
writer.write_u16_le(extra_field_length)?;
// file name
writer.write_all(&file.file_name_raw)?;