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

gunzip: Port to LibMain

Browse source
This commit is contained in:
Lucas CHOLLET 2022-01-13 21:24:28 +01:00 • committed by Idan Horowitz
parent c2e7acc8bb
commit 80a1ab3487
2 changed files with 12 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Utilities/CMakeLists.txt
View file

@ -103,7 +103,7 @@ target_link_libraries(gml-format LibGUI LibMain)
target_link_libraries(grep LibRegex LibMain) target_link_libraries(grep LibRegex LibMain)
target_link_libraries(gron LibMain) target_link_libraries(gron LibMain)
target_link_libraries(groups LibMain) target_link_libraries(groups LibMain)
target_link_libraries(gunzip LibCompress) target_link_libraries(gunzip LibCompress LibMain)
target_link_libraries(gzip LibCompress LibMain) target_link_libraries(gzip LibCompress LibMain)
target_link_libraries(id LibMain) target_link_libraries(id LibMain)
target_link_libraries(ini LibMain) target_link_libraries(ini LibMain)

33
Userland/Utilities/gunzip.cpp
View file

@ -7,6 +7,8 @@
#include <LibCompress/Gzip.h> #include <LibCompress/Gzip.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/FileStream.h> #include <LibCore/FileStream.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <unistd.h> #include <unistd.h>
static bool decompress_file(Buffered<Core::InputFileStream>& input_stream, Buffered<Core::OutputFileStream>& output_stream) static bool decompress_file(Buffered<Core::InputFileStream>& input_stream, Buffered<Core::OutputFileStream>& output_stream)
@ -23,7 +25,7 @@ static bool decompress_file(Buffered<Core::InputFileStream>& input_stream, Buffe
return !gzip_stream.handle_any_error(); return !gzip_stream.handle_any_error();
} }
int main(int argc, char** argv) ErrorOr<int> serenity_main(Main::Arguments args)
{ {
Vector<StringView> filenames; Vector<StringView> filenames;
bool keep_input_files { false }; bool keep_input_files { false };
@ -33,7 +35,7 @@ int main(int argc, char** argv)
args_parser.add_option(keep_input_files, "Keep (don't delete) input files", "keep", 'k'); args_parser.add_option(keep_input_files, "Keep (don't delete) input files", "keep", 'k');
args_parser.add_option(write_to_stdout, "Write to stdout, keep original files unchanged", "stdout", 'c'); args_parser.add_option(write_to_stdout, "Write to stdout, keep original files unchanged", "stdout", 'c');
args_parser.add_positional_argument(filenames, "File to decompress", "FILE"); args_parser.add_positional_argument(filenames, "File to decompress", "FILE");
args_parser.parse(argc, argv); args_parser.parse(args);
if (write_to_stdout) if (write_to_stdout)
keep_input_files = true; keep_input_files = true;
@ -45,37 +47,24 @@ int main(int argc, char** argv)
const auto input_filename = filename; const auto input_filename = filename;
const auto output_filename = filename.substring_view(0, filename.length() - 3); const auto output_filename = filename.substring_view(0, filename.length() - 3);
auto input_stream_result = Core::InputFileStream::open_buffered(input_filename); auto input_stream_result = TRY(Core::InputFileStream::open_buffered(input_filename));
if (input_stream_result.is_error()) {
warnln("Failed opening input file for reading: {}", input_stream_result.error());
return 1;
}
auto success = false; auto success = false;
if (write_to_stdout) { if (write_to_stdout) {
auto stdout = Core::OutputFileStream::stdout_buffered(); auto stdout = Core::OutputFileStream::stdout_buffered();
success = decompress_file(input_stream_result.value(), stdout); success = decompress_file(input_stream_result, stdout);
} else { } else {
auto output_stream_result = Core::OutputFileStream::open_buffered(output_filename); auto output_stream_result = TRY(Core::OutputFileStream::open_buffered(output_filename));
if (output_stream_result.is_error()) {
warnln("Failed opening output file for writing: {}", output_stream_result.error()); success = decompress_file(input_stream_result, output_stream_result);
return 1;
}
success = decompress_file(input_stream_result.value(), output_stream_result.value());
} }
if (!success) { if (!success) {
warnln("Failed gzip decompressing input file"); warnln("Failed gzip decompressing input file");
return 1; return 1;
} }
if (!keep_input_files) { if (!keep_input_files)
const auto retval = unlink(String { input_filename }.characters()); TRY(Core::System::unlink(input_filename));
if (retval != 0) {
warnln("Failed removing input file");
return 1;
}
}
} }
return 0; return 0;
} }