RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

Merge pull request #6584 from howjmay/checksum-no-check

Browse source 
hashsum: Return err when only --strict or --quiet is given
This commit is contained in:
Daniel Hofstetter 2024-07-23 15:20:35 +02:00 • committed by GitHub
commit 79d7158aac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/uu/hashsum/src/hashsum.rs
View file

@ -209,6 +209,7 @@ pub fn uumain(mut args: impl uucore::Args) -> UResult<()> {
let check = matches.get_flag("check"); let check = matches.get_flag("check");
let status = matches.get_flag("status"); let status = matches.get_flag("status");
let quiet = matches.get_flag("quiet") || status; let quiet = matches.get_flag("quiet") || status;
let strict = matches.get_flag("strict");
let warn = matches.get_flag("warn") && !status; let warn = matches.get_flag("warn") && !status;
let ignore_missing = matches.get_flag("ignore-missing"); let ignore_missing = matches.get_flag("ignore-missing");
@ -220,7 +221,6 @@ pub fn uumain(mut args: impl uucore::Args) -> UResult<()> {
if check { if check {
let text_flag = matches.get_flag("text"); let text_flag = matches.get_flag("text");
let binary_flag = matches.get_flag("binary"); let binary_flag = matches.get_flag("binary");
let strict = matches.get_flag("strict");
if binary_flag || text_flag { if binary_flag || text_flag {
return Err(ChecksumError::BinaryTextConflict.into()); return Err(ChecksumError::BinaryTextConflict.into());
@ -245,6 +245,10 @@ pub fn uumain(mut args: impl uucore::Args) -> UResult<()> {
Some(algo.name), Some(algo.name),
Some(algo.bits), Some(algo.bits),
); );
} else if quiet {
return Err(ChecksumError::QuietNotCheck.into());
} else if strict {
return Err(ChecksumError::StrictNotCheck.into());
} }
let nonames = *matches let nonames = *matches

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

@ -81,6 +81,10 @@ pub enum ChecksumError {
RawMultipleFiles, RawMultipleFiles,
#[error("the --ignore-missing option is meaningful only when verifying checksums")] #[error("the --ignore-missing option is meaningful only when verifying checksums")]
IgnoreNotCheck, IgnoreNotCheck,
#[error("the --strict option is meaningful only when verifying checksums")]
StrictNotCheck,
#[error("the --quiet option is meaningful only when verifying checksums")]
QuietNotCheck,
#[error("Invalid output size for SHA3 (expected 224, 256, 384, or 512)")] #[error("Invalid output size for SHA3 (expected 224, 256, 384, or 512)")]
InvalidOutputSizeForSha3, InvalidOutputSizeForSha3,
#[error("--bits required for SHA3")] #[error("--bits required for SHA3")]

13
tests/by-util/test_hashsum.rs
View file

@ -874,6 +874,19 @@ fn test_check_quiet() {
.fails() .fails()
.stdout_contains("f: FAILED") .stdout_contains("f: FAILED")
.stderr_contains("WARNING: 1 computed checksum did NOT match"); .stderr_contains("WARNING: 1 computed checksum did NOT match");
scene
.ccmd("md5sum")
.arg("--quiet")
.arg(at.subdir.join("in.md5"))
.fails()
.stderr_contains("md5sum: the --quiet option is meaningful only when verifying checksums");
scene
.ccmd("md5sum")
.arg("--strict")
.arg(at.subdir.join("in.md5"))
.fails()
.stderr_contains("md5sum: the --strict option is meaningful only when verifying checksums");
} }
#[test] #[test]