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

gunzip: Use Core::Stream to write the decompression output

Browse source
This commit is contained in:
Tim Schumacher 2023-01-20 00:19:34 +01:00 • committed by Linus Groh
parent debde54928
commit 29cdd124d1
1 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Userland/Utilities/gunzip.cpp
View file

@ -6,19 +6,18 @@
#include <LibCompress/Gzip.h> #include <LibCompress/Gzip.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/FileStream.h>
#include <LibCore/System.h> #include <LibCore/System.h>
#include <LibMain/Main.h> #include <LibMain/Main.h>
#include <unistd.h> #include <unistd.h>
static ErrorOr<void> decompress_file(NonnullOwnPtr<Core::Stream::File> input_stream, Buffered<Core::OutputFileStream>& output_stream) static ErrorOr<void> decompress_file(NonnullOwnPtr<Core::Stream::File> input_stream, Core::Stream::Stream& output_stream)
{ {
auto gzip_stream = Compress::GzipDecompressor { move(input_stream) }; auto gzip_stream = Compress::GzipDecompressor { move(input_stream) };
auto buffer = TRY(ByteBuffer::create_uninitialized(4096)); auto buffer = TRY(ByteBuffer::create_uninitialized(4096));
while (!gzip_stream.is_eof()) { while (!gzip_stream.is_eof()) {
auto span = TRY(gzip_stream.read(buffer)); auto span = TRY(gzip_stream.read(buffer));
output_stream.write_or_error(span); TRY(output_stream.write_entire_buffer(span));
} }
return {}; return {};
@ -52,15 +51,9 @@ ErrorOr<int> serenity_main(Main::Arguments args)
} }
auto input_stream_result = TRY(Core::Stream::File::open(input_filename, Core::Stream::OpenMode::Read)); auto input_stream_result = TRY(Core::Stream::File::open(input_filename, Core::Stream::OpenMode::Read));
auto output_stream = write_to_stdout ? TRY(Core::Stream::File::standard_output()) : TRY(Core::Stream::File::open(output_filename, Core::Stream::OpenMode::Write));
if (write_to_stdout) { TRY(decompress_file(move(input_stream_result), *output_stream));
auto stdout = Core::OutputFileStream::stdout_buffered();
TRY(decompress_file(move(input_stream_result), stdout));
} else {
auto output_stream_result = TRY(Core::OutputFileStream::open_buffered(output_filename));
TRY(decompress_file(move(input_stream_result), output_stream_result));
}
if (!keep_input_files) if (!keep_input_files)
TRY(Core::System::unlink(input_filename)); TRY(Core::System::unlink(input_filename));