From nobody Thu Feb 5 14:45:44 2026 X-Original-To: dev-commits-src-main@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 4f6KlY32mnz6QdwL for ; Thu, 05 Feb 2026 14:45:45 +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 4f6KlY0GlSz3KL3 for ; Thu, 05 Feb 2026 14:45:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770302745; 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=WxXeLXH3sDVSCQk7n6WC1l6dyRwl/E/ofjqNg/bMN0I=; b=IvDJJoMYZAgI80NoqckctRNeFtQxHmABHyfpW01d+fRZDaUbb+hu+xo0lJ1g9C7aUVtjVu ziWXECxfnSCyOMwr6f/26/hNXL/TeCUBphgbQl5KAVVF1RSa24/f3HAs8XWgqGwrtTg6lf Ta5XfKgXCl1r+KfFDv71Vt70whDpbMcK3i5zekPQzc09KorLQ1SD6oQ/z69zgpnZVkB+KV +Y0j3hAAhWUO8jWDut7Lp147R7HyrA43RGVkVRFw9qf3tyr80HyKIKCcgaAuxXNeyRM0R4 bZCYPrnkH/X+OfXB1QxwEqpP1HIgRSVwUvv9BD4tO3OgLmBtT/9cjH7PwOMcpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770302745; a=rsa-sha256; cv=none; b=HCibKJwauIxL99fUqbcbtLwgPcwjc2sDn8EjGQRDIXdv+db9p0A1eQ6XNmXwCBOMZLg/Ng YOy2P3hLyiGSSFNAIP0CDgYMYKk/YCclNLBO906kBXCr9e2P5Kzrr5vpd5vSXrAG502ugN 2nhK/Q1+rzMDFjynSGLYZEEam0PdtWBf6ViVarl1aCrbbYxtJDxDMns648s+SZUQ58fGIr VDamQluVZx5iR/dMq6mLRcztAfsUu52vsQwsUGpQblCrY/Ic3AXU3z5NI+t2Hx5/ROea3c mNPySFBnY2TnaY6UkNpjDxUruBJrCNYiPo27k/FAsakBid7xI/59HoPaURL6uw== 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=1770302745; 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=WxXeLXH3sDVSCQk7n6WC1l6dyRwl/E/ofjqNg/bMN0I=; b=RjxX+P9impUjIdALkE5FhOWk41J2WS0NTQnaHz+JkkMqT/QqTAftitfpKTEpIf8ZhYp5pm jTQxjHHMWKDei6lDpgJuQWra0bcLWzkYjWhm7g4EAoK/l9YGfziAgtF9q9h135YEDMptMW fxUtXIuAnER+UEDSH3cByp3bhGkXrgYckB6zG/bC8NKKrSe4yRxCrNeE8YVQPuv2ByHcPT ZYReyEX9YkYpmU0cYZ1oUhVbUIslNCIc+CR3vgG9fmMR9h7tXWVz5V/7kTXV1hU5PEYBzd JOutRLWn3y6V8pMr8aIcMyMcV17Nnv8auoSY32oojxFXOR0guRdnmiGUHRrTLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6KlX706Qzb4j for ; Thu, 05 Feb 2026 14:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bf10 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 14:45:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 55f160fb07ea - main - diff: Print an error message on I/O error List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 55f160fb07eaee977c89bdee7bdd83f4d21f5adf Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 14:45:44 +0000 Message-Id: <6984ad18.3bf10.3fef388@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=55f160fb07eaee977c89bdee7bdd83f4d21f5adf commit 55f160fb07eaee977c89bdee7bdd83f4d21f5adf Author: Dag-Erling Smørgrav AuthorDate: 2026-02-05 14:39:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-05 14:39:39 +0000 diff: Print an error message on I/O error If an error occurs while atomizing either file, immediately print an error message using the error code returned by the atomizer, and set the error bit in the exit status. PR: 292198 MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: thj, kevans Differential Revision: https://reviews.freebsd.org/D55109 --- usr.bin/diff/diffreg_new.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/usr.bin/diff/diffreg_new.c b/usr.bin/diff/diffreg_new.c index f29e4ad8b9ed..29882923cd0e 100644 --- a/usr.bin/diff/diffreg_new.c +++ b/usr.bin/diff/diffreg_new.c @@ -158,6 +158,7 @@ diffreg_new(char *file1, char *file2, int flags, int capsicum) const struct diff_config *cfg; enum diffreg_algo algo; cap_rights_t rights_ro; + int ret; algo = DIFFREG_ALGO_MYERS_THEN_MYERS_DIVIDE; @@ -219,12 +220,20 @@ diffreg_new(char *file1, char *file2, int flags, int capsicum) if (flags & D_PROTOTYPE) diff_flags |= DIFF_FLAG_SHOW_PROTOTYPES; - if (diff_atomize_file(&left, cfg, f1, (uint8_t *)str1, st1.st_size, diff_flags)) { + ret = diff_atomize_file(&left, cfg, f1, (uint8_t *)str1, st1.st_size, + diff_flags); + if (ret != DIFF_RC_OK) { + warnc(ret, "%s", file1); rc = D_ERROR; + status |= 2; goto done; } - if (diff_atomize_file(&right, cfg, f2, (uint8_t *)str2, st2.st_size, diff_flags)) { + ret = diff_atomize_file(&right, cfg, f2, (uint8_t *)str2, st2.st_size, + diff_flags); + if (ret != DIFF_RC_OK) { + warnc(ret, "%s", file2); rc = D_ERROR; + status |= 2; goto done; }