Page MenuHomeFreeBSD
Differential D55125

diff: Report I/O errors in Stone algorithm
ClosedPublic
Actions

Authored by des on Feb 5 2026, 3:44 PM.
Tags
None
Referenced Files
F163160270: D55125.diff
Mon, Jul 20, 3:32 PM
F163083624: D55125.diff
Sun, Jul 19, 10:35 PM
Unknown Object (File)
Thu, Jul 16, 7:54 PM
Unknown Object (File)
Wed, Jul 15, 7:06 AM
Unknown Object (File)
Wed, Jul 15, 7:06 AM
Unknown Object (File)
Sun, Jul 5, 12:40 PM
Unknown Object (File)
Mon, Jun 29, 4:45 PM
Unknown Object (File)
Wed, Jun 24, 8:27 PM
View All 55 Files
Subscribers
imp
olce

Details

Reviewers
thj
Group Reviewers
Klara
Commits
rG3c10ed2ba3aa: diff: Report I/O errors in Stone algorithm
rG641366df41d8: diff: Report I/O errors in Stone algorithm
rG37ceb8794c22: diff: Report I/O errors in Stone algorithm
rGcbd160023586: diff: Report I/O errors in Stone algorithm
rGf8c12e6e3874: diff: Report I/O errors in Stone algorithm
Summary

In the legacy Stone algorithm, we do a first pass over the files to
check if they're identical before we start diffing them. That code
would correctly set the exit status if an I/O error was encountered,
but would not emit an error message. Do so.

PR: 292198
Fixes: 55f160fb07ea ("diff: Print an error message on I/O error")
MFC after: 1 week
Sponsored by: Klara, Inc.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 70432
Build 67315: arc lint + arc unit

Event Timeline

des created this revision.Feb 5 2026, 3:44 PM
Herald added a subscriber: imp. · View Herald TranscriptFeb 5 2026, 3:44 PM
des requested review of this revision.Feb 5 2026, 3:44 PM
Harbormaster completed remote builds in B70432: Diff 171243.Feb 5 2026, 3:44 PM
thj accepted this revision.Feb 5 2026, 3:47 PM
This revision is now accepted and ready to land.Feb 5 2026, 3:47 PM
olce added a subscriber: olce.Feb 5 2026, 4:36 PM
olce added inline comments.
usr.bin/diff/diffreg.c
506–509

Putting the assignments in the if makes things less readable, especially given that i and j are not used in the test nor if blocks.

You might want to rename i and j for better clarity.

Closed by commit rGf8c12e6e3874: diff: Report I/O errors in Stone algorithm (authored by des). · Explain WhyFeb 5 2026, 7:41 PM
This revision was automatically updated to reflect the committed changes.
des added a commit: rGf8c12e6e3874: diff: Report I/O errors in Stone algorithm.
des added a commit: rGcbd160023586: diff: Report I/O errors in Stone algorithm.Feb 10 2026, 3:28 PM
des added a commit: rG37ceb8794c22: diff: Report I/O errors in Stone algorithm.
des added a commit: rG641366df41d8: diff: Report I/O errors in Stone algorithm.
cperciva added a commit: rG3c10ed2ba3aa: diff: Report I/O errors in Stone algorithm.Feb 11 2026, 6:16 AM

Revision Contents
Changeset List

PathSize
usr.bin/
diff/
10 lines

Diff 171243

View Options

usr.bin/diff/diffreg.c

Loading...