RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 08:54:58 +00:00
Code Issues Activity Actions

unzip: Port to LibMain

Browse source
This commit is contained in:
mjz19910 2022-01-03 15:24:56 -07:00 • committed by Brian Gianforcaro
parent 7c05db19a1
commit 154d33f240
2 changed files with 11 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Userland/Utilities/unzip.cpp
View file

@ -11,6 +11,7 @@
#include <LibCore/ArgsParser.h>
#include <LibCore/File.h>
#include <LibCore/MappedFile.h>
#include <LibCore/System.h>
#include <sys/stat.h>
#include <unistd.h>
@ -71,7 +72,7 @@ static bool unpack_zip_member(Archive::ZipMember zip_member, bool quiet)
return true;
}
int main(int argc, char** argv)
ErrorOr<int> serenity_main(Main::Arguments arguments)
{
const char* path;
int map_size_limit = 32 * MiB;
@ -83,16 +84,11 @@ int main(int argc, char** argv)
args_parser.add_option(output_directory_path, "Directory to receive the archive content", "output-directory", 'd', "path");
args_parser.add_option(quiet, "Be less verbose", "quiet", 'q');
args_parser.add_positional_argument(path, "File to unzip", "path", Core::ArgsParser::Required::Yes);
args_parser.parse(argc, argv);
args_parser.parse(arguments);
String zip_file_path { path };
struct stat st;
int rc = stat(zip_file_path.characters(), &st);
if (rc < 0) {
perror("stat");
return 1;
}
struct stat st = TRY(Core::System::stat(zip_file_path));
// FIXME: Map file chunk-by-chunk once we have mmap() with offset.
// This will require mapping some parts then unmapping them repeatedly,
@ -104,34 +100,22 @@ int main(int argc, char** argv)
return 1;
}
auto file_or_error = Core::MappedFile::map(zip_file_path);
if (file_or_error.is_error()) {
warnln("Failed to open {}: {}", zip_file_path, file_or_error.error());
return 1;
}
auto& mapped_file = *file_or_error.value();
auto mapped_file = TRY(Core::MappedFile::map(zip_file_path));
if (!quiet)
warnln("Archive: {}", zip_file_path);
auto zip_file = Archive::Zip::try_create(mapped_file.bytes());
auto zip_file = Archive::Zip::try_create(mapped_file->bytes());
if (!zip_file.has_value()) {
warnln("Invalid zip file {}", zip_file_path);
return 1;
}
if (!output_directory_path.is_null()) {
rc = mkdir(output_directory_path.characters(), 0755);
if (rc < 0 && errno != EEXIST) {
perror("mkdir");
return 1;
}
rc = chdir(output_directory_path.characters());
if (rc < 0) {
perror("chdir");
return 1;
}
auto mkdir_error = Core::System::mkdir(output_directory_path, 0755);
if (mkdir_error.is_error() && mkdir_error.error().code() != EEXIST)
return mkdir_error.release_error();
TRY(Core::System::chdir(output_directory_path));
}
auto success = zip_file->for_each_member([&](auto zip_member) {