cksum: Add --raw argument

src/uu/cksum/src/cksum.rs

@@ -6,13 +6,15 @@
 // spell-checker:ignore (ToDO) fname, algo
 use clap::{crate_version, value_parser, Arg, ArgAction, Command};
 use hex::encode;
+use std::error::Error;
 use std::ffi::OsStr;
+use std::fmt::Display;
 use std::fs::File;
-use std::io::{self, stdin, BufReader, Read};
+use std::io::{self, stdin, stdout, BufReader, Read, Write};
 use std::iter;
 use std::path::Path;
 use uucore::{
- error::{FromIo, UResult},
+ error::{FromIo, UError, UResult},
  format_usage, help_about, help_section, help_usage,
  sum::{
  div_ceil, Blake2b, Digest, DigestWriter, Md5, Sha1, Sha224, Sha256, Sha384, Sha512, Sm3,
@@ -36,6 +38,31 @@
 const ALGORITHM_OPTIONS_BLAKE2B: &str = "blake2b";
 const ALGORITHM_OPTIONS_SM3: &str = "sm3";
 
+#[derive(Debug)]
+enum CkSumError {
+ RawMultipleFiles,
+}
+
+impl UError for CkSumError {
+ fn code(&self) -> i32 {
+ match self {
+ Self::RawMultipleFiles => 1,
+ }
+ }
+}
+
+impl Error for CkSumError {}
+
+impl Display for CkSumError {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ match self {
+ Self::RawMultipleFiles => {
+ write!(f, "the --raw option is not supported with multiple files")
+ }
+ }
+ }
+}
+
 fn detect_algo(
  program: &str,
  length: Option<usize>,
@@ -110,6 +137,7 @@
  output_bits: usize,
  untagged: bool,
  length: Option<usize>,
+ raw: bool,
 }
 
 /// Calculate checksum
@@ -123,7 +151,12 @@
 where
  I: Iterator<Item = &'a OsStr>,
 {
- for filename in files {
+ let files_vec: Vec<_> = files.collect();
+ if options.raw && files_vec.len() > 1 {
+ return Err(Box::new(CkSumError::RawMultipleFiles));
+ }
+
+ for filename in files_vec {
  let filename = Path::new(filename);
  let stdin_buf;
  let file_buf;
@@ -141,6 +174,11 @@
  let (sum, sz) = digest_read(&mut options.digest, &mut file, options.output_bits)
  .map_err_context(|| "failed to read input".to_string())?;
 
+ if options.raw {
+ let bytes_str = sum.parse::<u32>().unwrap().to_be_bytes();
+ stdout().write_all(&bytes_str)?;
+ return Ok(());
+ }
  // The BSD checksum output is 5 digit integer
  let bsd_width = 5;
  match (options.algo_name, not_file) {
@@ -238,6 +276,7 @@
  pub const FILE: &str = "file";
  pub const UNTAGGED: &str = "untagged";
  pub const LENGTH: &str = "length";
+ pub const RAW: &str = "raw";
 }
 
 #[uucore::main]
@@ -298,6 +337,7 @@
  output_bits: bits,
  length,
  untagged: matches.get_flag(options::UNTAGGED),
+ raw: matches.get_flag(options::RAW),
  };
 
  match matches.get_many::<String>(options::FILE) {
@@ -354,5 +394,11 @@
  .help("digest length in bits; must not exceed the max for the blake2 algorithm and must be a multiple of 8")
  .action(ArgAction::Set),
  )
+ .arg(
+ Arg::new(options::RAW)
+ .long(options::RAW)
+ .help("emit a raw binary digest, not hexadecimal")
+ .action(ArgAction::SetTrue),
+ )
  .after_help(AFTER_HELP)
 }

tests/by-util/test_cksum.rs

@@ -287,6 +287,28 @@ fn test_length_is_zero() {
  .stdout_is_fixture("length_is_zero.expected");
 }
 
+#[test]
+fn test_raw_single_file() {
+ new_ucmd!()
+ .arg("--raw")
+ .arg("lorem_ipsum.txt")
+ .succeeds()
+ .no_stderr()
+ .stdout_is_fixture_bytes("raw_single_file.expected");
+}
+
+#[test]
+fn test_raw_multiple_files() {
+ new_ucmd!()
+ .arg("--raw")
+ .arg("lorem_ipsum.txt")
+ .arg("alice_in_wonderland.txt")
+ .fails()
+ .no_stdout()
+ .stderr_contains("cksum: the --raw option is not supported with multiple files")
+ .code_is(1);
+}
+
 #[test]
 fn test_blake2b_fail_on_directory() {
  let (at, mut ucmd) = at_and_ucmd!();

tests/fixtures/cksum/raw_single_file.expected

@@ -0,0 +1 @@
+ŒPh