Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 10 Feb 2026 15:27:35 +0000
From:      Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav <des@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 07f25fa320af - stable/15 - diff: Print an error message on I/O error
Message-ID:  <698b4e67.43fee.7765ce0e@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

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 <des@FreeBSD.org>
AuthorDate: 2026-02-05 14:39:39 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
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;
 	}
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?698b4e67.43fee.7765ce0e>