From nobody Tue Feb 10 15:27:55 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f9QRw5JL9z6RVWV for ; Tue, 10 Feb 2026 15:27:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9QRv65Ppz46sP for ; Tue, 10 Feb 2026 15:27:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770737275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fJPxSesYYaqeJTcHU4wq4vz9AYEe9oOUZITO42rCYis=; b=uLDIBObRKGsXsLVD5CoC53rAPmAFGYwF7eaXmvKZtGcWhBFs+15uEqpq09sKONPswRKmFH anmg+yUvT5OAa5olL4gHXxc2i658D+ihToPQLfyZClhua9uPOR6BWoIKM4WtBkLwLgfpJC 1EwXuuYBxWBenOWS79s1dCJSkHKXkt2A1pQu2exGpFu2r6WTpTKGh0TeO/HCDN14bb8CTB uQ599pXzBwwWiAEOH4MXy2He8hsVVDHlpWYywCBxMSKviOQaIBQ2rfOTlEonJGrBn9pDsW scgnINVW/laVPjsfKtBwyHJ4SXjQk7fNGWS4+AgpLqdX4EXsS577Lk4rQaBZAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770737275; a=rsa-sha256; cv=none; b=K5S8Ey+aLQy2khy/CoPaRkygQBiHrXYeOfDQO2YZvym0DwZduFTgFh5OqJ6dQokLAItw85 nV88oyjZs9VU3coBV3avDLEknt6PyMWC9tHBc/AF8K20FZYWDR2TAt1DbvFm3u2a1AG01G O9AvuYIM6xRdf2RfZ07i0cK015UUcaVQKuTBgCUA8uRkEmgLlvoVIYO1QRBkLWHf6VYqnH XGU7ZaYXe4Oc+QU8AHXWDMUxAe3xUfJzO6/Mohp8yzZPPGJv2HYyaRIcljFmnpgpWf11Qo buHFdMi6lfMWE5wtt0vmFfNVjj9tICOlGxWOeRTk6iGsLnAmT+uyYvsSz09BUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770737275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fJPxSesYYaqeJTcHU4wq4vz9AYEe9oOUZITO42rCYis=; b=C9+rFd6ABWIY2ZVAoQqWcjJsFEwsRu9GuSk5Fr8n0BKIaYFxc/1VYnlPt76znZxaNFyHro VqsTgTu09glTALEPwI1672IoCeKXhOpQ+iRtdTLpZfOETHihmfEXhw5h878WShfcD8Oi0D WcFupg5fU2rRVK8HPLsB8l6M5iGQlsg/xI9Ved6751O/Ck9kP02FUe3z4qi9puW9vuB/nd 1lo5QtB2s5nOHnBC1VPqLrB/fg141iseSGQDVTNWHmBLQle+YnUqmlj7O4Ob5rb9e51fcT frEEzNZKWJdLZHYrLRyb0KdLIXQBbgHTwvjW+KkmYW4SJQITUt1DI5gsKQtElQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9QRv5QY1z1NTr for ; Tue, 10 Feb 2026 15:27:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44d40 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 15:27:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 37ceb8794c22 - stable/14 - diff: Report I/O errors in Stone algorithm List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 37ceb8794c22d88a41e261d23d347bc7ac08b2c8 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 15:27:55 +0000 Message-Id: <698b4e7b.44d40.326bdc07@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=37ceb8794c22d88a41e261d23d347bc7ac08b2c8 commit 37ceb8794c22d88a41e261d23d347bc7ac08b2c8 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-05 17:41:56 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-10 14:24:20 +0000 diff: Report I/O errors in Stone algorithm 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 MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: thj Differential Revision: https://reviews.freebsd.org/D55125 (cherry picked from commit f8c12e6e3874cdd353fb16785da6f4e7eb134cd9) --- usr.bin/diff/diffreg.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c index 954e0542b576..6ade8bfb8237 100644 --- a/usr.bin/diff/diffreg.c +++ b/usr.bin/diff/diffreg.c @@ -381,6 +381,10 @@ diffreg(char *file1, char *file2, int flags, int capsicum) break; default: /* error */ + if (ferror(f1)) + warn("%s", file1); + if (ferror(f2)) + warn("%s", file2); rval = D_ERROR; status |= 2; goto closem; @@ -474,9 +478,9 @@ files_differ(FILE *f1, FILE *f2, int flags) return (0); for (;;) { - i = fread(buf1, 1, sizeof(buf1), f1); - j = fread(buf2, 1, sizeof(buf2), f2); - if ((!i && ferror(f1)) || (!j && ferror(f2))) + if ((i = fread(buf1, 1, sizeof(buf1), f1)) == 0 && ferror(f1)) + return (-1); + if ((j = fread(buf2, 1, sizeof(buf2), f2)) == 0 && ferror(f2)) return (-1); if (i != j) return (1);