mirror of
https://github.com/uutils/coreutils
synced 2024-12-15 07:42:48 +00:00
Added --raw argument, with error for multiple files
This commit is contained in:
parent
f1499d0e79
commit
8c1fc8b287
1 changed files with 51 additions and 4 deletions
|
@ -8,11 +8,13 @@ use clap::{crate_version, value_parser, Arg, ArgAction, Command};
|
||||||
use hex::encode;
|
use hex::encode;
|
||||||
use std::ffi::OsStr;
|
use std::ffi::OsStr;
|
||||||
use std::fs::File;
|
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::iter;
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
|
use std::error::Error;
|
||||||
|
use std::fmt::Display;
|
||||||
use uucore::{
|
use uucore::{
|
||||||
error::{FromIo, UResult},
|
error::{FromIo, UResult, UError},
|
||||||
format_usage, help_about, help_section, help_usage,
|
format_usage, help_about, help_section, help_usage,
|
||||||
sum::{
|
sum::{
|
||||||
div_ceil, Blake2b, Digest, DigestWriter, Md5, Sha1, Sha224, Sha256, Sha384, Sha512, Sm3,
|
div_ceil, Blake2b, Digest, DigestWriter, Md5, Sha1, Sha224, Sha256, Sha384, Sha512, Sm3,
|
||||||
|
@ -36,6 +38,32 @@ const ALGORITHM_OPTIONS_SHA512: &str = "sha512";
|
||||||
const ALGORITHM_OPTIONS_BLAKE2B: &str = "blake2b";
|
const ALGORITHM_OPTIONS_BLAKE2B: &str = "blake2b";
|
||||||
const ALGORITHM_OPTIONS_SM3: &str = "sm3";
|
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(
|
fn detect_algo(
|
||||||
program: &str,
|
program: &str,
|
||||||
length: Option<usize>,
|
length: Option<usize>,
|
||||||
|
@ -110,6 +138,7 @@ struct Options {
|
||||||
output_bits: usize,
|
output_bits: usize,
|
||||||
untagged: bool,
|
untagged: bool,
|
||||||
length: Option<usize>,
|
length: Option<usize>,
|
||||||
|
raw: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Calculate checksum
|
/// Calculate checksum
|
||||||
|
@ -123,7 +152,12 @@ fn cksum<'a, I>(mut options: Options, files: I) -> UResult<()>
|
||||||
where
|
where
|
||||||
I: Iterator<Item = &'a OsStr>,
|
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 filename = Path::new(filename);
|
||||||
let stdin_buf;
|
let stdin_buf;
|
||||||
let file_buf;
|
let file_buf;
|
||||||
|
@ -141,6 +175,11 @@ where
|
||||||
let (sum, sz) = digest_read(&mut options.digest, &mut file, options.output_bits)
|
let (sum, sz) = digest_read(&mut options.digest, &mut file, options.output_bits)
|
||||||
.map_err_context(|| "failed to read input".to_string())?;
|
.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
|
// The BSD checksum output is 5 digit integer
|
||||||
let bsd_width = 5;
|
let bsd_width = 5;
|
||||||
match (options.algo_name, not_file) {
|
match (options.algo_name, not_file) {
|
||||||
|
@ -231,6 +270,7 @@ mod options {
|
||||||
pub const FILE: &str = "file";
|
pub const FILE: &str = "file";
|
||||||
pub const UNTAGGED: &str = "untagged";
|
pub const UNTAGGED: &str = "untagged";
|
||||||
pub const LENGTH: &str = "length";
|
pub const LENGTH: &str = "length";
|
||||||
|
pub const RAW: &str = "raw";
|
||||||
}
|
}
|
||||||
|
|
||||||
#[uucore::main]
|
#[uucore::main]
|
||||||
|
@ -291,6 +331,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
|
||||||
output_bits: bits,
|
output_bits: bits,
|
||||||
length,
|
length,
|
||||||
untagged: matches.get_flag(options::UNTAGGED),
|
untagged: matches.get_flag(options::UNTAGGED),
|
||||||
|
raw: matches.get_flag(options::RAW),
|
||||||
};
|
};
|
||||||
|
|
||||||
match matches.get_many::<String>(options::FILE) {
|
match matches.get_many::<String>(options::FILE) {
|
||||||
|
@ -347,5 +388,11 @@ pub fn uu_app() -> Command {
|
||||||
.help("digest length in bits; must not exceed the max for the blake2 algorithm and must be a multiple of 8")
|
.help("digest length in bits; must not exceed the max for the blake2 algorithm and must be a multiple of 8")
|
||||||
.action(ArgAction::Set),
|
.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)
|
.after_help(AFTER_HELP)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue