Cleanup and fix compress/decompress command

This commit is contained in:
topjohnwu
2025-08-22 22:21:30 -07:00
committed by John Wu
parent c1491b8d2b
commit 7b706bb0cb
5 changed files with 94 additions and 83 deletions

View File

@@ -1,4 +1,4 @@
use crate::compress::{compress, decompress};
use crate::compress::{compress_cmd, decompress_cmd};
use crate::cpio::{cpio_commands, print_cpio_usage};
use crate::dtb::{DtbAction, dtb_commands, print_dtb_usage};
use crate::ffi::{BootImage, FileFormat, cleanup, repack, split_image_dtb, unpack};
@@ -414,14 +414,14 @@ fn boot_main(cmds: CmdArgs) -> LoggedResult<i32> {
cleanup();
}
Action::Decompress(Decompress { mut file, mut out }) => {
decompress(&mut file, out.as_mut())?;
decompress_cmd(&mut file, out.as_mut())?;
}
Action::Compress(Compress {
ref mut file,
ref format,
ref mut out,
}) => {
compress(
compress_cmd(
FileFormat::from_str(format).unwrap_or(FileFormat::UNKNOWN),
file,
out.as_mut(),