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

Authored by des on Feb 5 2026, 3:44 PM.

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 Not Applicable

Unit

Tests Not Applicable

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.