RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 12:07:46 +00:00
Code Issues Activity

checksum: fix improperly formatted WARNING message

Browse source
This commit is contained in:
Dorian Peron 2025-01-22 00:35:43 +01:00 • committed by Dorian Peron
parent 11a0b1b505
commit 7fff3670b3
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/uucore/src/lib/features/checksum.rs
View file

@ -648,12 +648,11 @@ fn get_input_file(filename: &OsStr) -> UResult<Box<dyn Read>> {
fn identify_algo_name_and_length( fn identify_algo_name_and_length(
line_info: &LineInfo, line_info: &LineInfo,
algo_name_input: Option<&str>, algo_name_input: Option<&str>,
last_algo: &mut Option<String>,
) -> Option<(String, Option<usize>)> { ) -> Option<(String, Option<usize>)> {
let algorithm = line_info let algo_from_line = line_info.algo_name.clone().unwrap_or_default();
.algo_name let algorithm = algo_from_line.to_lowercase();
.clone() *last_algo = Some(algo_from_line);
.unwrap_or_default()
.to_lowercase();
// check if we are called with XXXsum (example: md5sum) but we detected a different algo parsing the file // check if we are called with XXXsum (example: md5sum) but we detected a different algo parsing the file
// (for example SHA1 (f) = d...) // (for example SHA1 (f) = d...)
@ -726,11 +725,13 @@ fn process_algo_based_line(
line_info: &LineInfo, line_info: &LineInfo,
cli_algo_name: Option<&str>, cli_algo_name: Option<&str>,
opts: ChecksumOptions, opts: ChecksumOptions,
last_algo: &mut Option<String>,
) -> Result<(), LineCheckError> { ) -> Result<(), LineCheckError> {
let filename_to_check = line_info.filename.as_slice(); let filename_to_check = line_info.filename.as_slice();
let (algo_name, algo_byte_len) = identify_algo_name_and_length(line_info, cli_algo_name) let (algo_name, algo_byte_len) =
.ok_or(LineCheckError::ImproperlyFormatted)?; identify_algo_name_and_length(line_info, cli_algo_name, last_algo)
.ok_or(LineCheckError::ImproperlyFormatted)?;
// If the digest bitlen is known, we can check the format of the expected // If the digest bitlen is known, we can check the format of the expected
// checksum with it. // checksum with it.
@ -795,6 +796,7 @@ fn process_checksum_line(
cli_algo_length: Option<usize>, cli_algo_length: Option<usize>,
opts: ChecksumOptions, opts: ChecksumOptions,
cached_regex: &mut Option<LineFormat>, cached_regex: &mut Option<LineFormat>,
last_algo: &mut Option<String>,
) -> Result<(), LineCheckError> { ) -> Result<(), LineCheckError> {
let line_bytes = os_str_as_bytes(line)?; let line_bytes = os_str_as_bytes(line)?;
@ -810,7 +812,7 @@ fn process_checksum_line(
}; };
if line_info.format == LineFormat::AlgoBased { if line_info.format == LineFormat::AlgoBased {
process_algo_based_line(&line_info, cli_algo_name, opts) process_algo_based_line(&line_info, cli_algo_name, opts, last_algo)
} else if let Some(cli_algo) = cli_algo_name { } else if let Some(cli_algo) = cli_algo_name {
// If we match a non-algo based regex, we expect a cli argument // If we match a non-algo based regex, we expect a cli argument
// to give us the algorithm to use // to give us the algorithm to use
@ -852,6 +854,10 @@ fn process_checksum_file(
// cached_regex is used to ensure that several non algo-based checksum line // cached_regex is used to ensure that several non algo-based checksum line
// will use the same regex. // will use the same regex.
let mut cached_regex = None; let mut cached_regex = None;
// last_algo caches the algorithm used in the last line to print a warning
// message for the current line if improperly formatted.
// Behavior tested in gnu_cksum_c::test_warn
let mut last_algo = None;
for (i, line) in lines.iter().enumerate() { for (i, line) in lines.iter().enumerate() {
let line_result = process_checksum_line( let line_result = process_checksum_line(
@ -861,6 +867,7 @@ fn process_checksum_file(
cli_algo_length, cli_algo_length,
opts, opts,
&mut cached_regex, &mut cached_regex,
&mut last_algo,
); );
// Match a first time to elude critical UErrors, and increment the total // Match a first time to elude critical UErrors, and increment the total
@ -882,6 +889,8 @@ fn process_checksum_file(
if opts.warn { if opts.warn {
let algo = if let Some(algo_name_input) = cli_algo_name { let algo = if let Some(algo_name_input) = cli_algo_name {
Cow::Owned(algo_name_input.to_uppercase()) Cow::Owned(algo_name_input.to_uppercase())
} else if let Some(algo) = &last_algo {
Cow::Borrowed(algo.as_str())
} else { } else {
Cow::Borrowed("Unknown algorithm") Cow::Borrowed("Unknown algorithm")
}; };