RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-01 10:18:13 +00:00
Code Issues Activity Actions

LibArchive: Refactor zip header handling

Browse source 
The directory headers have some common code for reading.
This commit is contained in:
Lenny Maiorani 2022-02-16 13:33:15 -07:00 • committed by Idan Horowitz
parent 1511e9a5a9
commit 484c0edafc
2 changed files with 42 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibArchive/Zip.cpp
View file

@ -1,5 +1,6 @@
/*
* Copyright (c) 2021, Idan Horowitz <idan.horowitz@serenityos.org>
* Copyright (c) 2022, the SerenityOS developers.
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -15,8 +16,9 @@ bool Zip::find_end_of_central_directory_offset(ReadonlyBytes buffer, size_t& off
if (buffer.size() < (sizeof(EndOfCentralDirectory) - sizeof(u8*)) + backwards_offset)
return false;
auto signature_offset = (buffer.size() - (sizeof(EndOfCentralDirectory) - sizeof(u8*)) - backwards_offset);
if (memcmp(buffer.data() + signature_offset, end_of_central_directory_signature, sizeof(end_of_central_directory_signature)) == 0) {
auto const signature_offset = (buffer.size() - (sizeof(EndOfCentralDirectory) - sizeof(u8*)) - backwards_offset);
if (auto signature = ReadonlyBytes { buffer.data() + signature_offset, EndOfCentralDirectory::signature.size() };
signature == EndOfCentralDirectory::signature) {
offset = signature_offset;
return true;
}
@ -156,7 +158,7 @@ void ZipOutputStream::finish()
central_directory_record.internal_attributes = 0;
central_directory_record.external_attributes = member.is_directory ? zip_directory_external_attribute : 0;
central_directory_record.local_file_header_offset = file_header_offset; // FIXME: we assume the wrapped output stream was never written to before us
file_header_offset += sizeof(local_file_header_signature) + (sizeof(LocalFileHeader) - (sizeof(u8*) * 3)) + member.name.length() + member.compressed_data.size();
file_header_offset += sizeof(LocalFileHeader::signature) + (sizeof(LocalFileHeader) - (sizeof(u8*) * 3)) + member.name.length() + member.compressed_data.size();
central_directory_record.name = (const u8*)(member.name.characters());
central_directory_record.extra_data = nullptr;
central_directory_record.comment = nullptr;