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

unzip: Prefer File over DeprecatedFile

Browse source
This commit is contained in:
Ben Wiederhake 2023-05-20 10:34:16 +02:00 • committed by Andreas Kling
parent 8afd09b423
commit e935cb9f09
1 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Userland/Utilities/unzip.cpp
View file

@ -11,8 +11,8 @@
#include <LibArchive/Zip.h> #include <LibArchive/Zip.h>
#include <LibCompress/Deflate.h> #include <LibCompress/Deflate.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/DeprecatedFile.h>
#include <LibCore/Directory.h> #include <LibCore/Directory.h>
#include <LibCore/File.h>
#include <LibCore/MappedFile.h> #include <LibCore/MappedFile.h>
#include <LibCore/System.h> #include <LibCore/System.h>
#include <LibCrypto/Checksum/CRC32.h> #include <LibCrypto/Checksum/CRC32.h>
@ -43,11 +43,12 @@ static bool unpack_zip_member(Archive::ZipMember zip_member, bool quiet)
return true; return true;
} }
MUST(Core::Directory::create(LexicalPath(zip_member.name.to_deprecated_string()).parent(), Core::Directory::CreateDirectories::Yes)); MUST(Core::Directory::create(LexicalPath(zip_member.name.to_deprecated_string()).parent(), Core::Directory::CreateDirectories::Yes));
auto new_file = Core::DeprecatedFile::construct(zip_member.name.to_deprecated_string()); auto new_file_or_error = Core::File::open(zip_member.name.to_deprecated_string(), Core::File::OpenMode::Write);
if (!new_file->open(Core::OpenMode::WriteOnly)) { if (new_file_or_error.is_error()) {
warnln("Can't write file {}: {}", zip_member.name, new_file->error_string()); warnln("Can't write file {}: {}", zip_member.name, new_file_or_error.release_error());
return false; return false;
} }
auto new_file = new_file_or_error.release_value();
if (!quiet) if (!quiet)
outln(" extracting: {}", zip_member.name); outln(" extracting: {}", zip_member.name);
@ -55,8 +56,8 @@ static bool unpack_zip_member(Archive::ZipMember zip_member, bool quiet)
Crypto::Checksum::CRC32 checksum; Crypto::Checksum::CRC32 checksum;
switch (zip_member.compression_method) { switch (zip_member.compression_method) {
case Archive::ZipCompressionMethod::Store: { case Archive::ZipCompressionMethod::Store: {
if (!new_file->write(zip_member.compressed_data.data(), zip_member.compressed_data.size())) { if (auto maybe_error = new_file->write_until_depleted(zip_member.compressed_data); maybe_error.is_error()) {
warnln("Can't write file contents in {}: {}", zip_member.name, new_file->error_string()); warnln("Can't write file contents in {}: {}", zip_member.name, maybe_error.release_error());
return false; return false;
} }
checksum.update({ zip_member.compressed_data.data(), zip_member.compressed_data.size() }); checksum.update({ zip_member.compressed_data.data(), zip_member.compressed_data.size() });
@ -72,11 +73,11 @@ static bool unpack_zip_member(Archive::ZipMember zip_member, bool quiet)
warnln("Failed decompressing file {}", zip_member.name); warnln("Failed decompressing file {}", zip_member.name);
return false; return false;
} }
if (!new_file->write(decompressed_data.value().data(), decompressed_data.value().size())) { if (auto maybe_error = new_file->write_until_depleted(decompressed_data.value()); maybe_error.is_error()) {
warnln("Can't write file contents in {}: {}", zip_member.name, new_file->error_string()); warnln("Can't write file contents in {}: {}", zip_member.name, maybe_error.release_error());
return false; return false;
} }
checksum.update({ decompressed_data.value().data(), decompressed_data.value().size() }); checksum.update(decompressed_data.value());
break; break;
} }
default: default:
@ -88,10 +89,7 @@ static bool unpack_zip_member(Archive::ZipMember zip_member, bool quiet)
return false; return false;
} }
if (!new_file->close()) { new_file->close();
warnln("Can't close file {}: {}", zip_member.name, new_file->error_string());
return false;
}
if (checksum.digest() != zip_member.crc32) { if (checksum.digest() != zip_member.crc32) {
warnln("Failed decompressing file {}: CRC32 mismatch", zip_member.name); warnln("Failed decompressing file {}: CRC32 mismatch", zip_member.name);