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

Mv central header parsing to central_header_to_zip_file

Browse source 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2022-07-20 22:20:49 +10:00 • committed by Marli Frost
parent 57440efa16
commit e99c15471c
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/read.rs
View file

@ -651,7 +651,13 @@ pub(crate) fn central_header_to_zip_file<R: Read + io::Seek>(
) -> ZipResult<ZipFileData> { ) -> ZipResult<ZipFileData> {
let central_header_start = reader.stream_position()?; let central_header_start = reader.stream_position()?;
central_header_to_zip_file_inner(reader, archive_offset, central_header_start) // Parse central header
let signature = reader.read_u32::<LittleEndian>()?;
if signature != spec::CENTRAL_DIRECTORY_HEADER_SIGNATURE {
Err(ZipError::InvalidArchive("Invalid Central Directory header"))
} else {
central_header_to_zip_file_inner(reader, archive_offset, central_header_start)
}
} }
/// Parse a central directory entry to collect the information for the file. /// Parse a central directory entry to collect the information for the file.
@ -660,12 +666,6 @@ fn central_header_to_zip_file_inner<R: Read>(
central_header_start: u64, central_header_start: u64,
archive_offset: u64, archive_offset: u64,
) -> ZipResult<ZipFileData> { ) -> ZipResult<ZipFileData> {
// Parse central header
let signature = reader.read_u32::<LittleEndian>()?;
if signature != spec::CENTRAL_DIRECTORY_HEADER_SIGNATURE {
return Err(ZipError::InvalidArchive("Invalid Central Directory header"));
}
let version_made_by = reader.read_u16::<LittleEndian>()?; let version_made_by = reader.read_u16::<LittleEndian>()?;
let _version_to_extract = reader.read_u16::<LittleEndian>()?; let _version_to_extract = reader.read_u16::<LittleEndian>()?;
let flags = reader.read_u16::<LittleEndian>()?; let flags = reader.read_u16::<LittleEndian>()?;