From nobody Tue Feb 10 15:27:35 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 4f9QRX1zCGz6RVb2 for ; Tue, 10 Feb 2026 15:27:36 +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 4f9QRX03H1z46Sw for ; Tue, 10 Feb 2026 15:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770737256; 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=ZeO3OtoPcM6eaQ9Qor9XPo+1jXt2xijSy4Ice2gmPDI=; b=vpjVizNJMdDm0G4SNdYWP9VTnIhDK3VSoXMcF97hDGFAOSzEbjtoOuNqGY+eoqyJTftnwK 0ton5bVlDR5ASycp6LIK4M46kF2QT96wkPzk5PzxDGVv8zPzoy9mixZToPp/hSdyn1ni4e a4/RFyqUDO/DTs0byWot8QrwwkKvWdqtK8jshAuUpFyPHdbEXdfuHgTD4c+NoCc/HasiBS 6gDkLnONDgFdOfQN9pNm4z9P1ljNuVN8rVG613WfQ3+ftcnS7T01E/8p9apil64IG1WAMI +GczYr+BnYoVdpUX4uLyBS0gWG0GO/uiSf3fXyn35z2qZDvtkuY1UhFOPYVZKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770737256; a=rsa-sha256; cv=none; b=agylIOuj1VAfneVgB/bDcwp3bDUnDZQakr8TnO98snDsOIdyqFb07hqso5/ioWo30kZ3hJ OK5xR5pxDp/lBYGnw1zklqoxKqp/lit/loSeQN59TyVBsej1u/2o6OzqR0AAM9gFY6b3hD JyjgQlfF5RQs4Oh9+bPwkRP0GnEp9YaWj04tz6jscfzP3VS7TejCfkDEw6gUG4E4c6lkQw L1nU+sGIZxkJD4nXxMRtxx0w49AGPKBgjg5YtbMzV2RXDJpraCRNCPOLMWOCBeh3/nUdQO shajT6Osq1Rly7N8IpCIxOfRCDQOgDAjMHFOoZsMgX4R4adgtP/Lw5FWaPB1YA== 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=1770737256; 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=ZeO3OtoPcM6eaQ9Qor9XPo+1jXt2xijSy4Ice2gmPDI=; b=xvXvOhAP7MqY4aOXa8WQ7fd3aTl5FAN5qLI6vUK6O/UQGyExop8YAiawXlGvl7MJKlnb/X oXZyVJ4i2zuhdpuFVKLZzba087pUHNj6zu34xx1BMNdSyjvGxnn6sSGOMV0Lx5JsxNYZu5 ZKnSgIeQP1PkYr68J0D9Rm/aKQsDsvvEKUOebDM5nfv6tHqcxxbl+eBo2oYnk/LLkza7nJ PP3Hld36JpbCK8oM1KVmLMHPvsxsRmmxie1LziU3QjtkLqG9iFvPDSky97yTBpYFRN61jl a4v0PyL9mWv6bFSBm1GY/ih5Bdw8zbT3sJtfQ2MPKXbIkLD+ON+GI1zittDAWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9QRW69qSz1MRP for ; Tue, 10 Feb 2026 15:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43fee by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 15:27:35 +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: 07f25fa320af - stable/15 - diff: Print an error message on I/O error 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/15 X-Git-Reftype: branch X-Git-Commit: 07f25fa320af9dfd452c740127e941d4328ba6d8 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 15:27:35 +0000 Message-Id: <698b4e67.43fee.7765ce0e@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=07f25fa320af9dfd452c740127e941d4328ba6d8 commit 07f25fa320af9dfd452c740127e941d4328ba6d8 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-05 14:39:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-10 14:24:08 +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 (cherry picked from commit 55f160fb07eaee977c89bdee7bdd83f4d21f5adf) --- 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; }