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

Skip to content

cksum: Refactor cksum for incoming merge with hashsum, Fix behavior for --text and --untagged #9024

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

Jump to bottom
Merged
merged 3 commits into from
Oct 26, 2025
Merged

cksum: Refactor cksum for incoming merge with hashsum, Fix behavior for --text and --untagged #9024

merged 3 commits into from
Oct 26, 2025

Conversation

@RenjiSann
Copy link
Collaborator

@RenjiSann RenjiSann commented Oct 25, 2025

This PR fixes a behavior difference when handling --text.

Additionally, it brings a consequential refactor to the cksum function, which is the main "read/checksum/print" loop.
I introduced an OutputFormat type to properly separate all printing strategies, because the previous representation didn't make sense: we had an OutputFormat enum that mixed Raw and Base64/Hexadecimal when Raw if actually an alternative to printing a "tagged" or "untagged" line.

This notably allowed me to remove the #[allow(clippy::cognitive_complexity)] from the function which is good :)

@RenjiSann RenjiSann force-pushed the checksum-updates branch 4 times, most recently from 76ed8a6 to f43d027 Compare October 25, 2025 23:47
@github-actions
Copy link

github-actions bot commented Oct 26, 2025

GNU testsuite comparison:

Skipping an intermittent issue tests/tail/overlay-headers (passes in this run but fails in the 'main' branch)

@github-actions
Copy link

github-actions bot commented Oct 26, 2025

GNU testsuite comparison:

Skipping an intermittent issue tests/tail/overlay-headers (passes in this run but fails in the 'main' branch)

sylvestre
sylvestre reviewed Oct 26, 2025
View reviewed changes
src/uucore/src/lib/features/checksum.rs
InvalidLength,
#[error("--length is only supported with --algorithm=blake2b")]
LengthOnlyForBlake2b,
#[error("the --binary and --text options are meaningless when verifying checksums")]
Copy link
Contributor

@sylvestre sylvestre Oct 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

side note: it should be translated too
i missed it when i used translate!()

Copy link
Contributor

@sylvestre sylvestre Oct 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not in this pr is fine :)

Copy link
Collaborator Author

@RenjiSann RenjiSann Oct 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I plan to do it after getting rid of hashsum

sylvestre
sylvestre reviewed Oct 26, 2025
View reviewed changes
@github-actions
Copy link

github-actions bot commented Oct 26, 2025

GNU testsuite comparison:

Skipping an intermittent issue tests/misc/tee (passes in this run but fails in the 'main' branch)

@sylvestre
Copy link
Contributor

sylvestre commented Oct 26, 2025

please fix


error: unclosed HTML tag `digest`
  --> src/uu/cksum/src/cksum.rs:90:10
   |
90 |     /// '<digest> <flag><filename>'
   |          ^^^^^^^^
   |
   = note: `-D rustdoc::invalid-html-tags` implied by `-D warnings`
   = help: to override `-D warnings` add `#[allow(rustdoc::invalid_html_tags)]`

error: unclosed HTML tag `flag`
  --> src/uu/cksum/src/cksum.rs:90:19
   |
90 |     /// '<digest> <flag><filename>'
   |                   ^^^^^^

error: unclosed HTML tag `filename`
  --> src/uu/cksum/src/cksum.rs:90:25
   |
90 |     /// '<digest> <flag><filename>'
   |                         ^^^^^^^^^^

@github-actions
Copy link

github-actions bot commented Oct 26, 2025

GNU testsuite comparison:

Skipping an intermittent issue tests/misc/tee (passes in this run but fails in the 'main' branch)
Skipping an intermittent issue tests/tail/overlay-headers (passes in this run but fails in the 'main' branch)

@sylvestre sylvestre merged commit 82464a4 into uutils:main Oct 26, 2025
121 checks passed
@RenjiSann RenjiSann deleted the checksum-updates branch October 26, 2025 16:41
@BrewTestBot BrewTestBot mentioned this pull request Nov 10, 2025
Merged
@moonfruit moonfruit mentioned this pull request Nov 10, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sylvestre sylvestre sylvestre left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@RenjiSann @sylvestre