Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2025-01-19 00:24:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

cksum: use the qualified import to make its provenance clear

Browse source
This commit is contained in:
Sylvestre Ledru 2024-05-09 08:54:10 +02:00
parent 7e33650c8c
commit 5f0b48e649
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/uu/cksum/src/cksum.rs
View file

@ -5,8 +5,6 @@
// spell-checker:ignore (ToDO) fname, algo // spell-checker:ignore (ToDO) fname, algo
use clap::{crate_version, value_parser, Arg, ArgAction, Command}; use clap::{crate_version, value_parser, Arg, ArgAction, Command};
use hex::decode;
use hex::encode;
use std::error::Error; use std::error::Error;
use std::ffi::OsStr; use std::ffi::OsStr;
use std::fmt::Display; use std::fmt::Display;
@ -205,7 +203,7 @@ where
ALGORITHM_OPTIONS_SYSV | ALGORITHM_OPTIONS_BSD => { ALGORITHM_OPTIONS_SYSV | ALGORITHM_OPTIONS_BSD => {
sum_hex.parse::<u16>().unwrap().to_be_bytes().to_vec() sum_hex.parse::<u16>().unwrap().to_be_bytes().to_vec()
} }
_ => decode(sum_hex).unwrap(), _ => hex::decode(sum_hex).unwrap(),
}; };
// Cannot handle multiple files anyway, output immediately. // Cannot handle multiple files anyway, output immediately.
stdout().write_all(&bytes)?; stdout().write_all(&bytes)?;
@ -214,7 +212,7 @@ where
OutputFormat::Hexadecimal => sum_hex, OutputFormat::Hexadecimal => sum_hex,
OutputFormat::Base64 => match options.algo_name { OutputFormat::Base64 => match options.algo_name {
ALGORITHM_OPTIONS_CRC | ALGORITHM_OPTIONS_SYSV | ALGORITHM_OPTIONS_BSD => sum_hex, ALGORITHM_OPTIONS_CRC | ALGORITHM_OPTIONS_SYSV | ALGORITHM_OPTIONS_BSD => sum_hex,
_ => encoding::encode(encoding::Format::Base64, &decode(sum_hex).unwrap()).unwrap(), _ => encoding::encode(encoding::Format::Base64, &hex::decode(sum_hex).unwrap()).unwrap(),
}, },
}; };
// The BSD checksum output is 5 digit integer // The BSD checksum output is 5 digit integer
@ -299,7 +297,7 @@ fn digest_read<T: Read>(
// Assume it's SHAKE. result_str() doesn't work with shake (as of 8/30/2016) // Assume it's SHAKE. result_str() doesn't work with shake (as of 8/30/2016)
let mut bytes = vec![0; (output_bits + 7) / 8]; let mut bytes = vec![0; (output_bits + 7) / 8];
digest.hash_finalize(&mut bytes); digest.hash_finalize(&mut bytes);
Ok((encode(bytes), output_size)) Ok((hex::encode(bytes), output_size))
} }
} }