Thanks to visit codestin.com
Credit goes to github.com

Skip to content

hashsum: don't fail on dirs #8930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 26, 2025
Merged

hashsum: don't fail on dirs #8930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions src/uu/hashsum/src/hashsum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use uucore::checksum::detect_algo;
use uucore::checksum::digest_reader;
use uucore::checksum::escape_filename;
use uucore::checksum::perform_checksum_validation;
use uucore::error::{FromIo, UResult};
use uucore::error::{UResult, strip_errno};
use uucore::format_usage;
use uucore::sum::{Digest, Sha3_224, Sha3_256, Sha3_384, Sha3_512, Shake128, Shake256};
use uucore::translate;
Expand Down Expand Up @@ -552,9 +552,10 @@ where
Ok(f) => f,
Err(e) => {
eprintln!(
"{}: {}: {e}",
"{}: {}: {}",
options.binary_name,
filename.to_string_lossy()
filename.to_string_lossy(),
strip_errno(&e)
);
err_found = Some(ChecksumError::Io(e));
continue;
Expand All @@ -564,13 +565,25 @@ where
},
);

let (sum, _) = digest_reader(
let sum = match digest_reader(
&mut options.digest,
&mut file,
options.binary,
options.output_bits,
)
.map_err_context(|| translate!("hashsum-error-failed-to-read-input"))?;
) {
Ok((sum, _)) => sum,
Err(e) => {
eprintln!(
"{}: {}: {}",
options.binary_name,
filename.to_string_lossy(),
strip_errno(&e)
);
err_found = Some(ChecksumError::Io(e));
continue;
}
};

let (escaped_filename, prefix) = escape_filename(filename);
if options.tag {
if options.algoname == "blake2b" {
Expand Down
32 changes: 32 additions & 0 deletions tests/by-util/test_hashsum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,6 +872,38 @@ fn test_check_directory_error() {
.stderr_contains(err_msg);
}

#[test]
#[cfg(not(windows))]
fn test_continue_after_directory_error() {
let scene = TestScenario::new(util_name!());
let at = &scene.fixtures;

at.mkdir("d");
at.touch("file");
at.touch("no_read_perms");
at.set_mode("no_read_perms", 200);

let (out, err_msg) = (
"d41d8cd98f00b204e9800998ecf8427e file\n",
[
"md5sum: d: Is a directory",
"md5sum: dne: No such file or directory",
"md5sum: no_read_perms: Permission denied\n",
]
.join("\n"),
);

scene
.ccmd("md5sum")
.arg("d")
.arg("dne")
.arg("no_read_perms")
.arg("file")
.fails()
.stdout_is(out)
.stderr_is(err_msg);
}

#[test]
fn test_check_quiet() {
let scene = TestScenario::new(util_name!());
Expand Down
Loading