Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 26 additions & 20 deletions src/uucore/src/lib/features/checksum/validate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -683,26 +683,32 @@ fn compute_and_check_digest_from_file(

// Set binary to false because --binary is not supported with --check

let (calculated_checksum, _) =
match digest_reader(&mut digest, &mut file_reader, ReadingMode::Text) {
Ok(result) => result,
Err(err) => {
show!(err.map_err_context(|| {
locale_aware_escape_name(&real_filename_to_check, QuotingStyle::SHELL_ESCAPE)
.to_string_lossy()
.to_string()
}));

write_file_report(
io::stdout(),
filename,
FileChecksumResult::CantOpen,
prefix,
opts.verbose,
);
return Err(LineCheckError::CantOpenFile);
}
};
let reading_mode = if cfg!(not(unix)) {
ReadingMode::Binary
} else {
ReadingMode::Text
};

let (calculated_checksum, _) = match digest_reader(&mut digest, &mut file_reader, reading_mode)
{
Ok(result) => result,
Err(err) => {
show!(err.map_err_context(|| {
locale_aware_escape_name(&real_filename_to_check, QuotingStyle::SHELL_ESCAPE)
.to_string_lossy()
.to_string()
}));

write_file_report(
io::stdout(),
filename,
FileChecksumResult::CantOpen,
prefix,
opts.verbose,
);
return Err(LineCheckError::CantOpenFile);
}
};

// Do the checksum validation
let checksum_correct = match calculated_checksum {
Expand Down
Loading