diff --git a/Userland/Utilities/gzip.cpp b/Userland/Utilities/gzip.cpp index 7de3827470..a4b3ebdb3d 100644 --- a/Userland/Utilities/gzip.cpp +++ b/Userland/Utilities/gzip.cpp @@ -15,18 +15,29 @@ int main(int argc, char** argv) Vector filenames; bool keep_input_files { false }; bool write_to_stdout { false }; + bool decompress { false }; Core::ArgsParser args_parser; 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_positional_argument(filenames, "File to compress", "FILE"); + args_parser.add_option(decompress, "Decompress", "decompress", 'd'); + args_parser.add_positional_argument(filenames, "Files", "FILES"); args_parser.parse(argc, argv); if (write_to_stdout) keep_input_files = true; for (auto const& input_filename : filenames) { - auto output_filename = String::formatted("{}.gz", input_filename); + String output_filename; + if (decompress) { + if (!input_filename.ends_with(".gz"sv)) { + warnln("unknown suffix for: {}, skipping", input_filename); + continue; + } + output_filename = input_filename.substring(0, input_filename.length() - ".gz"sv.length()); + } else { + output_filename = String::formatted("{}.gz", input_filename); + } // We map the whole file instead of streaming to reduce size overhead (gzip header) and increase the deflate block size (better compression) // TODO: automatically fallback to buffered streaming for very large files @@ -37,26 +48,32 @@ int main(int argc, char** argv) } auto file = file_or_error.value(); - auto compressed_file = Compress::GzipCompressor::compress_all(file->bytes()); - if (!compressed_file.has_value()) { - warnln("Failed gzip compressing input file"); + AK::Optional output_bytes; + if (decompress) { + output_bytes = Compress::GzipDecompressor::decompress_all(file->bytes()); + } else { + output_bytes = Compress::GzipCompressor::compress_all(file->bytes()); + } + + if (!output_bytes.has_value()) { + warnln("Failed gzip {} input file", decompress ? "decompressing"sv : "compressing"sv); return 1; } auto success = false; if (write_to_stdout) { auto stdout = Core::OutputFileStream { Core::File::standard_output() }; - success = stdout.write_or_error(compressed_file.value()); + success = stdout.write_or_error(output_bytes.value()); } else { auto output_stream_result = Core::OutputFileStream::open(output_filename); if (output_stream_result.is_error()) { warnln("Failed opening output file for writing: {}", output_stream_result.error()); return 1; } - success = output_stream_result.value().write_or_error(compressed_file.value()); + success = output_stream_result.value().write_or_error(output_bytes.value()); } if (!success) { - warnln("Failed writing compressed file to output"); + warnln("Failed writing to output"); return 1; }