Page MenuHomeFreeBSD

diff: Report I/O errors in Stone algorithm
ClosedPublic

Authored by des on Feb 5 2026, 3:44 PM.
Tags
None
Referenced Files
F164514988: D55125.id171243.diff
Sat, Aug 1, 3:47 PM
Unknown Object (File)
Thu, Jul 30, 5:30 PM
Unknown Object (File)
Thu, Jul 30, 7:22 AM
Unknown Object (File)
Sun, Jul 26, 8:08 AM
Unknown Object (File)
Sat, Jul 25, 2:38 PM
Unknown Object (File)
Sat, Jul 25, 2:31 PM
Unknown Object (File)
Fri, Jul 24, 11:57 PM
Unknown Object (File)
Thu, Jul 23, 3:16 AM
Subscribers

Details

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 requested review of this revision.Feb 5 2026, 3:44 PM
This revision is now accepted and ready to land.Feb 5 2026, 3:47 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.

This revision was automatically updated to reflect the committed changes.