From MAILER-DAEMON Sun Feb 02 20:39:16 2025
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1telQa-0000ll-Jo
	for mharc-bug-diffutils@gnu.org; Sun, 02 Feb 2025 20:39:10 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1telQV-0000in-So
 for bug-diffutils@gnu.org; Sun, 02 Feb 2025 20:39:05 -0500
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1telQU-0008DD-57
 for bug-diffutils@gnu.org; Sun, 02 Feb 2025 20:39:03 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=Date:From:MIME-Version:To:Subject;
 bh=nknpKaKbs2XS6t/s6vDy4d5NP/FTjT1BADGzswC/bVI=; 
 b=Xv5WmQlsaKzFh5w2y0JBQVTQoqrrkkGB8P64k7kvfdph4sgekOhREZIy1M6YPt8drLEbxPF/oimFjIokmslgarHAqU4Z5JFvKRN4ngof7Mv995PtUBn1sWnBRhhsFRzuw3ux7+l8YeNqjYRkmuNENNaqJLpLgzexRahbIFmXUD7dKnQdcr4idW+BcP2nQUGfCBlsT0U7odmCNq3BdwFkddZQUmx35ivPG4PBo9Wr4Bq5XycosCz3mEL5Aox6uSZcIF4w6nSSE2jIayxxwri9OqYWOtljWxyhQO+46Ts+odtBYPGwRH5ya43aJ8TDQSwuxLsdaG5eZzsYfIwwR+iiAQ==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1telQT-0005f8-Vt
 for bug-diffutils@gnu.org; Sun, 02 Feb 2025 20:39:02 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Jim Meyering <jim@meyering.net>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Mon, 03 Feb 2025 01:39:01 +0000
Resent-Message-ID: <handler.76020.B.173854671321714@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 76020
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: patch
To: 76020@debbugs.gnu.org
X-Debbugs-Original-To: bug-diffutils@gnu.org
Received: via spool by submit@debbugs.gnu.org id=B.173854671321714
 (code B ref -1); Mon, 03 Feb 2025 01:39:01 +0000
Received: (at submit) by debbugs.gnu.org; 3 Feb 2025 01:38:33 +0000
Received: from localhost ([127.0.0.1]:36923 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1telQ1-0005eA-9H
 for submit@debbugs.gnu.org; Sun, 02 Feb 2025 20:38:33 -0500
Received: from lists.gnu.org ([2001:470:142::17]:43098)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <meyering@gmail.com>)
 id 1telPy-0005dn-68
 for submit@debbugs.gnu.org; Sun, 02 Feb 2025 20:38:30 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <meyering@gmail.com>)
 id 1telPn-0000g3-QP
 for bug-diffutils@gnu.org; Sun, 02 Feb 2025 20:38:20 -0500
Received: from mail-pl1-f169.google.com ([209.85.214.169])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <meyering@gmail.com>)
 id 1telPl-0007u8-HF
 for bug-diffutils@gnu.org; Sun, 02 Feb 2025 20:38:19 -0500
Received: by mail-pl1-f169.google.com with SMTP id
 d9443c01a7336-21619108a6bso62610365ad.3
 for <bug-diffutils@gnu.org>; Sun, 02 Feb 2025 17:38:16 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1738546693; x=1739151493;
 h=to:subject:message-id:date:from:mime-version:x-gm-message-state
 :from:to:cc:subject:date:message-id:reply-to;
 bh=nknpKaKbs2XS6t/s6vDy4d5NP/FTjT1BADGzswC/bVI=;
 b=PKcN67bpyKua0Ng9fAGN6Cu7l0/bz2IXQZAimMT4esROVx5g3gWrPvsJRyyTdwfXaS
 Q1QhqfjoWZWmmD2knfYuepZqP+HT9w6l9el9RAuzOV5Pa4HP/TVfqMheRBUJJgF6agCJ
 hm6LJI4vD1HIm96S4kT57VhKdUXQitbM/aoUo5CHAVsO8L7kSxbD7e4Zj7u4adgR3Smz
 Z3JYHaITu3/aUTLgv97MUQ5+o8z28V1RuJPppiaqxNP3KcbE4NXV/ZKjLZh4bAR61cdi
 XZYkBy22K+Qe+Cl63Ij7NUqepw3FdMv0LGJrz5fUr6VTL9V1T8MFl/pB0JhizxSpz45C
 mAsw==
X-Gm-Message-State: AOJu0YwaAETf//E0UfWMR7jjowS/AzySZXCfSJogYkHlqfpbWND3hZ7M
 jLvTTKnztYpkzn2HDdqMDgWVK/kFcvN9aPGyP6zVJzH1Qe6BMKTSRcUPIWZAUUEghkmVye90Vlf
 Cz2zBNJhVs4vDZFyUX96uJtHlxGqxGJAMe7Y=
X-Gm-Gg: ASbGnctIoik9LlIAYsPkbHyHlxu7Q0TAi999ot4lyxFtmOgv22XrCah75RgrnE48/nR
 tNdZN3DvdkzV8hY6b3VJgdwTCPmCWNHu8YD7WhJSg7q2IPhYwbTqpWsJeJ/uf35erVvOXUsuZtA
 /Z36y7ylSrKNLcaHZtSncq7et+
X-Google-Smtp-Source: AGHT+IEhYRFaeY2jDOH5VnRADPsQ4HFdHm9TuZujUBYvBa22hyjYEzgG+jP0ilE50hrchtf+NPbdgLWdmen0WUk+mDo=
X-Received: by 2002:a17:902:d542:b0:216:2b14:b625 with SMTP id
 d9443c01a7336-21dd7d7f818mr329107125ad.31.1738546693576; Sun, 02 Feb 2025
 17:38:13 -0800 (PST)
MIME-Version: 1.0
From: Jim Meyering <jim@meyering.net>
Date: Sun, 2 Feb 2025 17:38:01 -0800
X-Gm-Features: AWEUYZlLNoTUzRmhWqs_w-wq806n3n80DkSHafVMwEEZXbGYXzesKKi9WbpFHJA
Message-ID: <CA+8g5KHdg=efNKqNJE5cZ=_bZ-8XHrwmNcqLVbNx4icDnLC24Q@mail.gmail.com>
Content-Type: text/plain; charset="UTF-8"
Received-SPF: pass client-ip=209.85.214.169; envelope-from=meyering@gmail.com; 
 helo=mail-pl1-f169.google.com
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9,
 FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001,
 HEADER_FROM_DIFFERENT_DOMAINS=0.066, RCVD_IN_DNSWL_NONE=-0.0001,
 RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01,
 RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,
 SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.0 (+)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: 0.0 (/)
Subject: [bug-diffutils] bug#76020: FYI: [PATCH] maint: once again
 distribute .tar.gz files
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Feb 2025 01:39:05 -0000

I've just pushed this:

maint: once again distribute .tar.gz files
* configure.ac: Reenable distribution of gzip-compressed tarballs,
to help reduce the size of the Guix seed, as discussed at
https://lists.gnu.org/r/coreutils/2020-02/msg00042.html and
https://lists.gnu.org/r/sed-devel/2020-01/msg00013.html
* NEWS (Release): Mention this.
Requested by Nicolas Boos




From MAILER-DAEMON Mon Feb 03 15:17:13 2025
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1tf2sX-0004X6-Dq
	for mharc-bug-diffutils@gnu.org; Mon, 03 Feb 2025 15:17:11 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tf2sS-0004V0-0M
 for bug-diffutils@gnu.org; Mon, 03 Feb 2025 15:17:05 -0500
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tf2sR-0005G4-ND
 for bug-diffutils@gnu.org; Mon, 03 Feb 2025 15:17:03 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=From:MIME-Version:Date:To:Subject;
 bh=EG9EdD2WS2e3eOveUcS4fBmygLDxMM5WroJsOnJ40gM=; 
 b=LEzk2qS93qa0JO32ybzUNht4lEQt6Z5X4BO3vH4xVWNKc0ogeWKUprbQc8WU/1Xp9ECNgy2Y9ofD3x1TjibAsWaE75srssvKec815A2D/tpaaeFm+oaXw+QdFTPWIoAl6V6N2FoOsoc3zdAjlakosncfZiF72epAfmR9/FW7BJqBkprCmua4cpjP3gzhARuWJ4KMgQMIsvhDa1svOZ+59PJ9QJbt1o7JT7xdqiPydNodpOWKE3hvs35Y0HFfci9AYkrJI8l68z5YF6F68rdiEasN1BUFGkZojRimhi2bCmtm0gFRbQ4ezQuHbe8E7Pp2OYK0uaE5GuetIOdd4ybtkg==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tf2sQ-00069z-Un
 for bug-diffutils@gnu.org; Mon, 03 Feb 2025 15:17:03 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Santiago Vila <sanvila@debian.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Mon, 03 Feb 2025 20:17:02 +0000
Resent-Message-ID: <handler.76034.B.173861376723592@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 76034
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 76034@debbugs.gnu.org
X-Debbugs-Original-To: bug-diffutils@gnu.org
Received: via spool by submit@debbugs.gnu.org id=B.173861376723592
 (code B ref -1); Mon, 03 Feb 2025 20:17:02 +0000
Received: (at submit) by debbugs.gnu.org; 3 Feb 2025 20:16:07 +0000
Received: from localhost ([127.0.0.1]:41414 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tf2rX-00068S-Bh
 for submit@debbugs.gnu.org; Mon, 03 Feb 2025 15:16:07 -0500
Received: from lists.gnu.org ([2001:470:142::17]:54130)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <sanvila@debian.org>)
 id 1tf2rQ-00067h-0R
 for submit@debbugs.gnu.org; Mon, 03 Feb 2025 15:16:04 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <sanvila@debian.org>)
 id 1tf2r9-0003ba-Hb
 for bug-diffutils@gnu.org; Mon, 03 Feb 2025 15:15:51 -0500
Received: from stravinsky.debian.org ([2001:41b8:202:deb::311:108])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <sanvila@debian.org>)
 id 1tf2r7-000553-Sh
 for bug-diffutils@gnu.org; Mon, 03 Feb 2025 15:15:43 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debian.org; 
 s=smtpauto.stravinsky;
 h=X-Debian-User:Content-Transfer-Encoding:Content-Type
 :Subject:From:To:MIME-Version:Date:Message-ID:Reply-To:Cc:Content-ID:
 Content-Description:In-Reply-To:References;
 bh=EG9EdD2WS2e3eOveUcS4fBmygLDxMM5WroJsOnJ40gM=; b=itpDN3PzkImDNKltNyx3IbzaJ5
 cHANjNo5/StjJENhfUNqs4563VsTbLdOpP+zPKs6IDXrxVs4OglIqOkjUkOYvlV/bjVRq6yT+1AsR
 IyGuTcM8MqFr8vfCTR7gC/Uyt4HQgQn+R4PoS+Cp+yVA60aCnD+7k+hcO0DJ6kFLMNbg6hVrWrE8x
 +VlgE7XgYZQ/ZqRQKO8Rk1J+gDUApnpdgSW5H0/xNdPXiRwmX6Gm1YdxZFQIUlCMVpuJrppOBqbjH
 Z2xcC4up4Ny39gJ2qsBSO7dvVKnAAFret9NUXf4BZAcCUXCyjLliiAxNDQOpZqIlG1/4lXVsNrHFm
 zfOeYr/w==;
Received: from authenticated user by stravinsky.debian.org with esmtpsa
 (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_128_GCM:128)
 (Exim 4.94.2) (envelope-from <sanvila@debian.org>)
 id 1tf2r0-000U68-Sb
 for bug-diffutils@gnu.org; Mon, 03 Feb 2025 20:15:35 +0000
Message-ID: <8c8b357c-6937-46e8-a9c0-1ac30ce74826@debian.org>
Date: Mon, 3 Feb 2025 21:15:33 +0100
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Content-Language: en-US
From: Santiago Vila <sanvila@debian.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Debian-User: sanvila
Received-SPF: none client-ip=2001:41b8:202:deb::311:108;
 envelope-from=sanvila@debian.org; helo=stravinsky.debian.org
X-Spam_score_int: -43
X-Spam_score: -4.4
X-Spam_bar: ----
X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001,
 DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
 RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_NONE=0.001,
 UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Subject: [bug-diffutils] bug#76034: Status of gnulib-l10n in diffutils
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Feb 2025 20:17:07 -0000

Hello.

After gettext decided to rely on a new package called gnulib-l10n
for the gnulib translations, I believed that diffutils would be next,
but the NEWS file for 3.11 does not say anything about it.

So: Will diffutils really do the same at some point?

Thanks.




From MAILER-DAEMON Mon Feb 03 15:30:06 2025
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1tf354-0007jy-Fj
	for mharc-bug-diffutils@gnu.org; Mon, 03 Feb 2025 15:30:06 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tf352-0007jn-QD
 for bug-diffutils@gnu.org; Mon, 03 Feb 2025 15:30:05 -0500
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tf352-0006xo-4o
 for bug-diffutils@gnu.org; Mon, 03 Feb 2025 15:30:04 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=In-Reply-To:From:References:MIME-Version:Date:To:Subject;
 bh=oXxuErnqEdk/PyYXeWgDM5DMprA3WVNuP5UkN2lj1/U=; 
 b=fmZCIQRQjYrorAPSSrr/XneJtfLbtAm+GapadDXxIi4+0HI0TDkmpis+KIMRFY7qL04pnM3ELEYedDlGMrXX23BW8OxD8mAh0ghUqIHaoEYeTgkbxT4g1297wIbs7tnglkGF5SEd9TpRIhnlJ7brEr6pobtM3LMjZTZAI3X+Fscn8TaMdBcTy0i8RGgAZBABzquazlby47FtdHsCHps+3eso+iyzf3XYwxrUthzWqkuTCRfd6DO5/PmJ/IEqyvtk3hw3uii8/5Sn0+ZZqGBBbQznMqsbAiPuUyN/aGXqRgbOfLrKmuHXFdecX6FgrgWGY3nyIVCWtAaC2GsjdsGoEg==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tf351-0006k0-LF
 for bug-diffutils@gnu.org; Mon, 03 Feb 2025 15:30:03 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Paul Eggert <eggert@cs.ucla.edu>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Mon, 03 Feb 2025 20:30:03 +0000
Resent-Message-ID: <handler.76034.B76034.173861460225896@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 76034
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Santiago Vila <sanvila@debian.org>, 76034@debbugs.gnu.org
Received: via spool by 76034-submit@debbugs.gnu.org id=B76034.173861460225896
 (code B ref 76034); Mon, 03 Feb 2025 20:30:03 +0000
Received: (at 76034) by debbugs.gnu.org; 3 Feb 2025 20:30:02 +0000
Received: from localhost ([127.0.0.1]:41455 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tf34z-0006jL-Ar
 for submit@debbugs.gnu.org; Mon, 03 Feb 2025 15:30:01 -0500
Received: from mail.cs.ucla.edu ([131.179.128.66]:42234)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <eggert@cs.ucla.edu>)
 id 1tf34v-0006j3-LY
 for 76034@debbugs.gnu.org; Mon, 03 Feb 2025 15:29:58 -0500
Received: from localhost (localhost [127.0.0.1])
 by mail.cs.ucla.edu (Postfix) with ESMTP id F11983C00516F;
 Mon,  3 Feb 2025 12:29:50 -0800 (PST)
Received: from mail.cs.ucla.edu ([127.0.0.1])
 by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10032) with ESMTP
 id 6xbfEg3Qayqf; Mon,  3 Feb 2025 12:29:50 -0800 (PST)
Received: from localhost (localhost [127.0.0.1])
 by mail.cs.ucla.edu (Postfix) with ESMTP id B02AC3C005173;
 Mon,  3 Feb 2025 12:29:50 -0800 (PST)
DKIM-Filter: OpenDKIM Filter v2.10.3 mail.cs.ucla.edu B02AC3C005173
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.ucla.edu;
 s=9D0B346E-2AEB-11ED-9476-E14B719DCE6C; t=1738614590;
 bh=oXxuErnqEdk/PyYXeWgDM5DMprA3WVNuP5UkN2lj1/U=;
 h=Message-ID:Date:MIME-Version:To:From;
 b=fGx+Oovaac7VmxcBfJTJk09Wq+HUsPA7qiZfUhNFMeMPKrd7mRfL1thiSVB9F5lgI
 dFV0TqfST0JIR0p6VxWcLU7CP/nxAUwEGGDYkxi/jlEnA7JUO0on7frDvfo98uh8xg
 xai0L+zcq/9GddCU9rG/eJQ51xx+9bMnVJSlvphDK9dyfwICyqsWx1LTvTlhxRcMpW
 ikzvauusr7vBxjyqM/A0dYlFM9ZC0jKlvMXpU8+X8XfQ0eCUrOBQJkKtE71bqESQMB
 ho15iE/iLZfx3XQJxmQEcmg6tB7sOYDX1rgY4E+0+vIY204wr4XJ+ZZBwbHM/lI/pR
 IivdZuHld2XsA==
X-Virus-Scanned: amavis at mail.cs.ucla.edu
Received: from mail.cs.ucla.edu ([127.0.0.1])
 by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10026) with ESMTP
 id iyq-FTpQWrau; Mon,  3 Feb 2025 12:29:50 -0800 (PST)
Received: from [131.179.64.200] (Penguin.CS.UCLA.EDU [131.179.64.200])
 by mail.cs.ucla.edu (Postfix) with ESMTPSA id 9A20C3C00516F;
 Mon,  3 Feb 2025 12:29:50 -0800 (PST)
Message-ID: <5eff9339-8f86-4a58-a045-e7ca245ea129@cs.ucla.edu>
Date: Mon, 3 Feb 2025 12:29:49 -0800
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
References: <8c8b357c-6937-46e8-a9c0-1ac30ce74826@debian.org>
Content-Language: en-US
From: Paul Eggert <eggert@cs.ucla.edu>
Autocrypt: addr=eggert@cs.ucla.edu; keydata=
 xsFNBEyAcmQBEADAAyH2xoTu7ppG5D3a8FMZEon74dCvc4+q1XA2J2tBy2pwaTqfhpxxdGA9
 Jj50UJ3PD4bSUEgN8tLZ0san47l5XTAFLi2456ciSl5m8sKaHlGdt9XmAAtmXqeZVIYX/UFS
 96fDzf4xhEmm/y7LbYEPQdUdxu47xA5KhTYp5bltF3WYDz1Ygd7gx07Auwp7iw7eNvnoDTAl
 KAl8KYDZzbDNCQGEbpY3efZIvPdeI+FWQN4W+kghy+P6au6PrIIhYraeua7XDdb2LS1en3Ss
 mE3QjqfRqI/A2ue8JMwsvXe/WK38Ezs6x74iTaqI3AFH6ilAhDqpMnd/msSESNFt76DiO1ZK
 QMr9amVPknjfPmJISqdhgB1DlEdw34sROf6V8mZw0xfqT6PKE46LcFefzs0kbg4GORf8vjG2
 Sf1tk5eU8MBiyN/bZ03bKNjNYMpODDQQwuP84kYLkX2wBxxMAhBxwbDVZudzxDZJ1C2VXujC
 OJVxq2kljBM9ETYuUGqd75AW2LXrLw6+MuIsHFAYAgRr7+KcwDgBAfwhPBYX34nSSiHlmLC+
 KaHLeCLF5ZI2vKm3HEeCTtlOg7xZEONgwzL+fdKo+D6SoC8RRxJKs8a3sVfI4t6CnrQzvJbB
 n6gxdgCu5i29J1QCYrCYvql2UyFPAK+do99/1jOXT4m2836j1wARAQABzSBQYXVsIEVnZ2Vy
 dCA8ZWdnZXJ0QGNzLnVjbGEuZWR1PsLBlQQTAQgAPwIbAwYLCQgHAwIGFQgCCQoLBBYCAwEC
 HgECF4AWIQR+N5Kp2Kz31jO8FYjtl+kOYqp+NAUCZiLOewUJHWQLDAAKCRDtl+kOYqp+NHGE
 D/9Wmbk+cAaQsYLPGBvyzIjZIRzo/V2p3ZwckVA1VEQivx5azu1cs86qDoVIe45AtwmKOvdV
 wTQd/QeglkZR6D2YPW7UR/7emajyJZZcy+etVTDKoaw1i6/hmd/CpGjUeUSvgoPs6nYR+1lo
 pSXTpaGrh1W0qQHalSkOOwCHG3HtGk9Ve2AERDUYxmcn8/eZHb7xpUJEJMBBI1bx/zcw1EtB
 rjsQ1R1faJ/r/7LPAyV36RLvnbX69PylHKQEbJoaY9aUb2Vpm63ni3FeTA7/3jpPvaSRWHJh
 vPYx6Fm2Ln8pI0Yf/W2B8QMiPTnF/LnH2kvUcf9VXm+1mQJ3fBFU25HZwBhuqZ24IeKymPEt
 BUMQAum97Dto0jSgR2OUvX7z+twhpQEgRGBzPHYwDi4SxF5Z4Q5Y7B7a++HP9tIxG6CVFIwI
 4xVaZud18bPa0YBL+cISmMgxq7h7yoVXl6u3pm9Yiv+W6Lp9QGN8Rw1VuJMOoFCYuoxG8mXO
 TA5b1jvlQ32gHFFhqErDAhNJRsfgrpe9Gok4Ycp+rWljbvS5Wrl0uth5MP7FbaHN2kmTZibq
 KXAd//IqczhDyU6qnW6ao+h4iDBDgYgRbQjmToX/vmIdEMzvPGqWXKhe/q1TYMuOO+IfP+bI
 fyPFH29nVN/o9c4J7myeKvv3HKSXdSVjlh2V787BTQRMgHJkARAApoXrvxP3DIfjCNOtXU/P
 dwMShKdX/RlSs5PfunV1wbKP8herXHrvQdFVqECaTSxmlhzbk8X0PkY9gcVaU2O49T3qsOd1
 cHeF52YFGEt0LhsBeMjgNX5uZ1V76r8gyeVlFpWWb0SIwJUBHrDXexF67upeRb2vdHBjYDNe
 ySn+0B7gFEqvVmZu+LadudDp6kQLjatFvHQHUSGNshBnkkcaTbiI9Pst0GCc2aiznBiPPA2W
 QxAPlPRh3OGTsn5THADmbjqY6FEMLasVX8DSCblMvLwNeO/8SxziBidhqLpJCqdQRWHku5Xx
 gIkGeKOz5OLDvXHWJyafrEYjjkS6Ak6B5z6svKliClWnjHQcjlPzyoFFgKTEfcqDxCj4RY0D
 0DgtFD0NfyeOidrSB/SzTe2hwryQE3rpSiqo+0cGdzh4yAHKYJ+UrXZ4p93ZhjGfKD1xlrNY
 DlWyW9PGmbvqFuDmiIAQf9WD/wzEfICc+F+uDDI+uYkRxUFp92ykmdhDEFg1yjYsU8iGU69a
 Hyvhq36z4zctvbqhRNzOWB1bVJ/dIMDvsExGcXQVDIT7sDNXv0wE3jKSKpp7NDG1oXUXL+2+
 SF99Kjy753AbQSAmH617fyBNwhJWvQYg+mUvPpiGOtses9EXUI3lS4v0MEaPG43flEs1UR+1
 rpFQWVHo1y1OO+sAEQEAAcLBfAQYAQgAJgIbDBYhBH43kqnYrPfWM7wViO2X6Q5iqn40BQJm
 Is58BQkdZAsMAAoJEO2X6Q5iqn40Q68QAJ9GubS/ej30Vc4idoZdc0IyMcL7kQJbMohF+Tyn
 ZE+TGn9WvzP10yLyzoI0vNlcNfP92d2MS//pFjOuANb5mwyiEYA+rDZIdS4ZZpHxCs2sxMC4
 afLCf3kv4aMnTeBvb9na403dlczz9cAacvsmniSFdpb1+BzMpYbybglU5oYMGhYT2nnCRjXN
 6S2nKYt4mjJeeOuxHrdeqQQdVBNYeNfTcPePeqvZ2+bD6u9yxZtaV+wxdpqglosQvjqhOYz7
 h50/ZTSq70/npoCq44TzdJKttaYvlW6ziRz0g4RRAqZyoxjYXiy5qj8r8zXJuB11ApZCGuKn
 /usbji9RYbflAhxFeh4LMmpDVi6BrF30b73Md59K7PuEKN1NxzlWiqqQHZZ9momN0GXLPcGq
 4uyfq7yVEy7wP5PMOh6oqscKklE3gFQtq0P1Ki0xqdF6Fq5LPJc+0Db2CYkVIy7Xaa/f74I3
 sOfQfEeDylVXR5iDfUJEYv/0DYhOr7q5/0b1kh3M4wkrB4C5jVNHjIIj+RsAK90c3t38OhAl
 jiSN7Bkwy24Afy8eIu6wWzvhnsQGpZPB+IffmxT1wkTy8UxZKjUWV0C82iphVgCUUi2f9sDV
 Q/tNcwVWmOS+gdv9Wk6tdGeM+Ee+Qs6YG05jcSoajzF0TL07ajLcayRq2j1Os2CtQ8qu
Organization: UCLA Computer Science Department
In-Reply-To: <8c8b357c-6937-46e8-a9c0-1ac30ce74826@debian.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Subject: [bug-diffutils] bug#76034: bug#76034: Status of gnulib-l10n in
 diffutils
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Feb 2025 20:30:05 -0000

On 2/3/25 12:15, Santiago Vila wrote:
> So: Will diffutils really do the same at some point?

I don't see why not. We didn't get around to it for 3.11, though.




From MAILER-DAEMON Mon Feb 03 16:43:05 2025
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1tf4Dh-0001A4-A5
	for mharc-bug-diffutils@gnu.org; Mon, 03 Feb 2025 16:43:05 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tf4De-00012X-F9
 for bug-diffutils@gnu.org; Mon, 03 Feb 2025 16:43:02 -0500
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tf4De-0005fn-2J
 for bug-diffutils@gnu.org; Mon, 03 Feb 2025 16:43:02 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=MIME-Version:Date:References:In-Reply-To:From:To:Subject;
 bh=71b0yP8LJMgSeWPcVb4XAaDk8bBthFomZPfHCtpsY2w=; 
 b=VAR1sxS0S4bT/+TkJYZdn24vAryaznde77a4DCJi5XeFRdp6zoxnmHPXZ7kxom2Kdo1q/WlyxTAx7OnLCWSAmTNKYLwJ75GFLMXX4IbUYa5XN/Tx2sPx08SM0iQGBp6HxtSes0VP6aowSTjFPXRzQDK6VrrqM+vEyyWM3OYnPAGQVjmTs8CX4fGGQEDHzhttSoKeOrnK28WWQ+bKSPoL5gpgJF/rkId2VCniKrAWLWBYvovx6kMQsg/iXhh/8b4WEBf/pS6m94DE37HDnjeEp/5YX7MlLxWbZET7JsK0S2rWnZjMuoJL85WvlINxFBh3Y1QXpoSmHZqe6DXQA1f2JA==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tf4Dd-0001t1-TF
 for bug-diffutils@gnu.org; Mon, 03 Feb 2025 16:43:01 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Simon Josefsson <simon@josefsson.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Mon, 03 Feb 2025 21:43:01 +0000
Resent-Message-ID: <handler.76034.B76034.17386189487196@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 76034
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Paul Eggert <eggert@cs.ucla.edu>
Cc: Santiago Vila <sanvila@debian.org>, 76034@debbugs.gnu.org
Received: via spool by 76034-submit@debbugs.gnu.org id=B76034.17386189487196
 (code B ref 76034); Mon, 03 Feb 2025 21:43:01 +0000
Received: (at 76034) by debbugs.gnu.org; 3 Feb 2025 21:42:28 +0000
Received: from localhost ([127.0.0.1]:41621 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tf4D6-0001s0-2Y
 for submit@debbugs.gnu.org; Mon, 03 Feb 2025 16:42:28 -0500
Received: from uggla.sjd.se ([2001:9b1:8633::107]:38138)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <simon@josefsson.org>)
 id 1tf4D2-0001rm-Oj
 for 76034@debbugs.gnu.org; Mon, 03 Feb 2025 16:42:26 -0500
DKIM-Signature: v=1; a=ed25519-sha256; q=dns/txt; c=relaxed/relaxed;
 d=josefsson.org; s=ed2303; h=Content-Type:MIME-Version:Message-ID:Date:
 References:In-Reply-To:Subject:Cc:To:From:Sender:Reply-To:
 Content-Transfer-Encoding:Content-ID:Content-Description;
 bh=71b0yP8LJMgSeWPcVb4XAaDk8bBthFomZPfHCtpsY2w=; t=1738618942; x=1739828542; 
 b=KWiRSUL2bV04RbuGjDjSVDYIKLpPNcEOZmGpb1ZkB4wHD3YPgMtFOBZEBiHCUZJEK52WS1Ddus9
 Lwi3Bi3NcDA==;
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=josefsson.org; s=rsa2303; h=Content-Type:MIME-Version:Message-ID:Date:
 References:In-Reply-To:Subject:Cc:To:From:Sender:Reply-To:
 Content-Transfer-Encoding:Content-ID:Content-Description;
 bh=71b0yP8LJMgSeWPcVb4XAaDk8bBthFomZPfHCtpsY2w=; t=1738618942; x=1739828542; 
 b=wzgP8M2x8Z/v3afHuOncbQK2vPQ2KSqIR5hsFNVXd1l5dob16d9EAyZvqTvoVt/dSfSPCYk/ePQ
 kOAlN5g1D9IRSDD1vW8qSh5pknJyFG3hMMSfQR0L4mmTbCZUSJUePLLQAiOfmq6LhvpeHwXDNGai5
 4lOPfV8Q9ZoKrn5Dwte0Sfcz5zcDGqXt52OiFvAYObjooRaBVQPzvnWDA0x2WDjMidK0mVzqsUUfy
 svABb9SbLMq2Zqe6PMO65uhelXQ1WDuCZQ8YWh/MvCSZFD4OV+DDigektIWUEDo69xuJtMmLcnwb6
 WbMui8ABy4yMT+IWOOeOG6UKaXzpr/hzJEYTBO8OSSPS/8vCcqjR1QqVQ8wK2P0MaUpCF2Ro6o3cM
 /ghiceIUqVa4HAIxgM27q3iPUVmwnbr4yUXpmg9D/bq2ghwNMOE9thAjouzpHdKQ3sQoHaSj/;
Received: from h-178-174-130-130.a498.priv.bahnhof.se ([178.174.130.130]:54046
 helo=kaka) by uggla.sjd.se with esmtpsa (TLS1.3) tls
 TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95)
 (envelope-from <simon@josefsson.org>) id 1tf4Cw-006At9-Dh;
 Mon, 03 Feb 2025 21:42:18 +0000
From: Simon Josefsson <simon@josefsson.org>
In-Reply-To: <5eff9339-8f86-4a58-a045-e7ca245ea129@cs.ucla.edu> (Paul Eggert's
 message of "Mon, 3 Feb 2025 12:29:49 -0800")
References: <8c8b357c-6937-46e8-a9c0-1ac30ce74826@debian.org>
 <5eff9339-8f86-4a58-a045-e7ca245ea129@cs.ucla.edu>
OpenPGP: id=B1D2BD1375BECB784CF4F8C4D73CF638C53C06BE;
 url=https://josefsson.org/key-20190320.txt
X-Hashcash: 1:23:250203:eggert@cs.ucla.edu::Pd5+5EYLe5Tw6x64:RUtp
X-Hashcash: 1:23:250203:sanvila@debian.org::ljGVb/DWOyIblgkA:UWW7
X-Hashcash: 1:23:250203:76034@debbugs.gnu.org::65P/2+zM5ZXFtRMe:06nUh
Date: Mon, 03 Feb 2025 22:42:12 +0100
Message-ID: <878qqmr9hn.fsf@josefsson.org>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="==-=-=";
 micalg=pgp-sha256; protocol="application/pgp-signature"
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Subject: [bug-diffutils] bug#76034: bug#76034: Status of gnulib-l10n in
 diffutils
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Feb 2025 21:43:03 -0000

--==-=-=
Content-Type: multipart/mixed; boundary="=-=-="

--=-=-=
Content-Type: text/plain

Paul Eggert <eggert@cs.ucla.edu> writes:

> On 2/3/25 12:15, Santiago Vila wrote:
>> So: Will diffutils really do the same at some point?
>
> I don't see why not. We didn't get around to it for 3.11, though.

Something like this perhaps?

/Simon

--=-=-=
Content-Type: text/x-diff
Content-Disposition: inline;
 filename=0001-cmp-diff-diff3-sdiff-Support-gnulib-l10n.patch
Content-Transfer-Encoding: quoted-printable

From=20280f6a66819e6e2738498a6f37e09a50058cd9f0 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
Date: Mon, 3 Feb 2025 22:40:16 +0100
Subject: [PATCH] cmp, diff, diff3, sdiff: Support gnulib-l10n.

* src/cmp.c (main): Call bindtextdomain for gnulib-l10n.
src/diff.c (main): Likewise.
src/diff3.c (main): Likewise.
src/sdiff.c (main: Likewise.
=2D--
 src/cmp.c   | 1 +
 src/diff.c  | 1 +
 src/diff3.c | 1 +
 src/sdiff.c | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/cmp.c b/src/cmp.c
index 26067d9..2482708 100644
=2D-- a/src/cmp.c
+++ b/src/cmp.c
@@ -208,6 +208,7 @@ main (int argc, char **argv)
   set_program_name (argv[0]);
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
+  bindtextdomain ("gnulib", GNULIB_LOCALEDIR);
   textdomain (PACKAGE);
   c_stack_action (nullptr);
   xstdopen ();
diff --git a/src/diff.c b/src/diff.c
index c465d40..fa6100e 100644
=2D-- a/src/diff.c
+++ b/src/diff.c
@@ -303,6 +303,7 @@ main (int argc, char **argv)
   set_program_name (argv[0]);
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
+  bindtextdomain ("gnulib", GNULIB_LOCALEDIR);
   textdomain (PACKAGE);
   c_stack_action (nullptr);
   function_regexp_list.buf =3D &function_regexp;
diff --git a/src/diff3.c b/src/diff3.c
index 1b935f8..fa5f5a6 100644
=2D-- a/src/diff3.c
+++ b/src/diff3.c
@@ -233,6 +233,7 @@ main (int argc, char **argv)
   set_program_name (argv[0]);
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
+  bindtextdomain ("gnulib", GNULIB_LOCALEDIR);
   textdomain (PACKAGE);
   c_stack_action (nullptr);
   xstdopen ();
diff --git a/src/sdiff.c b/src/sdiff.c
index 07b4510..7734a82 100644
=2D-- a/src/sdiff.c
+++ b/src/sdiff.c
@@ -449,6 +449,7 @@ main (int argc, char *argv[])
   set_program_name (argv[0]);
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
+  bindtextdomain ("gnulib", GNULIB_LOCALEDIR);
   textdomain (PACKAGE);
   c_stack_action (cleanup);
   xstdopen ();
=2D-=20
2.48.1


--=-=-=--

--==-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQNoBAEWCAMQFiEEo8ychwudMQq61M8vUXIrCP5HRaIFAmehODUUHHNpbW9uQGpv
c2Vmc3Nvbi5vcmfCHCYAmDMEXJLOtBYJKwYBBAHaRw8BAQdACIcrZIvhrxDBkK9f
V+QlTmXxo2naObDuGtw58YaxlOu0JVNpbW9uIEpvc2Vmc3NvbiA8c2ltb25Aam9z
ZWZzc29uLm9yZz6IlgQTFggAPgIbAwULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgBYh
BLHSvRN1vst4TPT4xNc89jjFPAa+BQJl/YgIBQkLehFUAAoJENc89jjFPAa+CboA
+wUa06RD5e5VTCxvSWtPS75Wq2qBeYGZnf0jvUMxa2n4AP4xkUeAPPnNuMsTm2fs
FCDIGaEM2Yn6Vb2huzzT1Fw/BLgzBFySz4EWCSsGAQQB2kcPAQEHQOxTCIOaeXAx
I2hIX4HK9bQTpNVei708oNr1Klm8qCGKiPUEGBYIACYCGwIWIQSx0r0Tdb7LeEz0
+MTXPPY4xTwGvgUCZf2IKwUJC3oQqgCBdiAEGRYIAB0WIQSjzJyHC50xCrrUzy9R
cisI/kdFogUCXJLPgQAKCRBRcisI/kdFoqdMAQCgH45aseZgIrwKOvUOA9QfsmeE
8GZHYNuFHmM9FEQS6AD6A4x5aYvoY6lo98pgtw2HPDhmcCXFItjXCrV4A0GmJA4J
ENc89jjFPAa+GcYA/26YQY05bLtnXiIjTiAzrGQrRXxTHPA8Av7TDFHvIetWAP9s
HSoU8OfTwmTiEnGwLlsV7QJclZg3YNz/Ypcp9TqQBrg4BFySz2oSCisGAQQBl1UB
BQEBB0AxlRumDW6nZY7A+VCfek9VpEx6PJmdJyYPt3lNHMd6HAMBCAeIfgQYFggA
JgIbDBYhBLHSvRN1vst4TPT4xNc89jjFPAa+BQJl/YgwBQkLehDGAAoJENc89jjF
PAa+phoA/jrDqIrl/55vUMBhIQv+TP635d2iCTEnyFmbUcP9+gh6APoDsXalVd2c
OGxQtSC+TF8PkZMn1TLkJKAjVxr+xx40AgAKCRBRcisI/kdFomU+AQCnU+EyzE3H
gElzS/ecyA8aw51tplkNM4VKBIn0Ei0YgAEAt/DO9Lq0qauc3uz+WwnMpAn7UoBH
g9ljtlsRJjWe5Qs=
=5PGf
-----END PGP SIGNATURE-----
--==-=-=--




From MAILER-DAEMON Sat Feb 08 22:28:03 2025
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1tgxzH-0005Ef-LI
	for mharc-bug-diffutils@gnu.org; Sat, 08 Feb 2025 22:28:03 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tgxzG-0005EN-FE
 for bug-diffutils@gnu.org; Sat, 08 Feb 2025 22:28:02 -0500
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tgxzG-0000Ix-4h
 for bug-diffutils@gnu.org; Sat, 08 Feb 2025 22:28:02 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=Date:From:In-Reply-To:References:MIME-Version:To:Subject;
 bh=I5BeRYwDmQ5Pl3RYAjq5dSCmrK91189+rPQfk5i/Yxc=; 
 b=uizo5V8nNr6atrJAVQMiKf3GprPpgjKe8yRBIsYAsPy+a0yPKXvsxpHZAKy5l3G1JOuGA8QtuEGCz6u7V0lL0U6WMr/YeZuUcRRoxY9TE2kiRxtiTXcIGtNI+xOVl9KVnEtb8xL9lkt8H1ZCeULCg1zdYNqSZEqB+OawPqo12M7BUR3HmS77LH0HARm9UNXfGNRg6G9Lr1laUOOlVQEGVBWjwgmhA7bBFj3uTabr/CvVqdvRcym4cnwc6NMCixRWFeKFhy75CrreTUF320rEVnPkLJfSoSGkK5DkDh1wb1WK6uzFsW+M4Ktx4WHWl6ZepZj+PZ/fgHLfm+URPPlqXg==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tgxzF-0006KI-W2
 for bug-diffutils@gnu.org; Sat, 08 Feb 2025 22:28:01 -0500
Resent-From: Jim Meyering <jim@meyering.net>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-To: bug-diffutils@gnu.org
Resent-Date: Sun, 09 Feb 2025 03:28:01 +0000
Resent-Message-ID: <handler.76034.D76034.173907164724249.done@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: cc-closed 76034
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Simon Josefsson <simon@josefsson.org>
Cc: Santiago Vila <sanvila@debian.org>, Paul Eggert <eggert@cs.ucla.edu>,
 76034-done@debbugs.gnu.org
Mail-Followup-To: 76034@debbugs.gnu.org, jim@meyering.net, sanvila@debian.org
Received: via spool by 76034-done@debbugs.gnu.org id=D76034.173907164724249
 (code D ref 76034); Sun, 09 Feb 2025 03:28:01 +0000
Received: (at 76034-done) by debbugs.gnu.org; 9 Feb 2025 03:27:27 +0000
Received: from localhost ([127.0.0.1]:42470 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tgxyh-0006J3-8F
 for submit@debbugs.gnu.org; Sat, 08 Feb 2025 22:27:27 -0500
Received: from mail-pl1-f170.google.com ([209.85.214.170]:53416)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.84_2) (envelope-from <meyering@gmail.com>)
 id 1tgxyd-0006Im-Tq
 for 76034-done@debbugs.gnu.org; Sat, 08 Feb 2025 22:27:25 -0500
Received: by mail-pl1-f170.google.com with SMTP id
 d9443c01a7336-21f55fbb72bso31039035ad.2
 for <76034-done@debbugs.gnu.org>; Sat, 08 Feb 2025 19:27:23 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1739071638; x=1739676438;
 h=content-transfer-encoding:cc:to:subject:message-id:date:from
 :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=I5BeRYwDmQ5Pl3RYAjq5dSCmrK91189+rPQfk5i/Yxc=;
 b=ww6NlcEsdgQhcirtp4am37d76vPFlMi6jERwx3kcZhyxlnt6Cc/kfk54MVKbdBr1Uf
 TysGg1phAHsVlHN+Ige4YRJF755Jg+DuAMcSQZikasvB3XcBFl/CqNdsl7vBEhtq4P0O
 oZrEXzUxrIlk8QInaOCFwZxnul6tc0038igqlVv3Vojni/4+xkdItjNulZiPtYD8YClR
 6F3Hh0ie6FaGJSrNuCv1MoQNRGaFHHUsQnHT8r91lpOd78BzgojKaXYCpy1fS0EAWEPe
 wB+NyxC9eII+oNnBiZ7sF3qHVAQ/Q6410OOHbBnnCcr/juq1Stp16xH5S7CTPAeqyMC9
 SWAw==
X-Forwarded-Encrypted: i=1;
 AJvYcCXQRXgm2NcF9Fk/04nXLt1QtdReOBtqR4QU+lxpHF8yyUGr1YateYio0BjoUJEwlBhgMg/GDCxQGhBj@debbugs.gnu.org
X-Gm-Message-State: AOJu0YwzZZ6jwxA8j2byCm2/GSCdp4ApRdgupNuAMW0qFEPUND49bot5
 +8/iRFO6ADcKH6faUarWMfkqPopnKyykxqfoYva0k7IlaP5P7CBARzFQItG9DJCHmlvvtpZfK8h
 gG5UBluoE2yf18wZNdLgKMvSSd2s=
X-Gm-Gg: ASbGnctReLTCM26nFvVwyIbT54CSfnjBmykgJ0h13tZFsMnjWqKjbRsEpGUAH8iTGML
 UTA8dd0f4f4OdiA7/tXBFKDUHUfki1+nCHoAnONzPlyVX5boS8Lx/Z+WhhYTqoNtRo4fWFE4OFj
 pcZm2XuhODcbXv
X-Google-Smtp-Source: AGHT+IGKbFq88/0Q6dG50ge6PkPY26Sg2q9x3reXfMiJsjEL7R0ZLwI3GWJ+Qh6xOUk6Hy2dQLXNPmUfe06b2UZjkTM=
X-Received: by 2002:a17:902:f54d:b0:21f:3a7b:f4f1 with SMTP id
 d9443c01a7336-21f4e73af02mr140300295ad.32.1739071637699; Sat, 08 Feb 2025
 19:27:17 -0800 (PST)
MIME-Version: 1.0
References: <8c8b357c-6937-46e8-a9c0-1ac30ce74826@debian.org>
 <5eff9339-8f86-4a58-a045-e7ca245ea129@cs.ucla.edu>
 <878qqmr9hn.fsf@josefsson.org>
In-Reply-To: <878qqmr9hn.fsf@josefsson.org>
From: Jim Meyering <jim@meyering.net>
Date: Sat, 8 Feb 2025 19:27:04 -0800
X-Gm-Features: AWEUYZmRy1daCRB3WNMkrVLWfemLYjQxoJpylKHueQZDViC0GUsqOvD1_a5ski8
Message-ID: <CA+8g5KEGTfX=vurQw7k+6=NBTPTsmZHvt1S1Oic9UJXjEOPecg@mail.gmail.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.1 (/)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -0.9 (/)
Subject: [bug-diffutils] bug#76034: bug#76034: bug#76034: Status of
 gnulib-l10n in diffutils
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Feb 2025 03:28:02 -0000

On Mon, Feb 3, 2025 at 1:43=E2=80=AFPM Simon Josefsson via bug-diffutils vi=
a
All diffutils discussion. <bug-diffutils@gnu.org> wrote:
> Paul Eggert <eggert@cs.ucla.edu> writes:
> > On 2/3/25 12:15, Santiago Vila wrote:
> >> So: Will diffutils really do the same at some point?
> >
> > I don't see why not. We didn't get around to it for 3.11, though.
>
> Something like this perhaps?

Thanks, Simon. I've just pushed that.




From MAILER-DAEMON Thu Feb 20 23:48:09 2025
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1tlKxM-00035G-9d
	for mharc-bug-diffutils@gnu.org; Thu, 20 Feb 2025 23:48:09 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tlKxJ-00034v-TC
 for bug-diffutils@gnu.org; Thu, 20 Feb 2025 23:48:06 -0500
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tlKxJ-0008BQ-Ek
 for bug-diffutils@gnu.org; Thu, 20 Feb 2025 23:48:05 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=MIME-Version:Date:From:To:Subject;
 bh=3riWKgAs9PEUqgfObyTf7pCj9czkt5UtKhj61JfeGAg=; 
 b=RiEa2ZJvy2Vq3eb3uX87OBmHBBlojaY7Bhe2jH60i0ssqxD3Wk2LGHLMJgJ1bS2Fe+jpnKxRb7Ca1luJ2swZG8c4ZHvx2InSvg38YV2FG6R6oZtiw5CwBLywGfKuvOf6XifwvS4EjHpweCGAIFDY0H4X7oVcJO3gw5MEk5mvcEsjB/i8Jm057iN/M7/AYW81Lh2XytGPwUdqQuu8ytYFzO7ivEQlBZOVOtIpPNdvKxQECA/ZwZMTiDr2bSfehS7zM+U6ihG3AbHM6OT+3pe0lMHFzX+1oamF/uLKNvh8zU+lEp92Uf9tb/e5Sr7pjFQXISdVFpt7/3nLdTPh2C33PQ==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tlKxJ-0001n2-66
 for bug-diffutils@gnu.org; Thu, 20 Feb 2025 23:48:05 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Kate Deplaix <kit-ty-kate@outlook.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Fri, 21 Feb 2025 04:48:04 +0000
Resent-Message-ID: <handler.76452.B.17401132586619@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 76452
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 76452@debbugs.gnu.org
X-Debbugs-Original-To: "bug-diffutils@gnu.org" <bug-diffutils@gnu.org>
Received: via spool by submit@debbugs.gnu.org id=B.17401132586619
 (code B ref -1); Fri, 21 Feb 2025 04:48:04 +0000
Received: (at submit) by debbugs.gnu.org; 21 Feb 2025 04:47:38 +0000
Received: from localhost ([127.0.0.1]:49191 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tlKwr-0001iX-M5
 for submit@debbugs.gnu.org; Thu, 20 Feb 2025 23:47:38 -0500
Received: from lists.gnu.org ([2001:470:142::17]:39738)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <kit-ty-kate@outlook.com>)
 id 1tl8VH-0001rM-Ab
 for submit@debbugs.gnu.org; Thu, 20 Feb 2025 10:30:20 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <kit-ty-kate@outlook.com>)
 id 1tl8VB-0000on-EL
 for bug-diffutils@gnu.org; Thu, 20 Feb 2025 10:30:13 -0500
Received: from mail-uksouthazolkn190120002.outbound.protection.outlook.com
 ([2a01:111:f403:d204::2] helo=LO0P265CU003.outbound.protection.outlook.com)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <kit-ty-kate@outlook.com>)
 id 1tl8V9-0000he-DK
 for bug-diffutils@gnu.org; Thu, 20 Feb 2025 10:30:13 -0500
ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;
 b=Rk/VFG4uxge8fnt/BQzRcSBaFaU+nwWgZZBasezmzxjxtNPzCyYgal4cq6GgFIIgpV59tcktHwUq1MhCfNpu94LUvRO8pJXqhlVruoGev69JSOFlNytLxePMZaDmWixtivfxoZ7wCn4nsRMCj080jqDrUh5367ztpFxJ8K9hQvrlG8N274gggrYzW1uEqOpGWwWIKjMtB/rigcIyGrGSEhcQAuOrDuzAYYauky4PrhoJ6TG8GJokKO/JOXo4Mec/0zT+dX3BBsDE4iPdLbFSrlXVpfJqWu8Ykjg06olrEUdCktpEP+/MQUErMwHOGW5MUgqKi0MxDd2ZfOhq853WYg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; 
 s=arcselector10001;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
 bh=3riWKgAs9PEUqgfObyTf7pCj9czkt5UtKhj61JfeGAg=;
 b=I9IGDF8JmH40H7R/Kvb105fO1nB9ygN/Z0X9FKVbNKEYbKkF1pibx5c0M0Zz5H8JgeJpzDdUn4GhuIaZvjsbWk0lBLRZPi4IFJm3mLtPO5pnFMV6yJFX5lzoIOxg7C1urOw0yL4FTufA0QVjHfZq4y5kib8locuZ18j1G/lzc41KkQf+noI4JWnPBCJA1yxzS6+vuuhDwE7R8yVjjtcVufvu+9f/Vi1XzA2+w3LZIP/oEvTHLCIZBu3ah0tkkx7sCrue7gEo3XdNBYfeH/4NLRYg9bL0+bIK/5nbPfh3DZCeVAGR82OXxboforSzNpgsADu+RcvIPPAbne6SNfJCOA==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none;
 dkim=none; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com;
 s=selector1;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
 bh=3riWKgAs9PEUqgfObyTf7pCj9czkt5UtKhj61JfeGAg=;
 b=G11e8KAowk4CrqU+46kKq+9w5sEvB5MthNkouJiYJiqDdvfgOJ+j60TMFFB92gIbP1K0GZyZCat53ysiAY/GWiwJAQupkiHvNscSPnCPcVr5jzy+T9OWhLisEs63tEXhaAm/CvT40xRG5GNYGcPsvpk9U/JlzqgBPJk7MYE0vS9SPEW34jJ3a2W7YwGUmu7XxDPL6j8xwbX4M/7ot/+fS/j1AKHnNLnBR+pcHoIOJvooj9wL26cU3tVJM1ud8T8qqIlaleh6FbUGH3bUkoJyhvkzXU0BBiFJAV4mzaK+RO9n23MWlxFRdcDbtIVZL1UBUaLQSES+K4Q0k7ukSYelPA==
Received: from CWLP265MB4157.GBRP265.PROD.OUTLOOK.COM (2603:10a6:400:12c::9)
 by LO0P265MB7106.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:2ef::6) with
 Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.15; Thu, 20 Feb
 2025 15:25:05 +0000
Received: from CWLP265MB4157.GBRP265.PROD.OUTLOOK.COM
 ([fe80::4f37:8f32:e4a6:e624]) by CWLP265MB4157.GBRP265.PROD.OUTLOOK.COM
 ([fe80::4f37:8f32:e4a6:e624%6]) with mapi id 15.20.8466.016; Thu, 20 Feb 2025
 15:25:05 +0000
From: Kate Deplaix <kit-ty-kate@outlook.com>
Thread-Topic: 3.11 critical bug: diff -Naur a b does not show a unified diff
 when one of the file is empty
Thread-Index: AQHbg6kU34IPMCFqYUqCwyYKdOQkXg==
Date: Thu, 20 Feb 2025 15:25:05 +0000
Message-ID: <CWLP265MB4157FEE87F56A0B0234CDF2CBCC42@CWLP265MB4157.GBRP265.PROD.OUTLOOK.COM>
Accept-Language: en-GB, en-US
Content-Language: en-GB
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
msip_labels: 
x-ms-publictraffictype: Email
x-ms-traffictypediagnostic: CWLP265MB4157:EE_|LO0P265MB7106:EE_
x-ms-office365-filtering-correlation-id: 580dfeb9-7c2a-418b-70cc-08dd51c2c0a8
x-microsoft-antispam: BCL:0;
 ARA:14566002|461199028|15080799006|8060799006|8062599003|19110799003|15030799003|102099032|440099028|3412199025;
x-microsoft-antispam-message-info: cBRQ4V2csVBVYEbFOTp+NMzhwDQfw9/ZQG4sUTTPVFQvXZUaYBHjL8Y2LVpep5Q5ORyEoxffyQsqivLVrvLX6TI/NZ6B3R++GR5hAh0OoxzWthL8gIzhDfiUPnoOxRwm0x/k9ts5lSLEDGqJ54Mp6vjFy5zTiABKcjcotC1zNet26mf56A/ZEUxa+YIokIaS2aa64wJ+yDfjt3TqokUisXXILk0GIGJil4B1XjatMba0GieA6rILbJqKqvZBxH4GaDqXljaYVZ50TQj6R0wgJvq0JsIBLDYLDIIUKuBlCXSafm6U9lE2Ua4Wmx/u5Tqn98sP127gvV1cQOM+79nDgLL6+dSKO4OFQhOFDwN9QmkgYSiy5rBzBt+OtucS+1b3POIM51L1MFQOJAcnPAMbxFsjBfidWEbDN96fu3ZFhsEH7xPkat9nI6Mf6VcKXxwPbbYHT2jrN8iXVHKrBQ2AdgafpQVEXAVtrDi8yC/9APNqUAzs7CxSNsTS4UJWWJ3upj219nxnlwrOuNwHgcQiXe3jADtpz5llegW3mpUfY0n3LTLM3JSAp825vrJFS3DbDE8BP/JuSdCHPbl5MvSpvU/0I1m0+J720+ki1OhARxPyA9nD4QuUMOCRXWCiJEGmE2fFq7LJUQELw8iUoV9qTivvgLMWmsVgutkMVvvXgSdVTjLwwz1Og8P5POaoDIyJLQzqnx4GrRKH6o8wI5Ne5pE67UplEPnLMt3EKGJGYvTubnewNtdWqqPd5yWOWxHYZSyvanPReXMZa+oidDiw7daUvX9eR369QeeY/Um4qBWO5egDew0jQl/prMGjJHQHsKDogj7VjH9jl+IGozAe/J9UU2gddGFq+GKCXap8J5wES379pcxX6BDJzNJ480LQovD61XAP3PsbHo01FiJTpKdqAOpp6//GHkvJCv7b7z/nerudnQxJLY4qRdKVNunXiI4nLhGMgRiwz57k5WEcKitRrrpBVk4t24zy+hDbokaYlqL+p3KAFZkbUERSGZZ2Y7fygdQAE4l+0B26IPusw44x6nN3zZ82NsmMRwBP+kGTfbWC8ZpE71ASmkLEmKRPQItEEgxFY2lLzsuScNJPog==
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: QHW5PgVrhHdy82D3ADQ5O+DZrLTAyFcIxKDHbK19ZEgZxxo/tUU/jTBEkP4U1IIU4UAjyjxP69oiHFZNppPpNxrxTqdaeHt+Bk151gxETacVJ31CoMH9EGBdX0Oq8AbvrtByQKWW7DydW81NCfzwwZgfegTEObZpL90RR4hRhnvXNFiHg2VzQtxob6CE2F2WxGZsS42ftwLheG75ZhKcKyq4XXTUTZFqU1CXnygolSmdtuBMLC8CkbGZ2nlz6KkXzJoQjNXPHooMKkSms5ufZnqIiHnkF0pIc4i8TEejKx4b5hrHT1ac1zVnmxUFk3cXs1O9CrpgoroES910/9phAl0wIjW3UjyTNmJRrKjZfwW5fnbn/ORq7bt0zJdLM96F0YcdT9LtTlBYQkv0cJOU9dlbe9iXWpR7Bb65bCrO17vEeC0DIq56ugo8heypGCOe3mvid96Nb8MU84rRWugfaF0Kqwah5RkfmT0BdHoRHEvPFl7Gw6UiLJkm+OBAqJ+GHVcz5FlmnEO1LQOt2W/UL+uSUg6Wte1RQoz0Wshb/ffX30jhXUqiUW2gnwJ1iz2JlKDMC+yhFaGUeKhIbbfzcxoAGRomq1FWVtER0UaiB+EuNrY6OY4T9WemS80eTFp67GNsRpC2Ck56anVKB78RZWFeR4aPGu4/UXgcTFrhSsZsclPVqa897EJzaUWK0rYf59AeqQYDSUjCyCzmv4mRQd54bWPDlBCA4mszvpijoSufANo4Euolu6nO46RdkaG8vyFfif4peES7k+xHZDT23qoklU91BAwpSoP6xs76urgOstTaGgK81SVjUtusUYxLOmBT/E8sAnPjAvMhaoVRf2VPx4TAR8aZDKWPnWHgJQS/Z87Fa2y9FrBK80AC3qps7MYGZRLlizNImzO2cAerPCDbB6kkU7QTH67aYksO/n5RtAaklKbsHXs8uzyAy4eQ0nauJic8GHg8aoK6r8zUpBQrUKCaIqXu62y03KWBX+IblNwYwYHLOxL0T3C1OhvRz3J0GGbKHjGr+5RjAkLlm094fmZk6fhKdYn+Axqw4xywm3X5mxPsG2eYmWl6G6XuyjWkgUeZD4ab2dmYbCEP7kysT1Ns89VXMeZGk3xSsDOjgFiQshNb/8iwuZwMs11sUBEKk5oW0pp+HpgqhE2+K8vy4p5+YxsRv8DQFlXeZ4nzWnqSBbmEzgLYsqntC7SgKjH6aOHe9IG/Hk49WsSixeafWXx8IgbKiFsXmv0H1Y5AklnRhzppYAWPN9YJw1csq2M662UmpSq7ZSSmua2d6IC1y0euBG1h0WhDUsqJqu8=
Content-Type: multipart/alternative;
 boundary="_000_CWLP265MB4157FEE87F56A0B0234CDF2CBCC42CWLP265MB4157GBRP_"
MIME-Version: 1.0
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: CWLP265MB4157.GBRP265.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-CrossTenant-Network-Message-Id: 580dfeb9-7c2a-418b-70cc-08dd51c2c0a8
X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Feb 2025 15:25:05.3641 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LO0P265MB7106
Received-SPF: pass client-ip=2a01:111:f403:d204::2;
 envelope-from=kit-ty-kate@outlook.com;
 helo=LO0P265CU003.outbound.protection.outlook.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, 
 HTML_MESSAGE=0.001, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.0 (+)
X-Mailman-Approved-At: Thu, 20 Feb 2025 23:47:36 -0500
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -0.0 (/)
Subject: [bug-diffutils] bug#76452: 3.11 critical bug: diff -Naur a b does
 not show a unified diff when one of the file is empty
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Feb 2025 04:48:06 -0000

--_000_CWLP265MB4157FEE87F56A0B0234CDF2CBCC42CWLP265MB4157GBRP_
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

SGksDQoNCldoaWxlIHVzaW5nIGRpZmZ1dGlscyAzLjExIGluc3RlYWQgb2YgMy4xMCwgaSd2ZSBu
b3RpY2VkIGEgY3JpdGljYWwgYnVnIGluIGRpZmYgcmVwcm9kdWNpYmxlIHdpdGggdGhlIGZvbGxv
d2luZyBzZXR1cDoNCg0KJCBjZCAvdG1wDQokIG1rZGlyIGEgYg0KJCB0b3VjaCBhL3Rlc3QNCiQg
ZWNobyBjb250ZW50ID4gYi90ZXN0DQoNCldpdGggZGlmZnV0aWxzIDMuMTAsICJkaWZmIC1OYXVy
IGEgYiIgcmV0dXJuczoNCg0KZGlmZiAtTmF1ciBhL3Rlc3QgYi90ZXN0DQotLS0gYS90ZXN04oCC
4oCC4oCCMjAyNS0wMi0yMCAxNDo1MDowNy44NzAyNTgwNTIgKzAwMDANCisrKyBiL3Rlc3TigILi
gILigIIyMDI1LTAyLTIwIDE0OjUwOjE4Ljk1NzI4NzY0MSArMDAwMA0KQEAgLTAsMCArMSBAQA0K
K2NvbnRlbnQNCg0KYnV0IHdpdGggZGlmZnV0aWxzIDMuMTEsIHRoZSBzYW1lIGNvbW1hbmQgcmV0
dXJuczoNCg0KRmlsZSBhL3Rlc3QgaXMgYSByZWd1bGFyIGVtcHR5IGZpbGUgd2hpbGUgZmlsZSBi
L3Rlc3QgaXMgYSByZWd1bGFyIGZpbGUNCg0KR2l2ZW4gbm8gbWVudGlvbiBvZiB0aGlzIGNoYW5n
ZSBhcHBlYXIgaW4gdGhlIGNoYW5nZWxvZywgaSdtIGd1ZXNzaW5nIHRoaXMgaXMgYW4gdW5pbnRl
bmRlZCBjaGFuZ2UuIEluIG15IG9waW5pb24gdGhpcyBidWcgaXMgY3JpdGljYWwgYW5kIHRoZSAz
LjExIHJlbGVhc2Ugc2hvdWxkIGJlIG1hcmtlZCBhcyBicm9rZW4gdG8gYXZvaWQgbW9yZSBkaXN0
cmlidXRpb25zIHVzaW5nIGl0Lg0KDQpXYXJtIHJlZ2FyZHMsDQpLYXRlIERlcGxhaXgNCg==

--_000_CWLP265MB4157FEE87F56A0B0234CDF2CBCC42CWLP265MB4157GBRP_
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: base64

PGh0bWw+DQo8aGVhZD4NCjxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIgY29udGVudD0i
dGV4dC9odG1sOyBjaGFyc2V0PXV0Zi04Ij4NCjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyIgc3R5bGU9
ImRpc3BsYXk6bm9uZTsiPiBQIHttYXJnaW4tdG9wOjA7bWFyZ2luLWJvdHRvbTowO30gPC9zdHls
ZT4NCjwvaGVhZD4NCjxib2R5IGRpcj0ibHRyIj4NCjxkaXYgY2xhc3M9ImVsZW1lbnRUb1Byb29m
IiBzdHlsZT0iZm9udC1mYW1pbHk6IEFwdG9zLCBBcHRvc19FbWJlZGRlZEZvbnQsIEFwdG9zX01T
Rm9udFNlcnZpY2UsIENhbGlicmksIEhlbHZldGljYSwgc2Fucy1zZXJpZjsgZm9udC1zaXplOiAx
MnB0OyBjb2xvcjogcmdiKDAsIDAsIDApOyI+DQpIaSw8YnI+DQo8YnI+DQpXaGlsZSB1c2luZyBk
aWZmdXRpbHMgMy4xMSBpbnN0ZWFkIG9mIDMuMTAsIGkndmUgbm90aWNlZCBhIGNyaXRpY2FsIGJ1
ZyBpbiBkaWZmIHJlcHJvZHVjaWJsZSB3aXRoIHRoZSBmb2xsb3dpbmcgc2V0dXA6PGJyPg0KPGJy
Pg0KJCBjZCAvdG1wPGJyPg0KJCBta2RpciBhIGI8YnI+DQokIHRvdWNoIGEvdGVzdDxicj4NCiQg
ZWNobyBjb250ZW50ICZndDsgYi90ZXN0PGJyPg0KPGJyPg0KV2l0aCBkaWZmdXRpbHMgMy4xMCwg
JnF1b3Q7ZGlmZiAtTmF1ciBhIGImcXVvdDsgcmV0dXJuczo8YnI+DQo8YnI+DQpkaWZmIC1OYXVy
IGEvdGVzdCBiL3Rlc3Q8L2Rpdj4NCjxkaXYgY2xhc3M9ImVsZW1lbnRUb1Byb29mIiBzdHlsZT0i
Zm9udC1mYW1pbHk6IEFwdG9zLCBBcHRvc19FbWJlZGRlZEZvbnQsIEFwdG9zX01TRm9udFNlcnZp
Y2UsIENhbGlicmksIEhlbHZldGljYSwgc2Fucy1zZXJpZjsgZm9udC1zaXplOiAxMnB0OyBjb2xv
cjogcmdiKDAsIDAsIDApOyI+DQotLS0gYS90ZXN04oCC4oCC4oCCMjAyNS0wMi0yMCAxNDo1MDow
Ny44NzAyNTgwNTIgKzAwMDA8L2Rpdj4NCjxkaXYgY2xhc3M9ImVsZW1lbnRUb1Byb29mIiBzdHls
ZT0iZm9udC1mYW1pbHk6IEFwdG9zLCBBcHRvc19FbWJlZGRlZEZvbnQsIEFwdG9zX01TRm9udFNl
cnZpY2UsIENhbGlicmksIEhlbHZldGljYSwgc2Fucy1zZXJpZjsgZm9udC1zaXplOiAxMnB0OyBj
b2xvcjogcmdiKDAsIDAsIDApOyI+DQorKysgYi90ZXN04oCC4oCC4oCCMjAyNS0wMi0yMCAxNDo1
MDoxOC45NTcyODc2NDEgKzAwMDA8L2Rpdj4NCjxkaXYgY2xhc3M9ImVsZW1lbnRUb1Byb29mIiBz
dHlsZT0iZm9udC1mYW1pbHk6IEFwdG9zLCBBcHRvc19FbWJlZGRlZEZvbnQsIEFwdG9zX01TRm9u
dFNlcnZpY2UsIENhbGlicmksIEhlbHZldGljYSwgc2Fucy1zZXJpZjsgZm9udC1zaXplOiAxMnB0
OyBjb2xvcjogcmdiKDAsIDAsIDApOyI+DQpAQCAtMCwwICsxIEBAPC9kaXY+DQo8ZGl2IGNsYXNz
PSJlbGVtZW50VG9Qcm9vZiIgc3R5bGU9ImZvbnQtZmFtaWx5OiBBcHRvcywgQXB0b3NfRW1iZWRk
ZWRGb250LCBBcHRvc19NU0ZvbnRTZXJ2aWNlLCBDYWxpYnJpLCBIZWx2ZXRpY2EsIHNhbnMtc2Vy
aWY7IGZvbnQtc2l6ZTogMTJwdDsgY29sb3I6IHJnYigwLCAwLCAwKTsiPg0KK2NvbnRlbnQ8YnI+
DQo8YnI+DQpidXQgd2l0aCBkaWZmdXRpbHMgMy4xMSwgdGhlIHNhbWUgY29tbWFuZCByZXR1cm5z
Ojxicj4NCjxicj4NCkZpbGUgYS90ZXN0IGlzIGEgcmVndWxhciBlbXB0eSBmaWxlIHdoaWxlIGZp
bGUgYi90ZXN0IGlzIGEgcmVndWxhciBmaWxlPGJyPg0KPGJyPg0KR2l2ZW4gbm8gbWVudGlvbiBv
ZiB0aGlzIGNoYW5nZSBhcHBlYXIgaW4gdGhlIGNoYW5nZWxvZywgaSdtIGd1ZXNzaW5nIHRoaXMg
aXMgYW4gdW5pbnRlbmRlZCBjaGFuZ2UuIEluIG15IG9waW5pb24gdGhpcyBidWcgaXMgY3JpdGlj
YWwgYW5kIHRoZSAzLjExIHJlbGVhc2Ugc2hvdWxkIGJlIG1hcmtlZCBhcyBicm9rZW4gdG8gYXZv
aWQgbW9yZSBkaXN0cmlidXRpb25zIHVzaW5nIGl0Ljxicj4NCjxicj4NCldhcm0gcmVnYXJkcyw8
YnI+DQpLYXRlIERlcGxhaXg8L2Rpdj4NCjwvYm9keT4NCjwvaHRtbD4NCg==

--_000_CWLP265MB4157FEE87F56A0B0234CDF2CBCC42CWLP265MB4157GBRP_--




From MAILER-DAEMON Thu Feb 20 23:48:28 2025
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1tlKxe-00037L-6Q
	for mharc-bug-diffutils@gnu.org; Thu, 20 Feb 2025 23:48:28 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tlKxN-00035J-3B
 for bug-diffutils@gnu.org; Thu, 20 Feb 2025 23:48:09 -0500
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tlKxM-0008Bf-Pk
 for bug-diffutils@gnu.org; Thu, 20 Feb 2025 23:48:08 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=MIME-Version:In-Reply-To:References:Date:From:To:Subject;
 bh=EhtC6XiFgA7LmXDRFY/bKenw0y6tMywsbKFkzQFSQEg=; 
 b=ot/LjiXaixYfHR9rNAB7v5FZmNGlcr8ZdCe1GZsAkPa6dNElWINAqnmSGIVGTteOxZEnirxo9QppI4UlfDfx8l/M26kUtpob+d2CN2I90ZEVwp13gDSn+9RwtKw80MjdYPL7UOitRz9Fm+gxYHr+olGfAIegbTAPxLx7zatsi0muoNq/5ZxOgXrRfn2SQNCe2reDdIzNphmKdhnRhq86H3+WjXA/KvX4/EVcftlsU5Uc8YlCMjIghf0c/ENTHt08qzu1E+RCidWkikGgs7Y5GMFsrlwh3uc3izTVRLVoqw5JslOfwMSHY3f3UoclHrmPdrZVmANQLQZEQoVuh/NK7Q==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tlKxM-0001ne-Ew
 for bug-diffutils@gnu.org; Thu, 20 Feb 2025 23:48:08 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Kate Deplaix <kit-ty-kate@outlook.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Fri, 21 Feb 2025 04:48:07 +0000
Resent-Message-ID: <handler.76453.B.17401132626659@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 76453
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 76453@debbugs.gnu.org
X-Debbugs-Original-To: "bug-diffutils@gnu.org" <bug-diffutils@gnu.org>
Received: via spool by submit@debbugs.gnu.org id=B.17401132626659
 (code B ref -1); Fri, 21 Feb 2025 04:48:07 +0000
Received: (at submit) by debbugs.gnu.org; 21 Feb 2025 04:47:42 +0000
Received: from localhost ([127.0.0.1]:49193 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tlKws-0001ii-Nd
 for submit@debbugs.gnu.org; Thu, 20 Feb 2025 23:47:41 -0500
Received: from lists.gnu.org ([2001:470:142::17]:42430)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <kit-ty-kate@outlook.com>)
 id 1tl8yw-0007C2-12
 for submit@debbugs.gnu.org; Thu, 20 Feb 2025 11:00:58 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <kit-ty-kate@outlook.com>)
 id 1tl8yo-0004iq-5T
 for bug-diffutils@gnu.org; Thu, 20 Feb 2025 11:00:50 -0500
Received: from mail-uksouthazolkn19012061.outbound.protection.outlook.com
 ([52.103.37.61] helo=LO0P265CU003.outbound.protection.outlook.com)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <kit-ty-kate@outlook.com>)
 id 1tl8yk-0005ka-53
 for bug-diffutils@gnu.org; Thu, 20 Feb 2025 11:00:48 -0500
ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;
 b=LOyGO1+T6ObFEd1ipOedtBUypb5ii/TFZ1d7+a/mhC/Z4gzhE3SVA0V4DjuxQyoKLtjfTMeCYN1Z+FD95kevezyxFr/LGMAXWqM2Jxn4MQCCIFQyWQlvOepwoeigXaLxlxPIK5r8+cNIhfxEivAI8ZktP5urEv/Bx9eFj5FZRGdO9P8XwhWdr31EhLU+Z0ncFRrTRvnQdamumtENHDOQb1rfneOkTTVHsXc0MzNPvmAn0Iea4Z50TdHws3jZIe8Wz8Aj/rcytIEECk8dPIyj0ZWXk+h3iTiTnBaz9+jW+hgxAWPYPmPSMLBQG4Eg9vBR0KZi9CXx5/0jgyz943SL6w==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; 
 s=arcselector10001;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
 bh=EhtC6XiFgA7LmXDRFY/bKenw0y6tMywsbKFkzQFSQEg=;
 b=uDWHI8blFlSczgQ+AkojVinnsrXFr6SIe7UTWJL3pAtHe5Y7bEyH7HjSZaSVmCOqFsi0Wa2kJjX0wprydHWiXX7TpxbHmxbiMB3AFbnAdEW3dLZAinVtmXeYhlN5RkeedRCF11QWAuWNNnoe/BoorztKlsTosZMwInUNego96y/tngfKgyOWLb2WVldbbGZcX09OBGqnhDBqSvzhP0cSZCCDC1phm/ICUSeNm3Jor5YM8+RtBHpg2NTDoHnlBc4XBiWlLHlGraSktDjO0OKLnEYUJxJpdHDXYa8/NHqdm+UUTFkARelpm1EhT3FPCWlW7UTIQNoj9yWjhoXgsJl60Q==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none;
 dkim=none; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com;
 s=selector1;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
 bh=EhtC6XiFgA7LmXDRFY/bKenw0y6tMywsbKFkzQFSQEg=;
 b=FNqXju88wsgCgEE44N+0eyFYyD/zYVF+Zc0UG1ei9M7l78cGKmSDTsmlZ8z3rXqs7m5iKAyONacO3dVkx/cj133x6rO9Qcsqc+mrMQPoi1uVnLMupKsB898ZAm7hhDL+HIp5htDg/bbbFfhzCoXiCJu9EigMosMFTWosm4D2cnWJfPfqTFzLgSytGxgvKFzngqEy59gTwowe4HNXx/1RESSMR72EgPiNpcF9+C0OkJ7wimxvNv7YYgOT+IezVIkwlbCkS3/TQWRIKxqSZ2JTPq7TR+Aym2CDrLeASl7MjMuBbEvEhvUU31TgHBzHUCV+T8njVGZZV72XUgabrRPLOg==
Received: from CWLP265MB4157.GBRP265.PROD.OUTLOOK.COM (2603:10a6:400:12c::9)
 by LO8P265MB7577.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:3a7::14) with
 Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.16; Thu, 20 Feb
 2025 15:55:40 +0000
Received: from CWLP265MB4157.GBRP265.PROD.OUTLOOK.COM
 ([fe80::4f37:8f32:e4a6:e624]) by CWLP265MB4157.GBRP265.PROD.OUTLOOK.COM
 ([fe80::4f37:8f32:e4a6:e624%6]) with mapi id 15.20.8466.016; Thu, 20 Feb 2025
 15:55:40 +0000
From: Kate Deplaix <kit-ty-kate@outlook.com>
Thread-Topic: 3.11 critical bug: diff -Naur a b does not show a unified diff
 when one of the file is empty
Thread-Index: AQHbg6kU34IPMCFqYUqCwyYKdOQkXrNQV5Cc
Date: Thu, 20 Feb 2025 15:55:40 +0000
Message-ID: <CWLP265MB4157BC12BCFF5B4BA3BFABCABCC42@CWLP265MB4157.GBRP265.PROD.OUTLOOK.COM>
References: <CWLP265MB4157FEE87F56A0B0234CDF2CBCC42@CWLP265MB4157.GBRP265.PROD.OUTLOOK.COM>
In-Reply-To: <CWLP265MB4157FEE87F56A0B0234CDF2CBCC42@CWLP265MB4157.GBRP265.PROD.OUTLOOK.COM>
Accept-Language: en-GB, en-US
Content-Language: en-GB
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
msip_labels: 
x-ms-publictraffictype: Email
x-ms-traffictypediagnostic: CWLP265MB4157:EE_|LO8P265MB7577:EE_
x-ms-office365-filtering-correlation-id: ce29da65-e314-43ea-fe82-08dd51c70697
x-microsoft-antispam: BCL:0;
 ARA:14566002|19110799003|8060799006|8062599003|15030799003|15080799006|461199028|440099028|3412199025|102099032;
x-microsoft-antispam-message-info: zMRtdnvPBKIPS28fSZ/bFhFo/YB/gnzopWOUjpSoj8MVSTocW1V4U48Hs3R3b4CPPTlAkHCcpryi58SUCfQ55+PvLMnPMGkB2lpMyFokS3UUqAaW8QEz6x95e9JBdioO19BLFp392vUxu6FgGYgmvSYRP8JWsLCbBRXGCrjRhRQx7QhRPemqhvrpYLmt3N9YphD2eKOVdGqYI0dKS73Tu4zQbK+FkfrEIhItDgVzg+VYL677iJ3j5wY1oTNk60a7O2tMoXoCSh+0Cyja4E88RduRywgZKandQdU8vyqzxWRYLNG6RKvttJ1n1S5hTS7w8IzGMj04DCACBbc8n7FfeNiSmErDRPMp4JymPfo2JgYheqEYWp9PaMnlHzRO5dRNF+NUXMePnS4Ryg0W07fhImTmWf+q5SO/5H+giGed6gnmlLXuqS78LBwvtVSo4v7+QRDwaAlhkPm6XDEFeLrUaAzQUwDxtXqG2PTslHh3qSoxONyRkl0XFAT5ejkD9TJcuOhuZxPnS+Cpw//V+uCgHJkkYCXesB/nlA0tKjzqxTsyP6f/BArvCb2+Am0xq5pTTcXf/+cJk2DY780b3J3Rrs+aAvRcqxZGGODyyDGRu8ey1GIp5NByNYZNRfweoSlW+ymq7UqAgcWLHOWchgkN5zop6ZUVmot2w+4Blc19bmL3UjubFfloUbBmgy8NLXdkvj6ax40VAYPbymiqbvG9HIaTAgx5rwOsMSjytEZVirDUUPB/dSan079lXYRM6nuSQKmgcFh2ULS8po4wRj4TQkoLknBTrBAFWhYsEa7GwHV03ho+uN6ui9qZszZ4M9I2FJn47A6KNYaHQbL+2OKKC6W+EDAEHxUEbZYKE7jdVZHjshwHKn0RMU4qn4mLWNbKn46ai2wmMdHwpHwzw7mFBzaoI6b8KAQ/kMF5ZBITy1nPMQUetwle6HB+dnMBA26gWy4M/KKCmSLCMN+N4XOdzOvOK7wwvIE+Lx3yh8issHu8tuuNS1RUFj4FU4tGQJqMJVKl09+NPWI3TtidHKT/gmowJ9wLDfVB1uvjsIfvyU56IiL5r2FgcfZ/bPeFk95w6AKqWkawd4rFtg9snw8p1A==
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: ybdhtylM0eqCWWxhhsRcewaPwb886hViz9UHIzSTYIoRBpqWVjZBz/8LLjv4I3sGVtfnXzzJHTXUKqqp8d8fWzBH2nYqRm6BSxcuRzu3bUaWucRKu0VgjnFSkn73YWmI9uohgHDC+Y5RggR6aJNhg6I9hu/e5vwlDY2ZqtJbtPqjC9a1rIJpocLvGv8DuvNOygzGe43hlIjoehvonUJ1wJxKh/K3l6iJcuO91HOddudqlbwjiIr7AH3fVEK8DaBTG2FNMJxteU2pUIWif+a6rIFoiYn5e9ij8IYUuRCHqrnyMDbSCnC/gXfGYrn0zuKinxQwWPhbg38xduIXka2mJgqb+091ZQg4J3bT40tjNwEbfwLXEAebF+yZbEGrt7TlQt9H7d/DnEhZXVGsaHXWj5GrG8+lMxDY8rjhVm3PfLDaxTbXwi117mZec+SGH0QEllk6lQuFHxYlwD4Qk98m1nbH0T+/RtkltTrzdjwdNjcz2K1PwuxfNoo1HhOLaqwlSRYmFvuQALExCIRxIEdrCZKubvj0GR3HkT8n8IoITCZ3PKL4Tmjjy7n25laAdUJgmI7mB2fmhu2KqCPJxvqErmmSFeLwhrZIHGajON8QeiVGf7L+a6BKbwyyd8jr36GR6XOWZP05z92fEl83PEOuE1bi0hSBI8em+rBOLfXw67wqpjsT9PwSFRMTg/BsxoVE0sn+BZtA0xAibwff38ygFCHXdjA8oKOBXVDpTwFy5f6lgLY7yAwUE2K6hJ8XU+S4GwoukVNh3KX3hSm7wl0aHQfKEAPM3JHEL2Z71F1t8t+80gYpMZ5SgVJDpkc28hZEugZQjEdx69WllgXNmEuKgdJG5QWJHWnmCJPr8b2RupMvJfLGXt44vg93czj/71aoKM8EMwe1OS8+ihowJ0vCMeVsmyVzKkc/MG4/GplVEeAR9t7ebZ9yePv2GXiVNBrfG5TEU1IW2Lcs0qbWcdQGGttoZB8Ec92Wk4Wtf8Zn/ULMozQKR40cFf0RnsNZNnC9sjhwo49iKP2rF1USCDX1SHLPMMg+JjLdX9DLUl0liHmwBfHlTHRErgpfPUmOQzU8b/FFAzIs8Dh7TfSDdWRL2IvecyUVBhJzbHatvSfnEHDSLPkIeE+mKEWoM2pHEPWbRRt4Cfp164HnwLFVa775tFxsx9WBV6I7GfgzL/Zf7xr8sOGp95tsCSmBK6HnLuEP5gTfztfJ4J+OwAPNjGSwNE/bmwM7o+BHDl83JvfCYnBLhrgq5PxsJ/eSVqxEwxnG26N0rTFxOTqFNfA7lCObpozU4SPZR+k/ITxRhaQgcro=
Content-Type: multipart/alternative;
 boundary="_000_CWLP265MB4157BC12BCFF5B4BA3BFABCABCC42CWLP265MB4157GBRP_"
MIME-Version: 1.0
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: CWLP265MB4157.GBRP265.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-CrossTenant-Network-Message-Id: ce29da65-e314-43ea-fe82-08dd51c70697
X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Feb 2025 15:55:40.7387 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LO8P265MB7577
Received-SPF: pass client-ip=52.103.37.61;
 envelope-from=kit-ty-kate@outlook.com;
 helo=LO0P265CU003.outbound.protection.outlook.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, 
 HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001,
 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 
 SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.0 (+)
X-Mailman-Approved-At: Thu, 20 Feb 2025 23:47:36 -0500
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -0.0 (/)
Subject: [bug-diffutils] bug#76453: 3.11 critical bug: diff -Naur a b does
 not show a unified diff when one of the file is empty
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Feb 2025 04:48:09 -0000

--_000_CWLP265MB4157BC12BCFF5B4BA3BFABCABCC42CWLP265MB4157GBRP_
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64

U2VuZGluZyB0aGlzIGFnYWluIGFzIGEgcmVwbHkgaW4gY2FzZSBzdWJzY3JpYmluZyB0byB0aGUg
bWFpbGluZy1saXN0IHdhcyByZXF1aXJlZCB0byBoYXZlIGl0IGFjY2VwdGVkLg0KX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX18NCkZyb206IEthdGUgRGVwbGFpeA0KU2VudDogMjAgRmVi
cnVhcnkgMjAyNSAxNToyNQ0KVG86IGJ1Zy1kaWZmdXRpbHNAZ251Lm9yZyA8YnVnLWRpZmZ1dGls
c0BnbnUub3JnPg0KU3ViamVjdDogMy4xMSBjcml0aWNhbCBidWc6IGRpZmYgLU5hdXIgYSBiIGRv
ZXMgbm90IHNob3cgYSB1bmlmaWVkIGRpZmYgd2hlbiBvbmUgb2YgdGhlIGZpbGUgaXMgZW1wdHkN
Cg0KSGksDQoNCldoaWxlIHVzaW5nIGRpZmZ1dGlscyAzLjExIGluc3RlYWQgb2YgMy4xMCwgaSd2
ZSBub3RpY2VkIGEgY3JpdGljYWwgYnVnIGluIGRpZmYgcmVwcm9kdWNpYmxlIHdpdGggdGhlIGZv
bGxvd2luZyBzZXR1cDoNCg0KJCBjZCAvdG1wDQokIG1rZGlyIGEgYg0KJCB0b3VjaCBhL3Rlc3QN
CiQgZWNobyBjb250ZW50ID4gYi90ZXN0DQoNCldpdGggZGlmZnV0aWxzIDMuMTAsICJkaWZmIC1O
YXVyIGEgYiIgcmV0dXJuczoNCg0KZGlmZiAtTmF1ciBhL3Rlc3QgYi90ZXN0DQotLS0gYS90ZXN0
4oCC4oCC4oCCMjAyNS0wMi0yMCAxNDo1MDowNy44NzAyNTgwNTIgKzAwMDANCisrKyBiL3Rlc3Ti
gILigILigIIyMDI1LTAyLTIwIDE0OjUwOjE4Ljk1NzI4NzY0MSArMDAwMA0KQEAgLTAsMCArMSBA
QA0KK2NvbnRlbnQNCg0KYnV0IHdpdGggZGlmZnV0aWxzIDMuMTEsIHRoZSBzYW1lIGNvbW1hbmQg
cmV0dXJuczoNCg0KRmlsZSBhL3Rlc3QgaXMgYSByZWd1bGFyIGVtcHR5IGZpbGUgd2hpbGUgZmls
ZSBiL3Rlc3QgaXMgYSByZWd1bGFyIGZpbGUNCg0KR2l2ZW4gbm8gbWVudGlvbiBvZiB0aGlzIGNo
YW5nZSBhcHBlYXIgaW4gdGhlIGNoYW5nZWxvZywgaSdtIGd1ZXNzaW5nIHRoaXMgaXMgYW4gdW5p
bnRlbmRlZCBjaGFuZ2UuIEluIG15IG9waW5pb24gdGhpcyBidWcgaXMgY3JpdGljYWwgYW5kIHRo
ZSAzLjExIHJlbGVhc2Ugc2hvdWxkIGJlIG1hcmtlZCBhcyBicm9rZW4gdG8gYXZvaWQgbW9yZSBk
aXN0cmlidXRpb25zIHVzaW5nIGl0Lg0KDQpXYXJtIHJlZ2FyZHMsDQpLYXRlIERlcGxhaXgNCg==

--_000_CWLP265MB4157BC12BCFF5B4BA3BFABCABCC42CWLP265MB4157GBRP_
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: base64

PGh0bWw+DQo8aGVhZD4NCjxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIgY29udGVudD0i
dGV4dC9odG1sOyBjaGFyc2V0PXV0Zi04Ij4NCjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyIgc3R5bGU9
ImRpc3BsYXk6bm9uZTsiPiBQIHttYXJnaW4tdG9wOjA7bWFyZ2luLWJvdHRvbTowO30gPC9zdHls
ZT4NCjwvaGVhZD4NCjxib2R5IGRpcj0ibHRyIj4NCjxkaXYgY2xhc3M9ImVsZW1lbnRUb1Byb29m
IiBzdHlsZT0iZm9udC1mYW1pbHk6IEFwdG9zLCBBcHRvc19FbWJlZGRlZEZvbnQsIEFwdG9zX01T
Rm9udFNlcnZpY2UsIENhbGlicmksIEhlbHZldGljYSwgc2Fucy1zZXJpZjsgZm9udC1zaXplOiAx
MnB0OyBjb2xvcjogcmdiKDAsIDAsIDApOyI+DQpTZW5kaW5nIHRoaXMgYWdhaW4gYXMgYSByZXBs
eSBpbiBjYXNlIHN1YnNjcmliaW5nIHRvIHRoZSBtYWlsaW5nLWxpc3Qgd2FzIHJlcXVpcmVkIHRv
IGhhdmUgaXQgYWNjZXB0ZWQuPC9kaXY+DQo8ZGl2IGlkPSJhcHBlbmRvbnNlbmQiPjwvZGl2Pg0K
PGhyIHN0eWxlPSJkaXNwbGF5OmlubGluZS1ibG9jazt3aWR0aDo5OCUiIHRhYmluZGV4PSItMSI+
DQo8ZGl2IGlkPSJkaXZScGx5RndkTXNnIiBkaXI9Imx0ciI+PGZvbnQgZmFjZT0iQ2FsaWJyaSwg
c2Fucy1zZXJpZiIgc3R5bGU9ImZvbnQtc2l6ZToxMXB0IiBjb2xvcj0iIzAwMDAwMCI+PGI+RnJv
bTo8L2I+IEthdGUgRGVwbGFpeDxicj4NCjxiPlNlbnQ6PC9iPiAyMCBGZWJydWFyeSAyMDI1IDE1
OjI1PGJyPg0KPGI+VG86PC9iPiBidWctZGlmZnV0aWxzQGdudS5vcmcgJmx0O2J1Zy1kaWZmdXRp
bHNAZ251Lm9yZyZndDs8YnI+DQo8Yj5TdWJqZWN0OjwvYj4gMy4xMSBjcml0aWNhbCBidWc6IGRp
ZmYgLU5hdXIgYSBiIGRvZXMgbm90IHNob3cgYSB1bmlmaWVkIGRpZmYgd2hlbiBvbmUgb2YgdGhl
IGZpbGUgaXMgZW1wdHk8L2ZvbnQ+DQo8ZGl2PiZuYnNwOzwvZGl2Pg0KPC9kaXY+DQo8c3R5bGUg
dHlwZT0idGV4dC9jc3MiIHN0eWxlPSJkaXNwbGF5Om5vbmUiPg0KPCEtLQ0KcA0KCXttYXJnaW4t
dG9wOjA7DQoJbWFyZ2luLWJvdHRvbTowfQ0KLS0+DQo8L3N0eWxlPg0KPGRpdiBkaXI9Imx0ciI+
DQo8ZGl2IGNsYXNzPSJ4X2VsZW1lbnRUb1Byb29mIiBzdHlsZT0iZm9udC1mYW1pbHk6QXB0b3Ms
QXB0b3NfRW1iZWRkZWRGb250LEFwdG9zX01TRm9udFNlcnZpY2UsQ2FsaWJyaSxIZWx2ZXRpY2Es
c2Fucy1zZXJpZjsgZm9udC1zaXplOjEycHQ7IGNvbG9yOnJnYigwLDAsMCkiPg0KSGksPGJyPg0K
PGJyPg0KV2hpbGUgdXNpbmcgZGlmZnV0aWxzIDMuMTEgaW5zdGVhZCBvZiAzLjEwLCBpJ3ZlIG5v
dGljZWQgYSBjcml0aWNhbCBidWcgaW4gZGlmZiByZXByb2R1Y2libGUgd2l0aCB0aGUgZm9sbG93
aW5nIHNldHVwOjxicj4NCjxicj4NCiQgY2QgL3RtcDxicj4NCiQgbWtkaXIgYSBiPGJyPg0KJCB0
b3VjaCBhL3Rlc3Q8YnI+DQokIGVjaG8gY29udGVudCAmZ3Q7IGIvdGVzdDxicj4NCjxicj4NCldp
dGggZGlmZnV0aWxzIDMuMTAsICZxdW90O2RpZmYgLU5hdXIgYSBiJnF1b3Q7IHJldHVybnM6PGJy
Pg0KPGJyPg0KZGlmZiAtTmF1ciBhL3Rlc3QgYi90ZXN0PC9kaXY+DQo8ZGl2IGNsYXNzPSJ4X2Vs
ZW1lbnRUb1Byb29mIiBzdHlsZT0iZm9udC1mYW1pbHk6QXB0b3MsQXB0b3NfRW1iZWRkZWRGb250
LEFwdG9zX01TRm9udFNlcnZpY2UsQ2FsaWJyaSxIZWx2ZXRpY2Esc2Fucy1zZXJpZjsgZm9udC1z
aXplOjEycHQ7IGNvbG9yOnJnYigwLDAsMCkiPg0KLS0tIGEvdGVzdOKAguKAguKAgjIwMjUtMDIt
MjAgMTQ6NTA6MDcuODcwMjU4MDUyICswMDAwPC9kaXY+DQo8ZGl2IGNsYXNzPSJ4X2VsZW1lbnRU
b1Byb29mIiBzdHlsZT0iZm9udC1mYW1pbHk6QXB0b3MsQXB0b3NfRW1iZWRkZWRGb250LEFwdG9z
X01TRm9udFNlcnZpY2UsQ2FsaWJyaSxIZWx2ZXRpY2Esc2Fucy1zZXJpZjsgZm9udC1zaXplOjEy
cHQ7IGNvbG9yOnJnYigwLDAsMCkiPg0KKysrIGIvdGVzdOKAguKAguKAgjIwMjUtMDItMjAgMTQ6
NTA6MTguOTU3Mjg3NjQxICswMDAwPC9kaXY+DQo8ZGl2IGNsYXNzPSJ4X2VsZW1lbnRUb1Byb29m
IiBzdHlsZT0iZm9udC1mYW1pbHk6QXB0b3MsQXB0b3NfRW1iZWRkZWRGb250LEFwdG9zX01TRm9u
dFNlcnZpY2UsQ2FsaWJyaSxIZWx2ZXRpY2Esc2Fucy1zZXJpZjsgZm9udC1zaXplOjEycHQ7IGNv
bG9yOnJnYigwLDAsMCkiPg0KQEAgLTAsMCArMSBAQDwvZGl2Pg0KPGRpdiBjbGFzcz0ieF9lbGVt
ZW50VG9Qcm9vZiIgc3R5bGU9ImZvbnQtZmFtaWx5OkFwdG9zLEFwdG9zX0VtYmVkZGVkRm9udCxB
cHRvc19NU0ZvbnRTZXJ2aWNlLENhbGlicmksSGVsdmV0aWNhLHNhbnMtc2VyaWY7IGZvbnQtc2l6
ZToxMnB0OyBjb2xvcjpyZ2IoMCwwLDApIj4NCitjb250ZW50PGJyPg0KPGJyPg0KYnV0IHdpdGgg
ZGlmZnV0aWxzIDMuMTEsIHRoZSBzYW1lIGNvbW1hbmQgcmV0dXJuczo8YnI+DQo8YnI+DQpGaWxl
IGEvdGVzdCBpcyBhIHJlZ3VsYXIgZW1wdHkgZmlsZSB3aGlsZSBmaWxlIGIvdGVzdCBpcyBhIHJl
Z3VsYXIgZmlsZTxicj4NCjxicj4NCkdpdmVuIG5vIG1lbnRpb24gb2YgdGhpcyBjaGFuZ2UgYXBw
ZWFyIGluIHRoZSBjaGFuZ2Vsb2csIGknbSBndWVzc2luZyB0aGlzIGlzIGFuIHVuaW50ZW5kZWQg
Y2hhbmdlLiBJbiBteSBvcGluaW9uIHRoaXMgYnVnIGlzIGNyaXRpY2FsIGFuZCB0aGUgMy4xMSBy
ZWxlYXNlIHNob3VsZCBiZSBtYXJrZWQgYXMgYnJva2VuIHRvIGF2b2lkIG1vcmUgZGlzdHJpYnV0
aW9ucyB1c2luZyBpdC48YnI+DQo8YnI+DQpXYXJtIHJlZ2FyZHMsPGJyPg0KS2F0ZSBEZXBsYWl4
PC9kaXY+DQo8L2Rpdj4NCjwvYm9keT4NCjwvaHRtbD4NCg==

--_000_CWLP265MB4157BC12BCFF5B4BA3BFABCABCC42CWLP265MB4157GBRP_--




From MAILER-DAEMON Thu Feb 20 23:48:31 2025
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1tlKxi-00038m-G8
	for mharc-bug-diffutils@gnu.org; Thu, 20 Feb 2025 23:48:31 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tlKxS-00035w-DA
 for bug-diffutils@gnu.org; Thu, 20 Feb 2025 23:48:23 -0500
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tlKxS-0008Br-2V
 for bug-diffutils@gnu.org; Thu, 20 Feb 2025 23:48:14 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=MIME-Version:Date:From:To:Subject;
 bh=D2d9n9rBzqNHdHbMqy+iKY2Walr4ovkn14AGV+zx+NI=; 
 b=vCKGfCM7Bj+0O+xA+YgIM2VGf7UST5mkd32Scy3OUCbNny84nSxE/5kQRH4TbpC5U+61A+TVGGPSd4LRwLlH1naJo31AGFBkpjLNsLGIKYEFkshZ3MGxW/IefTH8e63MI/glt0axHPJDfeg3ZRNbsIh4tqXyCZEpd3fty7SJJf/JI2PqyBR+MHjx7WOwlofKKvDfiN0tQgrZ3vAfH7qkgf/0hqMol3yuR7ZGQDjuj7WJGIsLpkmCTpYzLvjySqjEVYxURlJxcYfyGgh29rCVXnpddMYSlZrf6CMwjMYNLcrDcKpZgWfE2c+ujsq9hdu26RwM+esqe40jbYRrnUZDnQ==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tlKxR-0001oe-OA
 for bug-diffutils@gnu.org; Thu, 20 Feb 2025 23:48:13 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Kate Deplaix <kit-ty-kate@outlook.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Fri, 21 Feb 2025 04:48:11 +0000
Resent-Message-ID: <handler.76454.B.17401132646685@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 76454
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 76454@debbugs.gnu.org
X-Debbugs-Original-To: "bug-diffutils@gnu.org" <bug-diffutils@gnu.org>
Received: via spool by submit@debbugs.gnu.org id=B.17401132646685
 (code B ref -1); Fri, 21 Feb 2025 04:48:11 +0000
Received: (at submit) by debbugs.gnu.org; 21 Feb 2025 04:47:44 +0000
Received: from localhost ([127.0.0.1]:49195 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tlKwv-0001jK-Tb
 for submit@debbugs.gnu.org; Thu, 20 Feb 2025 23:47:43 -0500
Received: from lists.gnu.org ([2001:470:142::17]:59394)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <kit-ty-kate@outlook.com>)
 id 1tl9aX-0005XL-94
 for submit@debbugs.gnu.org; Thu, 20 Feb 2025 11:39:49 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <kit-ty-kate@outlook.com>)
 id 1tl9aO-0001jF-F7
 for bug-diffutils@gnu.org; Thu, 20 Feb 2025 11:39:41 -0500
Received: from mail-uksouthazolkn190100000.outbound.protection.outlook.com
 ([2a01:111:f403:d204::] helo=LO3P265CU004.outbound.protection.outlook.com)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <kit-ty-kate@outlook.com>)
 id 1tl9aM-0003vK-Je
 for bug-diffutils@gnu.org; Thu, 20 Feb 2025 11:39:39 -0500
ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;
 b=geBZjfM/5yOQYstWOAN7nm6QC0W2a78ArYhLQezC2Xrid80qqKeahXvnTA/VNImCp+2iNMtvrGegFAcD7MXTUamOABKIwzs2/qXNBRIUTPB3I2zGaH193K6JlvaIuSl9k1ClY3p6XhUgwXDHDxk1p2VkHjyPjRGMx8xVV2SnB1NJTR/tGtYA7XZucSYMsdNQVOVn8qvdu1Dkc6wM/Mecl0PW4nTXhU20ldQXIPCuT8bosaRTX53UwjcQje7Vet4LtRpyyk82+Ztm4s9QA4GuKjP7KRMCeKqfsI4y83NQ7Fk7EMbHwqPd+PuSAOVi6FkldiO98mlJTUgXEzCOlmgtMQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; 
 s=arcselector10001;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
 bh=D2d9n9rBzqNHdHbMqy+iKY2Walr4ovkn14AGV+zx+NI=;
 b=lE4HmK5az0/b8+MwAqop+FvjP8IPxq1Cjf83NQY7GbVX4CJLVqAzaNTgIqqf6Ke5Ir9niQZwrR619IxZQUa13b7KE6xeIoUpVooNeFJTQ0tJSY0apI3zQKozO6XkPP+9HoKYLaN5nEZd+zwujoDkJj4GDa/ZLmYWFaeZGrI/RYwUY6iGsaZQAVH+4Xyc0+3/H0K+oJ7QgLvee4owg58Yk/ws30mABUtlWNkTpWVMYLhK/iloauU2QDApIYfSBaDEZ1yTWceVjjU82iY0hcj+m0qiecdiiIff/jYn69zUSW8aVWy+pC5jmlfqOdlQFjPFx9wgOje3TA19cKBARpzVUQ==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none;
 dkim=none; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com;
 s=selector1;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
 bh=D2d9n9rBzqNHdHbMqy+iKY2Walr4ovkn14AGV+zx+NI=;
 b=hXCcjPTwrY/z4dSAvrStUixy5sysWgJCCHhuBNKTZCF/wna4/1F+ZdEJcajjURC+cxfQKVb74/dzKgk1TNd68/OzEKBa19D+Xkrn76U9S+DzjvO+gET5TgagzOM/Agx1UquIn1dQKyhn+bC6BX5ZeggMKvaIUQq7UQ/By/CnsljkmDG+ugFHqzHGrdMdE6opPD0MUz65aYRM2YuipD7+JC/3RK1YqKo/LKKfI6BDZx4/qDi4s4Idlv5yZBnt4JtrfP7I1HGIRWBGcYBVPtlXG6GD9DIVXfoWdVVnWP9sBO8pJ5Tlv7hXFOL8ylAgh5NCu5ciAf63KZ5dKekO+CbzZg==
Received: from CWLP265MB4157.GBRP265.PROD.OUTLOOK.COM (2603:10a6:400:12c::9)
 by LO2P265MB3642.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:1b7::13) with
 Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.16; Thu, 20 Feb
 2025 16:39:35 +0000
Received: from CWLP265MB4157.GBRP265.PROD.OUTLOOK.COM
 ([fe80::4f37:8f32:e4a6:e624]) by CWLP265MB4157.GBRP265.PROD.OUTLOOK.COM
 ([fe80::4f37:8f32:e4a6:e624%6]) with mapi id 15.20.8466.016; Thu, 20 Feb 2025
 16:39:35 +0000
From: Kate Deplaix <kit-ty-kate@outlook.com>
Thread-Topic: 3.11 critical bug: diff -Naur a b does not show a unified diff
 when one of the file is empty
Thread-Index: AQHbg7Whc5FnwLXLjUqiiDxrmje+qA==
Date: Thu, 20 Feb 2025 16:39:35 +0000
Message-ID: <CWLP265MB41574433E900376660252618BCC42@CWLP265MB4157.GBRP265.PROD.OUTLOOK.COM>
Accept-Language: en-GB, en-US
Content-Language: en-GB
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
msip_labels: 
x-ms-publictraffictype: Email
x-ms-traffictypediagnostic: CWLP265MB4157:EE_|LO2P265MB3642:EE_
x-ms-office365-filtering-correlation-id: 21b7c730-c46b-4321-b9eb-08dd51cd28c8
x-microsoft-antispam: BCL:0;
 ARA:14566002|15080799006|461199028|8060799006|15030799003|8062599003|19110799003|102099032|440099028|3412199025;
x-microsoft-antispam-message-info: zLl7FU/eu3oM9J+fzlP72W+qTsDseGC4HNj4mAH7B1FQ1JXczU43KniyPY/JhmGHjT3zDt4GjdREKCHGj4ODOpNW9/BHOqX8ZxxrH+NG+2dX9lWAadJGig8UMW0GvkyIhd3FRicUrCSUePv5UE5W45iwIYts2vRgmA90yFODG+llYSepPGZRK5xo7BVlt5f3r/uupFNziSgIE3yRIaYl06g2UedwPK/moWmMRByt+eP7hsWzavLokZWBCxERCIDYaH5Q7CpTI3M612BEoaNwHjEy2Xtjh4jk1AjNQdfEjGZlkvm6ZpEVeeftaLNarNuJl7nI5JFW46y92wjlQd5fstzc/7HTpZ48aSiuvqZT9t/PkaNnaYEtQVGgM95GJqciqxAOJBL1dELIGft8pEqe3xP/3Qqz+heaoa5a/5kI4+QZvKbCbarhFVK4E+L6tEZyRACNDBdWVrk3GckjJbl8fxDSpdJ7uNrP43qMZiM2Md05ZWqJYg4eb1hxqVuzYaWBhAUWHmbAWU/RfHrEZp4ARlfISOZDFr1X3Ptl999v7jtay06ZOA0Af109t413yhqDmJbMVMkK7lW3Gn4jpiTNTFWKYVGXN8dFMn7QQIgF39Qv0rqNGkjRA79acdo6PamecV9tcWO1TY1GVXbE7O+yIdvWkPf6vTp13Ie5r6O2JXD5aWfJmZm4d0tGBsyyc5lYr4LIywrgRDjX6k4xztJqpO0BF6KZniKgmG/tNrlF2er6x0fqNS1dua/iQU7OUNTSmDL0IF0h+5TGzCycuS0bXZA7fzIqCAlVTaHeiyjKLiI/JxcjALjNGb6bwBgJQJA+55GN5Y/UmYy3NvHdLibcytdGkrN171GrjDywyEPAQ26z0bTar3/526+sU0z+0jqSV8IG8XBQBcnFjSW4ezU7DQyTvfrtivWL6sDkaFmwrsRVJcOqnCZYfvL2LzIL+yvtKCSOtJDBS5Q60bkUnCoLnO86wBPJg3nRTT7ZUMkZrKWQc2IBCdLZ/MXozw8IXLDeTvZ/kMgSc6b+4ElAHZB7lNSP8wdh6sQoeKyU7ZpIdAJ0VQ7/CAFaeQ8e/IOUInBHNHKmK6l5Yb1sF29gVD8gpA==
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: l9kEfu3u3MSgb9tYJzbfxEHop/3Gmp6KYroCzIY6x0U/rW10DuJgWHNWTuCv+UMKMx+vLccTtDuLcK+dnBp9r7IgVtnAxk8xnvZXXLg6lyWFjSpfvLK731WqfVMUmtOZFXMESxcfYbM+y4RHD1v9fcWsgRo/nvfzvC+F+O4vu//IQkRAVCC8P0VKGPNerdRHus24ccdYN0GXtSEOFqZQf/GsQ/EEyz6IElyksYGgQ3q2ZKVmryd0OS47DaCuSEr6682/xjHeJKpaN6wBOdG6VNkDd3sY/VmVyB9sFlZAhFc9v+4Y7jIk7la2DG+ydz3NgBWCf+JDx5cT5BLqYGq+TQuLTkBRGquVgKbSttFFkbXZCmuzyM7b2VfhnhRHrkMBySzW4+CSgzFFlMRdzBvn/GR5n/YhGGvB5WsKadalZFMDFYvpeHHZ8ShcXEUIaSGnBqe5u4Uyj10x8g1S/4HBtONm6HU+p+PSxWhA3tm0TDl1q6qr9nAkBhQioeIhXsDhJaX4f8w9veTuWvZROmPvF3jS7exGGeBV7NWt4q+sZ0vkQVHO2k2O3z/OjT+32ADPMgPnJ9vooYwCK6SCOInaXhbuWxgKE4LVhaLHUc8o9esEGXyA467KMtSZkuO//cDPsVMRTa1Et53mVFX4wc15nD1SqsCDI8Nire93SMgfP8wVK2/W6icfeMekjhMkTN+THkaEXfFGb5H3kAyT3bljxzu6Uh7GrvvSCFPZcB/38FlRpgQc6fcoPV9wssirTsmnn/651jo03rS0WtRlV9pWBjE+RZgR4hMlnVEWHZEPlsjl257d5bv7O61CaQfoMS+Jki31qlA7+dldaomPavBIYI7+11F8Jx4ip5BCKSINxSdDIYe3MGjyR8vzzsCZhpEolIT/GZB0floKRXkZjvzpOPReBk73wluJxWc34QoMwmtK3uLIH476WE+haK32sgMVzIp+mxuS8Zwrkgvt18GkwsraGHsryfKXRl5s/baNJMbOtOaPdIRdwTBG/nnVrzQoTvagRk8dHMXaUfSwq8I+TpZGup4+YBjTkasLEnALy0+iBz1AF4XRHbLUBRbaoj079hhU61sUgWRpAAsn9EKws61OSjE7//0L+7yWf6sjZBlwbjdPUZ2uMgHfEaBVcfHWlM3nu1vLFi4Gh+e7SWWrwGM59VHxLDEcUcDBRGlgXmXP4T8JNJOE0Nw0ODS+017aJOsxZMLr0Vy15JIakYyNo7g0UKGTF2sW23nrXYDFwRT1F4m+gTLqd40OLUmL9g6vgW5f18VnJxQ6moWulkkb+YIWUmsm1mPjUMwl8aFwEr8=
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
MIME-Version: 1.0
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: CWLP265MB4157.GBRP265.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-CrossTenant-Network-Message-Id: 21b7c730-c46b-4321-b9eb-08dd51cd28c8
X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Feb 2025 16:39:35.0377 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LO2P265MB3642
Received-SPF: pass client-ip=2a01:111:f403:d204::;
 envelope-from=kit-ty-kate@outlook.com;
 helo=LO3P265CU004.outbound.protection.outlook.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, 
 SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.0 (+)
X-Mailman-Approved-At: Thu, 20 Feb 2025 23:47:36 -0500
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -0.0 (/)
Subject: [bug-diffutils] bug#76454: 3.11 critical bug: diff -Naur a b does
 not show a unified diff when one of the file is empty
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Feb 2025 04:48:26 -0000

SGksCgpXaGlsZSB1c2luZyBkaWZmdXRpbHMgMy4xMSBpbnN0ZWFkIG9mIDMuMTAsIGkndmUgbm90
aWNlZCBhIGNyaXRpY2FsIGJ1ZyBpbiBkaWZmIHJlcHJvZHVjaWJsZSB3aXRoIHRoZSBmb2xsb3dp
bmcgc2V0dXA6CgokIGNkIC90bXAKJCBta2RpciBhIGIKJCB0b3VjaCBhL3Rlc3QKJCBlY2hvIGNv
bnRlbnQgPiBiL3Rlc3QKCldpdGggZGlmZnV0aWxzIDMuMTAsICJkaWZmIC1OYXVyIGEgYiIgcmV0
dXJuczoKCmRpZmYgLU5hdXIgYS90ZXN0IGIvdGVzdAotLS0gYS90ZXN04oCC4oCC4oCCMjAyNS0w
Mi0yMCAxNDo1MDowNy44NzAyNTgwNTIgKzAwMDAKKysrIGIvdGVzdOKAguKAguKAgjIwMjUtMDIt
MjAgMTQ6NTA6MTguOTU3Mjg3NjQxICswMDAwCkBAIC0wLDAgKzEgQEAKK2NvbnRlbnQKCmJ1dCB3
aXRoIGRpZmZ1dGlscyAzLjExLCB0aGUgc2FtZSBjb21tYW5kIHJldHVybnM6CgpGaWxlIGEvdGVz
dCBpcyBhIHJlZ3VsYXIgZW1wdHkgZmlsZSB3aGlsZSBmaWxlIGIvdGVzdCBpcyBhIHJlZ3VsYXIg
ZmlsZQoKR2l2ZW4gbm8gbWVudGlvbiBvZiB0aGlzIGNoYW5nZSBhcHBlYXIgaW4gdGhlIGNoYW5n
ZWxvZywgaSdtIGd1ZXNzaW5nIHRoaXMgaXMgYW4gdW5pbnRlbmRlZCBjaGFuZ2UuIEluIG15IG9w
aW5pb24gdGhpcyBidWcgaXMgY3JpdGljYWwgYW5kIHRoZSAzLjExIHJlbGVhc2Ugc2hvdWxkIGJl
IG1hcmtlZCBhcyBicm9rZW4gdG8gYXZvaWQgbW9yZSBkaXN0cmlidXRpb25zIHVzaW5nIGl0LgoK
V2FybSByZWdhcmRzLApLYXRlIERlcGxhaXgK




From MAILER-DAEMON Fri Feb 21 01:11:05 2025
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1tlMFc-000676-TP
	for mharc-bug-diffutils@gnu.org; Fri, 21 Feb 2025 01:11:04 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tlMFa-00066r-Vs
 for bug-diffutils@gnu.org; Fri, 21 Feb 2025 01:11:03 -0500
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tlMFa-0000oy-IR
 for bug-diffutils@gnu.org; Fri, 21 Feb 2025 01:11:02 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=MIME-Version:Date:References:In-Reply-To:From:To:Subject;
 bh=OQqtbzPuUfjZcTHHS0FqN7ZibcRM6wD4OvUKPsos1ys=; 
 b=YfPTl6yXG3BjrODDYaB9kSE0jD4GcptWogV6JFdJe7mbuT11oyJlR6jwimnjkCti0Jy1er4XwTQrG4FQlweqDfxHVYXR/HHcjC8H3bIvXgNUhCDA+85vHmpCuIIAw6AmjDmpHjo8YZtnJ+da+RDFwqIu8dD9dpx1N6Tn8ysPVfCn5EsuV831T8PJKJlYNzsdMu8EVTjh6g+zbY9VNpzktKFzW1vC6F7EvMkrm2cVFh2v6cCdrcFg8T3muYBf69kF5lEZRokYaNgxLCR31GHoptMqj//mpdFCqQCVUlDyXgfVAxBi2/Dvl37BX1w/yXFWPFSDVi5w//SaQmJj5IgN3g==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tlMFa-00064s-6u
 for bug-diffutils@gnu.org; Fri, 21 Feb 2025 01:11:02 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Collin Funk <collin.funk1@gmail.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Fri, 21 Feb 2025 06:11:02 +0000
Resent-Message-ID: <handler.76452.B76452.174011826023342@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 76452
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Kate Deplaix <kit-ty-kate@outlook.com>, Paul Eggert <eggert@cs.ucla.edu>
Cc: 76452@debbugs.gnu.org
Received: via spool by 76452-submit@debbugs.gnu.org id=B76452.174011826023342
 (code B ref 76452); Fri, 21 Feb 2025 06:11:02 +0000
Received: (at 76452) by debbugs.gnu.org; 21 Feb 2025 06:11:00 +0000
Received: from localhost ([127.0.0.1]:50373 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tlMFW-00064A-G0
 for submit@debbugs.gnu.org; Fri, 21 Feb 2025 01:11:00 -0500
Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]:49352)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.84_2) (envelope-from <collin.funk1@gmail.com>)
 id 1tlMFT-00062v-KH
 for 76452@debbugs.gnu.org; Fri, 21 Feb 2025 01:10:56 -0500
Received: by mail-pl1-x62a.google.com with SMTP id
 d9443c01a7336-22113560c57so33943155ad.2
 for <76452@debbugs.gnu.org>; Thu, 20 Feb 2025 22:10:55 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1740118249; x=1740723049; darn=debbugs.gnu.org;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=OQqtbzPuUfjZcTHHS0FqN7ZibcRM6wD4OvUKPsos1ys=;
 b=Yr2HI2Y0ZAn2ZB1vrflK8Lmp7ae+gd/fyP5+TYpUg727vkSiExEusDTrQueytla6cT
 ZSwLK2faKgs6o9im/Lxscla9dVeNx8CBa6fNgD8LrJ/dKddhL4vRi4lQU9Qznd2Xl6q2
 NJ7GGiKw+tV09S/Tog3Lv4bSTJZjPtTh8T4lAMHpSMBFmwDtaOr8Sb+VnRlmJ4CmQG0i
 ojHGvsNAVvqKixABpuSAIMxmzedbm1Cp/L+QsCCmWY50biQRDHs6Ul8eGUCmfHwA2Eic
 d9NKzEMggEkXHTmvTApAxzBEj3xYNt9FQw5vQpXUxBI6ywyShPWB80kmD89E7PGF4Ix4
 5Zpw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1740118249; x=1740723049;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
 :message-id:reply-to;
 bh=OQqtbzPuUfjZcTHHS0FqN7ZibcRM6wD4OvUKPsos1ys=;
 b=HUshLsiEoSOGTFBU3b1R7EGNibIn8iY9KY0si3yNfcgrIrksmLDsQsrBe90zDb8HrD
 Ow97luzFc0NIlnS8l2VsJ0g+TSr4hopa0jHZV1prbYNaz3GY4Hu63BVeDRNWAJg+Es9x
 rbfNkedUG4fZIOVMpIxSGHUgaOXKe7UsvZ1nXP/3tisWLJ/O7v7IoblqwNV93LPDa69+
 hscwZpORScN+WI8fLL9FOvfDjBbrfXX+UfFiPorTlEJ+OOLFePhp8kHhaS0WQKklYVGQ
 RnO+D7Ar3HhmXYh5w6Hb10GpD6bX2A5fw9okH2cd8TLPEzl3euEMJQxEyQEDzYEHALDR
 3XXw==
X-Gm-Message-State: AOJu0YySIRvRfBWcZlPrDpbX6xQ+upEijVv969g4iQPfjyE0C1zQWgPn
 SN6i2BkQqdCZQGFPm7bLPXva0NN5D/4ag2l0Aos1eb5PSbK0lTgqTka/Quzf
X-Gm-Gg: ASbGncv446wNTd97ZLMMspSrzgZ1kZG32jpwhqj5bIlg68+iTArF7XnTPaQUa0NhAYm
 Tk37WzFuYJqmTbbD9E7P3AP2ymkhLEUK/vfkkCY66cCuPezqkOVc1QEh3eFq1TeAlgFZ2t4gxzx
 F/pufMvG7O9OwlWBzIlXeK99MeLcNK6SEXS2EPPGfi2foZZQ5D+lUQf/VUaI3XAvXt3YpbXWlxy
 OMPzgWPBPvzKKYXQ96csd64u926KD1ONsMUb43cbsnkByIrN5L3gp+j5hSgZrVaBY77LkYPSbCI
 9H5r8utxuQp9IwrrMdiuAy2z5cVKb2BbNLeHD5s8w0ZFpZKP/k++7Fk=
X-Google-Smtp-Source: AGHT+IHJKGV+QCYsYORG7nWr6yyZFTWSEwcXMDl1niab7QzEbO/tQVAGgRQ5/yhRujIDgXfmBTng6Q==
X-Received: by 2002:a17:902:d2c9:b0:221:f61:14c3 with SMTP id
 d9443c01a7336-221a0ed8294mr24882105ad.18.1740118248821; 
 Thu, 20 Feb 2025 22:10:48 -0800 (PST)
Received: from fedora (c-73-93-224-2.hsd1.ca.comcast.net. [73.93.224.2])
 by smtp.gmail.com with ESMTPSA id
 d2e1a72fcca58-732634d89bdsm11357809b3a.81.2025.02.20.22.10.46
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Thu, 20 Feb 2025 22:10:47 -0800 (PST)
From: Collin Funk <collin.funk1@gmail.com>
In-Reply-To: <CWLP265MB4157FEE87F56A0B0234CDF2CBCC42@CWLP265MB4157.GBRP265.PROD.OUTLOOK.COM>
 (Kate Deplaix's message of "Thu, 20 Feb 2025 15:25:05 +0000")
References: <CWLP265MB4157FEE87F56A0B0234CDF2CBCC42@CWLP265MB4157.GBRP265.PROD.OUTLOOK.COM>
Date: Thu, 20 Feb 2025 22:10:44 -0800
Message-ID: <87v7t3rfob.fsf@gmail.com>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Spam-Score: 0.3 (/)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -0.7 (/)
Subject: [bug-diffutils] bug#76452: bug#76452: 3.11 critical bug: diff -Naur
 a b does not show a unified diff when one of the file is empty
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Feb 2025 06:11:03 -0000

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

Hi Katie,

Kate Deplaix <kit-ty-kate@outlook.com> writes:

> With diffutils 3.10, "diff -Naur a b" returns:
>
> diff -Naur a/test b/test
> --- a/test=E2=80=82=E2=80=82=E2=80=822025-02-20 14:50:07.870258052 +0000
> +++ b/test=E2=80=82=E2=80=82=E2=80=822025-02-20 14:50:18.957287641 +0000
> @@ -0,0 +1 @@
> +content
>
> but with diffutils 3.11, the same command returns:
>
> File a/test is a regular empty file while file b/test is a regular file

Good catch.

CC'ing Paul Eggert since I think that I found the cause and it appears
unintentional to me.

Commit e016d12581ac4ea6be1ded88279527ceface74e1 has the following
ChangeLog:

    diff: improve symlink handling, avoiding a race
    [...]
    (compare_prepped_files): Use filetype and stat macros, not detype.
    [...]

Where filetype refers to a constant string returned by Gnulib's
c_file_type function. The relevant lines are here:

  if (S_ISREG (st->st_mode))
    return st->st_size =3D=3D 0 ? N_("regular empty file") : N_("regular fi=
le");

So empty files will be treated as different file types because of that
change.

I have attached a patch to check for this condition.

Collin


--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment;
 filename=0001-diff-don-t-treat-empty-files-as-a-different-file-typ.patch

>From 7d4c55202ec4c0366062ff03d27a4883861ff222 Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.funk1@gmail.com>
Date: Thu, 20 Feb 2025 21:59:55 -0800
Subject: [PATCH] diff: don't treat empty files as a different file type

Reported by Kate Deplaix <kit-ty-kate@outlook.com> in
<https://lists.gnu.org/r/bug-diffutils/2025-02/msg00005.html>.

* src/diff.c (compare_prepped_files): Check for two regular files where
one has a zero size and the other has a non-zero size.
---
 src/diff.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/diff.c b/src/diff.c
index fa6100e..0c41fd2 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -1226,7 +1226,10 @@ compare_prepped_files (struct comparison const *parent,
   if (toplevel
       ? (!S_ISLNK (cmp->file[0].stat.st_mode)
 	 != !S_ISLNK (cmp->file[1].stat.st_mode))
-      : (cmp->file[0].filetype != cmp->file[1].filetype
+      : ((cmp->file[0].filetype != cmp->file[1].filetype
+          && !(S_ISREG (cmp->file[0].stat.st_mode)
+               && S_ISREG (cmp->file[1].stat.st_mode)
+               && (!!cmp->file[0].stat.st_size == !!!cmp->file[1].stat.st_size)))
 	 || ! (S_ISREG (cmp->file[0].stat.st_mode)
 	       || S_ISLNK (cmp->file[0].stat.st_mode)
 	       || S_ISCHR (cmp->file[0].stat.st_mode)
-- 
2.48.1


--=-=-=--




From MAILER-DAEMON Fri Feb 21 01:40:10 2025
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1tlMhk-000825-Qf
	for mharc-bug-diffutils@gnu.org; Fri, 21 Feb 2025 01:40:09 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tlMhh-0007vW-Fz
 for bug-diffutils@gnu.org; Fri, 21 Feb 2025 01:40:06 -0500
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tlMhh-0004RF-1v
 for bug-diffutils@gnu.org; Fri, 21 Feb 2025 01:40:05 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=MIME-Version:Date:References:In-Reply-To:From:To:Subject;
 bh=3KmP8y1dAxXvPM+qAp0bs2m47P429zkTnJMa9f8dkvQ=; 
 b=g6unRG/Qg/FgB6eE5/seZ5Fh9UnLi2M9OaEggbd9d7XsyDOtJ2hxtF1pGq7Mt8NP1Vh/JeLr/tQJY+pIvnNkun9YrFjSj6q45OWZ1HFhUkyDd5OH5A8GuGqgfmaJKe0pSd14aHkUvzwI+JlRc7v7ERhXhOftwx1QSuRuXKN/RTePjTAnEN0mJ3SiT/t9flr60HBlJH0ioNV0NNN6qKC+tkwe4aGXmhYRg1kLxk9hDkm+urpAhBBT1NEpvsm3STzlDH2QwI5DKeyvY6900kb4d9z0JwQFJ4lMgNEC7lCuz99AlKYiDQrW5HYXYjHWSFi5F7DCdgzq7jsHqTNz68tJog==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tlMhg-00025F-HA
 for bug-diffutils@gnu.org; Fri, 21 Feb 2025 01:40:04 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Collin Funk <collin.funk1@gmail.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Fri, 21 Feb 2025 06:40:04 +0000
Resent-Message-ID: <handler.76452.B76452.17401199947885@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 76452
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Kate Deplaix <kit-ty-kate@outlook.com>
Cc: Paul Eggert <eggert@cs.ucla.edu>, 76452@debbugs.gnu.org
Received: via spool by 76452-submit@debbugs.gnu.org id=B76452.17401199947885
 (code B ref 76452); Fri, 21 Feb 2025 06:40:04 +0000
Received: (at 76452) by debbugs.gnu.org; 21 Feb 2025 06:39:54 +0000
Received: from localhost ([127.0.0.1]:50781 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tlMhV-00022y-2G
 for submit@debbugs.gnu.org; Fri, 21 Feb 2025 01:39:54 -0500
Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]:52240)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.84_2) (envelope-from <collin.funk1@gmail.com>)
 id 1tlMhS-00021h-7p
 for 76452@debbugs.gnu.org; Fri, 21 Feb 2025 01:39:51 -0500
Received: by mail-pl1-x62c.google.com with SMTP id
 d9443c01a7336-22100006bc8so30958285ad.0
 for <76452@debbugs.gnu.org>; Thu, 20 Feb 2025 22:39:50 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1740119983; x=1740724783; darn=debbugs.gnu.org;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=3KmP8y1dAxXvPM+qAp0bs2m47P429zkTnJMa9f8dkvQ=;
 b=W4i7U+FAWhvsnpD9ByjcNgKQqqwH2C0+fc+5JFIrrY8Ea2QyzlXLXmUkqV2IP5iStI
 DfBy5nGEzMABjN5TmFO8sCpPzBlcgGBHEeDuWfQOqIWojGUSzt/8UYM7dNzrthxy1Uu/
 vLSbik/fDZXFCPm8Wfln0/NT7PkeUNXGj8C7pmnupcCclsO+moEDIQ8lbIY6MqvNrM3i
 lRBCKOPJEqwIB2lsD5tjrzpOswUHVYmAgv+ln45vXCh6/1y2dj+mS3NIWkv8z2d+s+pF
 cD4vqPKSibY8HcRMG8Ysey4Bk3Y3om58jn+rjwYtuj0PA8bX71a+4m+e+EbA++tWn+O8
 Qobw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1740119983; x=1740724783;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
 :message-id:reply-to;
 bh=3KmP8y1dAxXvPM+qAp0bs2m47P429zkTnJMa9f8dkvQ=;
 b=eB3dZxa1EnP1DLApBFOAE6Tvh/H4mvq5o0dxY/DNxtyUh1gGL4yUJZ10We3J76Fthz
 I7jcXJ/QGJdiObME15Ln29YFEfNqRxEVVdMD3I590pHH1gh+AG/9Pwi9p4K+zzWgBzws
 V9iY1lut05EDhEFoYArvHAXB1Ia0+Nq6pcLb2VmwpjP7jnlGHm1tS3NEVAy8IfvyKwb8
 d/HvUjyEvuZe4TqOuHtZlpuX/Kg5+zq5PWfny4+6e29u3oXFw7tXJhiszJuO/XiUFtYX
 B7qo+MS31eCqpR2IAVvTieKi69w2mTgmHIMGxoq7BHuJsI0PCTfd6TOZiNrKeRa6mxh9
 VMAw==
X-Forwarded-Encrypted: i=1;
 AJvYcCUFyGIafGlQYN3YUcc6LtzK15FVGv6MZJXGC50fXd6m+9BZp+6+DVFdE5/d2nU0JtG3kC+h2g==@debbugs.gnu.org
X-Gm-Message-State: AOJu0Yw6M6iRxtqTajNrCjBBVF7jvhx4GaiXBwkqgnt1CkhO6d7wXuWY
 K+RKfn/ha5C6WmMYjoyP0zWKqUJPXSo9njbCGXKj/XwIZqySFHgSqSKxX8Wl
X-Gm-Gg: ASbGncv38CIARo76yidgb9SjzPKyPrPMLRmBJjzd/TgEIIiJaouqef1+VOQxvxMq2gW
 w0F2gaKitg2BHhwWTxwLszPFCsNHklSH7mjoBhH4joqs9SWl8RI9srguhWZ0N7LZ+8eFaGYqUPa
 wxXtSb7ewCbjXHQ6u6MetOKdjv5u5HKpuICmvMb8HP9uunsQxla+fxqqw/G/THucJhHwVbKRxr4
 ucqM11nHM20eFG23rHUllckWYnzUK9jkVzJFfWENc00MpnmgrtZcagFhyDvb+pGLrM9drjy9j/s
 WK1Y1EpIfa2cafoqau7Los9rygqE3SkZGmAzBJp96wKFtuDlSdsEdfs=
X-Google-Smtp-Source: AGHT+IHIj3jssB0sPxP22ip7rHXmmeH04EtP8/KkBXUEATRgEWEMQqOmo+MfvPhokb0/UHZmICF2ew==
X-Received: by 2002:a17:902:f68c:b0:21f:2a2:3c8b with SMTP id
 d9443c01a7336-2219ff36066mr36014305ad.11.1740119982842; 
 Thu, 20 Feb 2025 22:39:42 -0800 (PST)
Received: from fedora (c-73-93-224-2.hsd1.ca.comcast.net. [73.93.224.2])
 by smtp.gmail.com with ESMTPSA id
 d9443c01a7336-220ddbadcbesm127429655ad.165.2025.02.20.22.39.41
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Thu, 20 Feb 2025 22:39:41 -0800 (PST)
From: Collin Funk <collin.funk1@gmail.com>
In-Reply-To: <87v7t3rfob.fsf@gmail.com> (Collin Funk's message of "Thu, 20 Feb
 2025 22:10:44 -0800")
References: <CWLP265MB4157FEE87F56A0B0234CDF2CBCC42@CWLP265MB4157.GBRP265.PROD.OUTLOOK.COM>
 <87v7t3rfob.fsf@gmail.com>
Date: Thu, 20 Feb 2025 22:39:40 -0800
Message-ID: <87msefrec3.fsf@gmail.com>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Spam-Score: 0.3 (/)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -0.7 (/)
Subject: [bug-diffutils] bug#76452: bug#76452: bug#76452: 3.11 critical bug:
 diff -Naur a b does not show a unified diff when one of the file is empty
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Feb 2025 06:40:07 -0000

--=-=-=
Content-Type: text/plain

Collin Funk <collin.funk1@gmail.com> writes:

> I have attached a patch to check for this condition.

Since it seems easy to overlook this in the future I have attached a
patch with the test case as well.

Collin


--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment;
 filename=0001-diff-add-a-test-case-for-the-recent-empty-file-bug.patch

>From 94fcd58f38beec6e591a86b67a57729951eaf108 Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.funk1@gmail.com>
Date: Thu, 20 Feb 2025 22:36:51 -0800
Subject: [PATCH] diff: add a test case for the recent empty file bug

* tests/empty-file: New file.
* tests/Makefile.am (TESTS): Add the test.
---
 tests/Makefile.am |  1 +
 tests/empty-file  | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100755 tests/empty-file

diff --git a/tests/Makefile.am b/tests/Makefile.am
index adbb10d..806cd3c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,6 +9,7 @@ TESTS = \
   cmp \
   colliding-file-names \
   diff3 \
+  empty-file \
   excess-slash \
   expand-tabs \
   help-version	\
diff --git a/tests/empty-file b/tests/empty-file
new file mode 100755
index 0000000..842a099
--- /dev/null
+++ b/tests/empty-file
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Test empty files
+
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
+
+fail=0
+mkdir a b
+touch a/test
+echo 'content' > b/test
+
+returns_ 1 diff -Naur a b >out || fail=1
+cat <<EOF > expected || framework_failure_
+diff -Naur a/test b/test
+--- a/test
++++ b/test
+@@ -0,0 +1 @@
++content
+EOF
+# Remove date and time.
+sed -e 's/^\([-+*][-+*][-+*] [^	]*\)	.*/\1/' out > k; mv k out
+compare expected out || fail=1
+
+Exit $fail
-- 
2.48.1


--=-=-=--




From MAILER-DAEMON Sat Feb 22 01:12:06 2025
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1tlikA-00086W-5t
	for mharc-bug-diffutils@gnu.org; Sat, 22 Feb 2025 01:12:06 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tlik7-00085z-Nu
 for bug-diffutils@gnu.org; Sat, 22 Feb 2025 01:12:03 -0500
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tlik7-0000rc-Fb
 for bug-diffutils@gnu.org; Sat, 22 Feb 2025 01:12:03 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=In-Reply-To:From:References:MIME-Version:Date:To:Subject;
 bh=ii4p2/aW6iuWDc0wmArMG+UdOiVcBwYXijabdBxAnKs=; 
 b=r1k6nx7w9r9QC0ToXD6WEWzoRWf/UsDlDZXY3faXgFm6yzpS5jqzyZdw9j3HBnnHgy9AVI1Q/U0jJHCSMfWZFKi/fGb8tRmLpLDNwpJ3YuADBxmsi7p4H/GVjFiqiliYKfOeOFpVdppYcF04qgbx6eI9gBnKAE2hkHM8MUkQ8vbX2cvYbIpCSC7w3SgH8TjTns6RTmMdrjAK5splvHHi4UUt+J4OpBmSgZ16arTadsw0qu8ZPK17J2I0Z0nBnbChDCQSQZ/IAmuam5sWxLQbJXN0/qyT8jtZ587XwCga826xCo6zHAPLmdlpKP8UEsVCtjakcJepp90Y+h5HlDMWKA==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tlik7-0007b2-9C
 for bug-diffutils@gnu.org; Sat, 22 Feb 2025 01:12:03 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Paul Eggert <eggert@cs.ucla.edu>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Sat, 22 Feb 2025 06:12:03 +0000
Resent-Message-ID: <handler.76452.B76452.174020472129182@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 76452
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Collin Funk <collin.funk1@gmail.com>,
 Kate Deplaix <kit-ty-kate@outlook.com>
Cc: 76452@debbugs.gnu.org
Received: via spool by 76452-submit@debbugs.gnu.org id=B76452.174020472129182
 (code B ref 76452); Sat, 22 Feb 2025 06:12:03 +0000
Received: (at 76452) by debbugs.gnu.org; 22 Feb 2025 06:12:01 +0000
Received: from localhost ([127.0.0.1]:44487 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tlik5-0007ab-4U
 for submit@debbugs.gnu.org; Sat, 22 Feb 2025 01:12:01 -0500
Received: from mail.cs.ucla.edu ([131.179.128.66]:33464)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <eggert@cs.ucla.edu>)
 id 1tlik2-0007ZI-He
 for 76452@debbugs.gnu.org; Sat, 22 Feb 2025 01:11:59 -0500
Received: from localhost (localhost [127.0.0.1])
 by mail.cs.ucla.edu (Postfix) with ESMTP id E8CFB3C011BD8;
 Fri, 21 Feb 2025 22:11:52 -0800 (PST)
Received: from mail.cs.ucla.edu ([127.0.0.1])
 by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10032) with ESMTP
 id h5iGaFttG4Wp; Fri, 21 Feb 2025 22:11:52 -0800 (PST)
Received: from localhost (localhost [127.0.0.1])
 by mail.cs.ucla.edu (Postfix) with ESMTP id AFDA13C011BDB;
 Fri, 21 Feb 2025 22:11:52 -0800 (PST)
DKIM-Filter: OpenDKIM Filter v2.10.3 mail.cs.ucla.edu AFDA13C011BDB
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.ucla.edu;
 s=9D0B346E-2AEB-11ED-9476-E14B719DCE6C; t=1740204712;
 bh=ii4p2/aW6iuWDc0wmArMG+UdOiVcBwYXijabdBxAnKs=;
 h=Message-ID:Date:MIME-Version:To:From;
 b=UJqJ3zercLDrhjEo0s16OAwtZr/QSEQQbfVANMwWvti8pi+WZat7yFhs4O/JYU6g7
 AwIdgnX2GO92aAVRnv/GEWQuXAZ/QFWxZvi9zd4fbWyxb7IxyNOflwr49pobzPY9KG
 KBAU1QCSaGhbpJJXo4dfQ7zBTmm3bl8JoZ0hvE5lS5P0mNsVVEKpfjx1OGtAq4HjAr
 EuzGF+LPiR7BiBciCppdu1Bxk0M+TxY3+ZL1TEGvb+CgWoW3eJCdoh9EUF6NbW/iiC
 4o7e5hOILOCA4eddPSMZS0rSSn3u2Jo2sCkvV49uUL47L3W9T4F+9cSSiwCxrwxPd0
 9KMSSAxtSceDA==
X-Virus-Scanned: amavis at mail.cs.ucla.edu
Received: from mail.cs.ucla.edu ([127.0.0.1])
 by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10026) with ESMTP
 id ycS0zNjYHAhU; Fri, 21 Feb 2025 22:11:52 -0800 (PST)
Received: from [192.168.0.23] (75-166-225-192.hlrn.qwest.net [75.166.225.192])
 by mail.cs.ucla.edu (Postfix) with ESMTPSA id 6721B3C011BD8;
 Fri, 21 Feb 2025 22:11:52 -0800 (PST)
Message-ID: <cd44759b-07c8-4703-9dc6-5ece3c4c85de@cs.ucla.edu>
Date: Fri, 21 Feb 2025 23:11:51 -0700
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
References: <CWLP265MB4157FEE87F56A0B0234CDF2CBCC42@CWLP265MB4157.GBRP265.PROD.OUTLOOK.COM>
 <87v7t3rfob.fsf@gmail.com> <87msefrec3.fsf@gmail.com>
Content-Language: en-US
From: Paul Eggert <eggert@cs.ucla.edu>
In-Reply-To: <87msefrec3.fsf@gmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Subject: [bug-diffutils] bug#76452: bug#76452: bug#76452: 3.11 critical bug:
 diff -Naur a b does not show a unified diff when one of the file is empty
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Feb 2025 06:12:03 -0000

On 2/20/25 23:39, Collin Funk wrote:
> Since it seems easy to overlook this in the future I have attached a
> patch with the test case as well.

Thanks, I installed that.




From MAILER-DAEMON Sat Feb 22 01:12:07 2025
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1tlikB-00086t-6f
	for mharc-bug-diffutils@gnu.org; Sat, 22 Feb 2025 01:12:07 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tlik8-000869-Ml
 for bug-diffutils@gnu.org; Sat, 22 Feb 2025 01:12:04 -0500
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tlik8-0000ri-CY
 for bug-diffutils@gnu.org; Sat, 22 Feb 2025 01:12:04 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=In-Reply-To:From:References:MIME-Version:Date:To:Subject;
 bh=e1oWSJC0lldFTLVtjbEMQfNLWViJEEbqT9EIsgPpRhg=; 
 b=Dw40XuCCdqI9AAN94ppO0GgDFxqN/QhIm+vzyYzvFC7f2iRtL15jOJqi0SiBraso6Xh5sjbmo6vqhQ1OeTnSJKqAUGaHV9Eqv6aV7Sq/51xD2TW9wYycJkjn8853hElKtw9MCTj0kYiUpWJbss70mPcQwiTntmgPCIv93ur7Z6MgQObm/gGvulXvHseZoeClbWTDLGFaU8WXat298f46BGm8xkrIciSy47EycB0VD+dce8hx+qv6YJUSJyzJByaysXE4bNkkBUSilsXEM2DLj3m5IArzfH8/C7MbNGYadASCLvIBbDVk5eB/5ig9GGQcAawU/PlkWiRSUSlZ4vJtgw==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tlik8-0007bH-6v
 for bug-diffutils@gnu.org; Sat, 22 Feb 2025 01:12:04 -0500
Resent-From: Paul Eggert <eggert@cs.ucla.edu>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-To: bug-diffutils@gnu.org
Resent-Date: Sat, 22 Feb 2025 06:12:03 +0000
Resent-Message-ID: <handler.76452.D76452.174020469628955.done@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: cc-closed 76452
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Collin Funk <collin.funk1@gmail.com>
Cc: 76452-done@debbugs.gnu.org, Kate Deplaix <kit-ty-kate@outlook.com>
Mail-Followup-To: 76452@debbugs.gnu.org, eggert@cs.ucla.edu,
 kit-ty-kate@outlook.com
Received: via spool by 76452-done@debbugs.gnu.org id=D76452.174020469628955
 (code D ref 76452); Sat, 22 Feb 2025 06:12:03 +0000
Received: (at 76452-done) by debbugs.gnu.org; 22 Feb 2025 06:11:36 +0000
Received: from localhost ([127.0.0.1]:44476 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tlije-0007Wj-La
 for submit@debbugs.gnu.org; Sat, 22 Feb 2025 01:11:35 -0500
Received: from mail.cs.ucla.edu ([131.179.128.66]:39782)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <eggert@cs.ucla.edu>)
 id 1tlija-0007VN-LB
 for 76452-done@debbugs.gnu.org; Sat, 22 Feb 2025 01:11:31 -0500
Received: from localhost (localhost [127.0.0.1])
 by mail.cs.ucla.edu (Postfix) with ESMTP id 3E1603C011BD8;
 Fri, 21 Feb 2025 22:11:24 -0800 (PST)
Received: from mail.cs.ucla.edu ([127.0.0.1])
 by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10032) with ESMTP
 id xyXnPobyD5XO; Fri, 21 Feb 2025 22:11:23 -0800 (PST)
Received: from localhost (localhost [127.0.0.1])
 by mail.cs.ucla.edu (Postfix) with ESMTP id BFECB3C011BDB;
 Fri, 21 Feb 2025 22:11:23 -0800 (PST)
DKIM-Filter: OpenDKIM Filter v2.10.3 mail.cs.ucla.edu BFECB3C011BDB
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.ucla.edu;
 s=9D0B346E-2AEB-11ED-9476-E14B719DCE6C; t=1740204683;
 bh=e1oWSJC0lldFTLVtjbEMQfNLWViJEEbqT9EIsgPpRhg=;
 h=Message-ID:Date:MIME-Version:To:From;
 b=PlJJSzS1iBL4XmaoqQkGS+/VtUICmE8laFZqef/YWS5tXNbEFMr32B++gk3wbbGye
 5iVxds4piuHa+fmR0YFvTbQU6HhSvmprPfskxD09XSQFcD8FJrZWQpuvozsqcaNIQg
 3Ws7DdqrVF/4KYiQqwCVrUpAXhe9xrdgHCuP1cm9frPeQici5lD5xNkfAe99fcRssl
 dS2t0iSrc0u3feZv97liHVP9JP8k13qUiz/UMa8xc8M9w+senBTGyUNiOSmdtW9VbC
 EBWtb9l+47+UuB5HHYK6ZlWwBFpL6aYi3VsBnnx9oo+j1vmjUd9TsD8LrPXfFgw6xh
 3BpVDVfsG4b7A==
X-Virus-Scanned: amavis at mail.cs.ucla.edu
Received: from mail.cs.ucla.edu ([127.0.0.1])
 by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10026) with ESMTP
 id KfPN8P_6GZnI; Fri, 21 Feb 2025 22:11:23 -0800 (PST)
Received: from [192.168.0.23] (75-166-225-192.hlrn.qwest.net [75.166.225.192])
 by mail.cs.ucla.edu (Postfix) with ESMTPSA id 64CB53C011BD8;
 Fri, 21 Feb 2025 22:11:23 -0800 (PST)
Content-Type: multipart/mixed; boundary="------------tf7XxNw2LCKKFhThYFPCHdMx"
Message-ID: <27b53198-137f-4e37-8f99-b539e365d4ff@cs.ucla.edu>
Date: Fri, 21 Feb 2025 23:11:22 -0700
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
References: <CWLP265MB4157FEE87F56A0B0234CDF2CBCC42@CWLP265MB4157.GBRP265.PROD.OUTLOOK.COM>
 <87v7t3rfob.fsf@gmail.com>
Content-Language: en-US
From: Paul Eggert <eggert@cs.ucla.edu>
In-Reply-To: <87v7t3rfob.fsf@gmail.com>
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Subject: [bug-diffutils] bug#76452: bug#76452: 3.11 critical bug: diff -Naur
 a b does not show a unified diff when one of the file is empty
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Feb 2025 06:12:04 -0000

This is a multi-part message in MIME format.
--------------tf7XxNw2LCKKFhThYFPCHdMx
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit

Thanks for the diagnosis and the patch. I installed the attached 
instead, so as to decouple this part of the code from the part that 
turns file types into strings.
--------------tf7XxNw2LCKKFhThYFPCHdMx
Content-Type: text/x-patch; charset=UTF-8;
 name="0001-diff-don-t-treat-empty-files-as-a-different-file-typ.patch"
Content-Disposition: attachment;
 filename*0="0001-diff-don-t-treat-empty-files-as-a-different-file-typ.pa";
 filename*1="tch"
Content-Transfer-Encoding: base64

RnJvbSA2Y2UwZWJkMDMzYzM5NTI2NWMyNjJhZTNhYWI2NDc3YTQ5ZDRjMmYxIE1vbiBTZXAg
MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1
PgpEYXRlOiBUaHUsIDIwIEZlYiAyMDI1IDIxOjU5OjU1IC0wODAwClN1YmplY3Q6IFtQQVRD
SF0gZGlmZjogZG9uJ3QgdHJlYXQgZW1wdHkgZmlsZXMgYXMgYSBkaWZmZXJlbnQgZmlsZSB0
eXBlCgpSZXBvcnRlZCBieSBLYXRlIERlcGxhaXggPGtpdC10eS1rYXRlQG91dGxvb2suY29t
PiBpbgo8aHR0cHM6Ly9saXN0cy5nbnUub3JnL3IvYnVnLWRpZmZ1dGlscy8yMDI1LTAyL21z
ZzAwMDA1Lmh0bWw+LgoKKiBzcmMvZGlmZi5jIChjb21wYXJlX3ByZXBwZWRfZmlsZXMpOiBE
b24ndCByZWx5IG9uIHN0cmluZwpmaWxlIHR5cGUsIGFzIHRoYXQgbWlnaHQgbm90IGFncmVl
IHdpdGggb3VyIGlkZWEgb2YgYSBmaWxlIHR5cGUuCi0tLQogc3JjL2RpZmYuYyB8IDI2ICsr
KysrKysrKysrKystLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTMgaW5zZXJ0aW9u
cygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL2RpZmYuYyBiL3NyYy9k
aWZmLmMKaW5kZXggZmE2MTAwZS4uNmUxYmJjNSAxMDA2NDQKLS0tIGEvc3JjL2RpZmYuYwor
KysgYi9zcmMvZGlmZi5jCkBAIC0xMjIzLDE0ICsxMjIzLDE0IEBAIGNvbXBhcmVfcHJlcHBl
ZF9maWxlcyAoc3RydWN0IGNvbXBhcmlzb24gY29uc3QgKnBhcmVudCwKICAgICAgdGhlIHR5
cGUgaXMgdW51c3VhbCwgdGhlbiBzaW1wbHkgcmVwb3J0IHRoZWlyIHR5cGUuCiAgICAgIEhv
d2V2ZXIsIGF0IHRoZSB0b3AgbGV2ZWwgZG8gdGhpcyBvbmx5IGlmIG9uZSBmaWxlIGlzIGEg
c3ltbGluawogICAgICBhbmQgdGhlIG90aGVyIGlzIG5vdC4gICovCi0gIGlmICh0b3BsZXZl
bAotICAgICAgPyAoIVNfSVNMTksgKGNtcC0+ZmlsZVswXS5zdGF0LnN0X21vZGUpCi0JICE9
ICFTX0lTTE5LIChjbXAtPmZpbGVbMV0uc3RhdC5zdF9tb2RlKSkKLSAgICAgIDogKGNtcC0+
ZmlsZVswXS5maWxldHlwZSAhPSBjbXAtPmZpbGVbMV0uZmlsZXR5cGUKLQkgfHwgISAoU19J
U1JFRyAoY21wLT5maWxlWzBdLnN0YXQuc3RfbW9kZSkKLQkgICAgICAgfHwgU19JU0xOSyAo
Y21wLT5maWxlWzBdLnN0YXQuc3RfbW9kZSkKLQkgICAgICAgfHwgU19JU0NIUiAoY21wLT5m
aWxlWzBdLnN0YXQuc3RfbW9kZSkKLQkgICAgICAgfHwgU19JU0JMSyAoY21wLT5maWxlWzBd
LnN0YXQuc3RfbW9kZSkpKSkKKyAgbW9kZV90IG1vZGUwID0gY21wLT5maWxlWzBdLnN0YXQu
c3RfbW9kZTsKKyAgbW9kZV90IG1vZGUxID0gY21wLT5maWxlWzFdLnN0YXQuc3RfbW9kZTsK
KyAgaWYgKHRvcGxldmVsID8gIVNfSVNMTksgKG1vZGUwKSAhPSAhU19JU0xOSyAobW9kZTEp
CisgICAgICA6IFNfSVNSRUcgKG1vZGUwKSA/ICFTX0lTUkVHIChtb2RlMSkKKyAgICAgIDog
U19JU0xOSyAobW9kZTApID8gIVNfSVNMTksgKG1vZGUxKQorICAgICAgOiBTX0lTQ0hSICht
b2RlMCkgPyAhU19JU0NIUiAobW9kZTEpCisgICAgICA6IFNfSVNCTEsgKG1vZGUwKSA/ICFT
X0lTQkxLIChtb2RlMSkKKyAgICAgIDogdHJ1ZSkKICAgICB7CiAgICAgICAvKiBQT1NJWCAx
MDAzLjEtMjAxNyBzYXlzIGFueSBtZXNzYWdlIHdpbGwgZG8sIHNvIGxvbmcgYXMgaXQKIAkg
Y29udGFpbnMgdGhlIGZpbGUgbmFtZXMuICAqLwpAQCAtMTI0NCw3ICsxMjQ0LDcgQEAgY29t
cGFyZV9wcmVwcGVkX2ZpbGVzIChzdHJ1Y3QgY29tcGFyaXNvbiBjb25zdCAqcGFyZW50LAog
ICAgIH0KIAogICAvKiBJZiBib3RoIGZpbGVzIGFyZSBzeW1saW5rcywgY29tcGFyZSBzeW1s
aW5rIGNvbnRlbnRzLiAgKi8KLSAgaWYgKFNfSVNMTksgKGNtcC0+ZmlsZVswXS5zdGF0LnN0
X21vZGUpKQorICBpZiAoU19JU0xOSyAobW9kZTApKQogICAgIHsKICAgICAgIC8qIFdlIGdl
dCBoZXJlIG9ubHkgaWYgd2UgYXJlIG5vdCBkZXJlZmVyZW5jaW5nIHN5bWxpbmtzLiAgKi8K
ICAgICAgIGRhc3NlcnQgKG5vX2RlcmVmZXJlbmNlX3N5bWxpbmtzKTsKQEAgLTEyOTUsNyAr
MTI5NSw3IEBAIGNvbXBhcmVfcHJlcHBlZF9maWxlcyAoc3RydWN0IGNvbXBhcmlzb24gY29u
c3QgKnBhcmVudCwKICAgICAgYW5kIHJlcG9ydCBmaWxlIHR5cGVzIG9mIGFsbCBvdGhlciBu
b24tcmVndWxhciBmaWxlcy4KICAgICAgUE9TSVggMTAwMy4xLTIwMTcgc2F5cyBhbnkgbWVz
c2FnZSB3aWxsIGRvLAogICAgICBzbyBsb25nIGFzIGl0IGNvbnRhaW5zIHRoZSBmaWxlIG5h
bWVzLiAgKi8KLSAgaWYgKCF0b3BsZXZlbCAmJiAhU19JU1JFRyAoY21wLT5maWxlWzBdLnN0
YXQuc3RfbW9kZSkpCisgIGlmICghdG9wbGV2ZWwgJiYgIVNfSVNSRUcgKG1vZGUwKSkKICAg
ICB7CiAgICAgICBpZiAoY21wLT5maWxlWzBdLnN0YXQuc3RfcmRldiA9PSBjbXAtPmZpbGVb
MV0uc3RhdC5zdF9yZGV2KQogCXJldHVybiBFWElUX1NVQ0NFU1M7CkBAIC0xMzExLDcgKzEz
MTEsNyBAQCBjb21wYXJlX3ByZXBwZWRfZmlsZXMgKHN0cnVjdCBjb21wYXJpc29uIGNvbnN0
ICpwYXJlbnQsCiAgICAgICBmb3IgKGludCBpID0gMDsgaSA8IG5fbnVtOyBpKyspCiAJc3By
aW50ZiAobnVtYnVmW2ldLCAiJSJQUklkTUFYLCBudW1baV0pOwogCi0gICAgICBtZXNzYWdl
ICgoU19JU0NIUiAoY21wLT5maWxlWzBdLnN0YXQuc3RfbW9kZSkKKyAgICAgIG1lc3NhZ2Ug
KChTX0lTQ0hSIChtb2RlMCkKIAkJPyAoIkNoYXJhY3RlciBzcGVjaWFsIGZpbGVzICVzICgl
cywgJXMpIgogCQkgICAiIGFuZCAlcyAoJXMsICVzKSBkaWZmZXJcbiIpCiAJCTogKCJCbG9j
ayBzcGVjaWFsIGZpbGVzICVzICglcywgJXMpIgpAQCAtMTMyMyw4ICsxMzIzLDggQEAgY29t
cGFyZV9wcmVwcGVkX2ZpbGVzIChzdHJ1Y3QgY29tcGFyaXNvbiBjb25zdCAqcGFyZW50LAog
ICAgIH0KIAogICBpZiAoZmlsZXNfY2FuX2JlX3RyZWF0ZWRfYXNfYmluYXJ5Ci0gICAgICAm
JiBTX0lTUkVHIChjbXAtPmZpbGVbMF0uc3RhdC5zdF9tb2RlKQotICAgICAgJiYgU19JU1JF
RyAoY21wLT5maWxlWzFdLnN0YXQuc3RfbW9kZSkKKyAgICAgICYmIFNfSVNSRUcgKG1vZGUw
KQorICAgICAgJiYgU19JU1JFRyAobW9kZTEpCiAgICAgICAmJiBjbXAtPmZpbGVbMF0uc3Rh
dC5zdF9zaXplICE9IGNtcC0+ZmlsZVsxXS5zdGF0LnN0X3NpemUKICAgICAgICYmIDAgPD0g
Y21wLT5maWxlWzBdLnN0YXQuc3Rfc2l6ZQogICAgICAgJiYgMCA8PSBjbXAtPmZpbGVbMV0u
c3RhdC5zdF9zaXplKQotLSAKMi4zNC4xCgo=
--------------tf7XxNw2LCKKFhThYFPCHdMx
Content-Type: text/x-patch; charset=UTF-8;
 name="0001-maint-mention-bug-76452-in-NEWS.patch"
Content-Disposition: attachment;
 filename="0001-maint-mention-bug-76452-in-NEWS.patch"
Content-Transfer-Encoding: base64

RnJvbSA3MDYxMTZjNjUxZmQ5YWJjOTI4NDUxNmI0N2NlYTZjZDUzNmM3YmNkIE1vbiBTZXAg
MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1
PgpEYXRlOiBGcmksIDIxIEZlYiAyMDI1IDIzOjEwOjA2IC0wNzAwClN1YmplY3Q6IFtQQVRD
SF0gbWFpbnQ6IG1lbnRpb24gYnVnIzc2NDUyIGluIE5FV1MKCi0tLQogTkVXUyB8IDYgKysr
KysrCiAxIGZpbGUgY2hhbmdlZCwgNiBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvTkVX
UyBiL05FV1MKaW5kZXggNWMyM2RhZi4uNzNkOThkNiAxMDA2NDQKLS0tIGEvTkVXUworKysg
Yi9ORVdTCkBAIC0yLDYgKzIsMTIgQEAgR05VIGRpZmZ1dGlscyBORVdTICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgLSotIG91dGxpbmUgLSotCiAKICogTm90ZXdvcnRo
eSBjaGFuZ2VzIGluIHJlbGVhc2UgPy4/ICg/Pz8/LT8/LT8/KSBbP10KIAorKiogQnVnIGZp
eGVzCisKKyAgZGlmZiAtciBubyBsb25nZXIgbWVyZWx5IHN1bW1hcml6ZXMgd2hlbiBjb21w
YXJpbmcgYW4gZW1wdHkgcmVndWxhcgorICBmaWxlIHRvIGEgbm9uZW1wdHkgcmVndWxhciBm
aWxlLgorICBbYnVnIzc2NDUyIGludHJvZHVjZWQgaW4gMy4xMV0KKwogCiAqIE5vdGV3b3J0
aHkgY2hhbmdlcyBpbiByZWxlYXNlIDMuMTEgKDIwMjUtMDItMDIpIFtzdGFibGVdCiAKLS0g
CjIuMzQuMQoK

--------------tf7XxNw2LCKKFhThYFPCHdMx--




From MAILER-DAEMON Thu Feb 27 12:59:06 2025
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1tniA6-0002lP-Mc
	for mharc-bug-diffutils@gnu.org; Thu, 27 Feb 2025 12:59:06 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tniA4-0002XC-1a
 for bug-diffutils@gnu.org; Thu, 27 Feb 2025 12:59:04 -0500
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tniA3-0004oB-Oa
 for bug-diffutils@gnu.org; Thu, 27 Feb 2025 12:59:03 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=From:Date:MIME-Version:To:Subject;
 bh=AvXOEXJDLvx5xdcpmZd3zsUJhxU0/AE5R+49ASmCwN0=; 
 b=PAfYGPy6Qiiji/PGTwBiZtR1PrLfZwlljvkkerqI55PsU6xkyRQ/rZ/00rGRpyeRDGiITmfWDBlSmcqdFVB3/Oqio1tSCzhRjU5ajeCOiknQAqWjYAagoZ+JXAUODHV1QDFL7c1g8aWTFevZN+LDBiEpy6KS7HEGgBPp/KoHjVcPkMZBX7QP5frWATi1JF5+rbu4QEXrK1uW9lc4HH7UmpiR3BnHZGM0NpkxqyHSX23oRf9GkdbN1uqnBw1v/krisQ5CIbDhi37IygF7RN0YvXClZj2CHrAvKmHfIJVKiBHNGanhbWm12wz25kcYI6bq7XVp8XIh9LsheRjN6G/Y+g==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tniA3-0003tP-Ap
 for bug-diffutils@gnu.org; Thu, 27 Feb 2025 12:59:03 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: "Nick Smallbone" <nick@smallbone.se>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Thu, 27 Feb 2025 17:59:03 +0000
Resent-Message-ID: <handler.76613.B.174067908414711@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 76613
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 76613@debbugs.gnu.org
X-Debbugs-Original-To: bug-diffutils@gnu.org
Received: via spool by submit@debbugs.gnu.org id=B.174067908414711
 (code B ref -1); Thu, 27 Feb 2025 17:59:03 +0000
Received: (at submit) by debbugs.gnu.org; 27 Feb 2025 17:58:04 +0000
Received: from localhost ([127.0.0.1]:37443 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tni95-0003p6-F4
 for submit@debbugs.gnu.org; Thu, 27 Feb 2025 12:58:04 -0500
Received: from lists.gnu.org ([2001:470:142::17]:45562)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <nick@smallbone.se>) id 1tnal5-0004ab-Bt
 for submit@debbugs.gnu.org; Thu, 27 Feb 2025 05:04:49 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <nick@smallbone.se>) id 1tnakv-0000Fd-T4
 for bug-diffutils@gnu.org; Thu, 27 Feb 2025 05:04:38 -0500
Received: from fout-a6-smtp.messagingengine.com ([103.168.172.149])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <nick@smallbone.se>) id 1tnakt-0005bb-VH
 for bug-diffutils@gnu.org; Thu, 27 Feb 2025 05:04:37 -0500
Received: from phl-compute-01.internal (phl-compute-01.phl.internal
 [10.202.2.41])
 by mailfout.phl.internal (Postfix) with ESMTP id B6C0F1382F1D
 for <bug-diffutils@gnu.org>; Thu, 27 Feb 2025 05:04:31 -0500 (EST)
Received: from phl-imap-04 ([10.202.2.82])
 by phl-compute-01.internal (MEProxy); Thu, 27 Feb 2025 05:04:31 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smallbone.se; h=
 cc:content-transfer-encoding:content-type:content-type:date:date
 :from:from:in-reply-to:message-id:mime-version:reply-to:subject
 :subject:to:to; s=fm3; t=1740650671; x=1740737071; bh=AvXOEXJDLv
 x5xdcpmZd3zsUJhxU0/AE5R+49ASmCwN0=; b=aSMbJodZ3xg3PbwHWdttq6gkqE
 2ibD5Xezw7rMucl2i/d42joZ4SWgCKSB0UCPgHTwAFjolgnH83Osr2jVEE734QlJ
 w7YZ5ENmo6yxb47gDez+ASkXNM1vQ17lPCuNerclfBbRMA9A3EarhvR45YpvAQEi
 9WOhg1jTW79+tmbRVwXZ+fc+zrnu9waaA+SxuN1DHTTpcnmqYPDYpGkbdNy5s4X7
 JgtaTREi749e7mdFKsTRAn7lEQhxbKvAUKhpOjMCkB2rc0yM54apTMAUgtvunCcp
 7pvNEMepCUR3WmBWWfmQeSbGu7r4usNPFV1mMgSPs8o5tKj+eqeOSIksAx1Q==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
 messagingengine.com; h=cc:content-transfer-encoding:content-type
 :content-type:date:date:feedback-id:feedback-id:from:from
 :in-reply-to:message-id:mime-version:reply-to:subject:subject:to
 :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=
 1740650671; x=1740737071; bh=AvXOEXJDLvx5xdcpmZd3zsUJhxU0/AE5R+4
 9ASmCwN0=; b=My5M0pcyz99LFAjaJIb4yh4FXjCwtAm9JW/e7+JqbZhJpW7WWux
 ZTaxVmzEM9g5OZwD0rcpz+0DN/m636GSzj01VdCGx8wbcWOcWYWl4grnOn+CFVK+
 USbUOnGE9KFlLqbZibOnwphZQnbiVe28qNUrx6uxGtWq1Gvomglme88x5smty30O
 Pwikchh9BnXngjsoGrAD9VS66qHr4yn3iIKQFZpwxPLPyJOp/pJ77z0KL6NasYok
 joSADc7EJPHfdR/per7pWqnsgZJRibCcjevzZiqT+JF2BEhnKmuuZktcCDyOICZ5
 4ckP1/gSmLasT72DZSi5x0L9FpzKpobblVg==
X-ME-Sender: <xms:rzjAZxBC6cjC407CDm3ukz_RwB76mDBKPbuoJchuFu4UQtE9m5kVAA>
 <xme:rzjAZ_icYSuxHI2ZDQqzz1xdxIei6MrgUwIvyyIxwE3fUIFXvdSgmXrV6jbWxY82D
 zdX2mJiUYQM2apWbg>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdekjedukecutefuodetggdotefrod
 ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp
 uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhepofggff
 fhvffkufgtgfesthejredtredttdenucfhrhhomhepfdfpihgtkhcuufhmrghllhgsohhn
 vgdfuceonhhitghksehsmhgrlhhlsghonhgvrdhsvgeqnecuggftrfgrthhtvghrnhepff
 dugffghfekteehfffhjeeiteejhfdvffffuefhudfgledviefggfdtvdegvdetnecuffho
 mhgrihhnpehgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe
 hmrghilhhfrhhomhepnhhitghksehsmhgrlhhlsghonhgvrdhsvgdpnhgspghrtghpthht
 ohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepsghughdqughifhhfuhhtih
 hlshesghhnuhdrohhrgh
X-ME-Proxy: <xmx:rzjAZ8n9luerjGATVovW4O0OKb0e09VuHwfkfb6bxKNl7trE72Eu1g>
 <xmx:rzjAZ7wQfMustD_DV_vQPzliBGbvdcBXRPRPDHWghdKWhu0FVBpGcg>
 <xmx:rzjAZ2TMb8yGzf-2AFz7KljBdOQptJkTlNcjS2ZPZKr1sTZQGICpHg>
 <xmx:rzjAZ-Z6UiI4UpbgFqzgKRTUmA12Wi6LfkaVV_8iVOXyOeRXm6YChQ>
 <xmx:rzjAZ_6qcE_XVYzM-s2VEtzU0Sh6HXD1CQ1LoiIIWgahzyec-GABG7qQ>
Feedback-ID: ic1c842cf:Fastmail
Received: by mailuser.phl.internal (Postfix, from userid 501)
 id 5BA852E60088; Thu, 27 Feb 2025 05:04:31 -0500 (EST)
X-Mailer: MessagingEngine.com Webmail Interface
MIME-Version: 1.0
Date: Thu, 27 Feb 2025 11:04:03 +0100
From: "Nick Smallbone" <nick@smallbone.se>
Message-Id: <c4a9f6ca-57e1-47b5-886b-adb0be409b7f@app.fastmail.com>
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Received-SPF: pass client-ip=103.168.172.149; envelope-from=nick@smallbone.se; 
 helo=fout-a6-smtp.messagingengine.com
X-Spam_score_int: -27
X-Spam_score: -2.8
X-Spam_bar: --
X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
 RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001,
 RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.7 (/)
X-Mailman-Approved-At: Thu, 27 Feb 2025 12:58:01 -0500
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -0.3 (/)
Subject: [bug-diffutils] bug#76613: diff -y crashes with apparent memory
 corruption
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Feb 2025 17:59:05 -0000

Hi,

I'm running diffutils-3.11, downloaded from ftp.gnu.org and built with ./configure && make (no options given).

I'm seeing the problem that diff -y is crashing with various malloc-related errors. Here is an example. First I create two files a and b like so:

% seq 1 100 > a
% seq 1 100 | grep -v 50 > b

Then I run diff -y a b, which crashes with an error in free():

% diff -y a b
free(): corrupted unsorted chunks
zsh: IOT instruction  src/diff -y ~/a ~/b

I haven't looked into the source to find out the problem, but I did compile a debug build and run it under Valgrind. It detected some memory corruption - here is the report:

==9602== Memcheck, a memory error detector
==9602== Copyright (C) 2002-2024, and GNU GPL'd, by Julian Seward et al.
==9602== Using Valgrind-3.24.0 and LibVEX; rerun with -h for copyright info
==9602== Command: src/diff -y /home/nick/a /home/nick/b
==9602== 
==9602== Invalid write of size 8
==9602==    at 0x40EC8A: find_and_hash_each_line (io.c:1017)
==9602==    by 0x40FBAA: read_files (io.c:1366)
==9602==    by 0x40596C: diff_2_files (analyze.c:463)
==9602==    by 0x409B1F: compare_prepped_files (diff.c:1371)
==9602==    by 0x40ADBF: compare_files (diff.c:1633)
==9602==    by 0x408834: main (diff.c:881)
==9602==  Address 0x4b12f80 is 0 bytes after a block of size 656 alloc'd
==9602==    at 0x4850C7C: realloc (vg_replace_malloc.c:1801)
==9602==    by 0x41A8A6: rpl_realloc (stdlib.h:2066)
==9602==    by 0x41CE27: xrealloc (xmalloc.c:66)
==9602==    by 0x41D196: xpalloc (xmalloc.c:271)
==9602==    by 0x40EC4A: find_and_hash_each_line (io.c:1013)
==9602==    by 0x40FBAA: read_files (io.c:1366)
==9602==    by 0x40596C: diff_2_files (analyze.c:463)
==9602==    by 0x409B1F: compare_prepped_files (diff.c:1371)
==9602==    by 0x40ADBF: compare_files (diff.c:1633)
==9602==    by 0x408834: main (diff.c:881)
==9602== 
--9602-- VALGRIND INTERNAL ERROR: Valgrind received a signal 11 (SIGSEGV) - exiting
--9602-- si_code=1;  Faulting address: 0x9622BA0;  sp: 0x1002cf6e20

valgrind: the 'impossible' happened:
   Killed by fatal signal

host stacktrace:
==9602==    at 0x5804AE1F: ??? (in /usr/libexec/valgrind/memcheck-amd64-linux)
==9602==    by 0x58004E0C: ??? (in /usr/libexec/valgrind/memcheck-amd64-linux)
==9602==    by 0x58005203: ??? (in /usr/libexec/valgrind/memcheck-amd64-linux)
==9602==    by 0x58097E37: ??? (in /usr/libexec/valgrind/memcheck-amd64-linux)
==9602==    by 0x580E1E1A: ??? (in /usr/libexec/valgrind/memcheck-amd64-linux)

sched status:
  running_tid=1

Thread 1: status = VgTs_Runnable (lwpid 9602)
==9602==    at 0x4850A5F: calloc (vg_replace_malloc.c:1675)
==9602==    by 0x4160B0: icalloc (ialloc.h:91)
==9602==    by 0x41D239: xicalloc (xmalloc.c:304)
==9602==    by 0x41D1E7: xizalloc (xmalloc.c:289)
==9602==    by 0x405E39: diff_2_files (analyze.c:529)
==9602==    by 0x409B1F: compare_prepped_files (diff.c:1371)
==9602==    by 0x40ADBF: compare_files (diff.c:1633)
==9602==    by 0x408834: main (diff.c:881)
client stack range: [0x1FFEFFD000 0x1FFF000FFF] client SP: 0x1FFEFFEDA0
valgrind stack range: [0x1002BF7000 0x1002CF6FFF] top usage: 7272 of 1048576

Nick




From MAILER-DAEMON Thu Feb 27 14:14:10 2025
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1tnjKh-0008Kh-K5
	for mharc-bug-diffutils@gnu.org; Thu, 27 Feb 2025 14:14:10 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tnjKe-0008KA-6p
 for bug-diffutils@gnu.org; Thu, 27 Feb 2025 14:14:05 -0500
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tnjKd-0001pp-CL
 for bug-diffutils@gnu.org; Thu, 27 Feb 2025 14:14:03 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=In-Reply-To:From:References:MIME-Version:Date:To:Subject;
 bh=PMVrmgasuchClWStyHgSmWG84fbpjBRabA84oGcGmjg=; 
 b=ehn72CPi61NpsV6FulkUqhJ1EU+GUJfpHFHViyMl5LfBZTu24YSZBxKbxQ4lNr3wQSgsCZVIaiX5YEqTqrW5VIeJGqZTSZVFNdyAedZ0GdHR3hj3FMXygnl+ND/6t8245kHmVeub4CFDuA4OH4GFFlQsF7YzpmETeH95DuBeEFzP5uLaI0CvRCOShczvZFKuM+MfQxod7ytMDI0YAZuHXTjaY1Kbx6CxUm+lTeodK0KqwUu6CfYiEpizA2XxvgZxltmGQV8u7MJPvCFm0rf2RAhklssB1fjHwZiJzMILUwSQm3V+Qn9jQQyLQP4kRNKiIUIFXX6z5iEgPXNMpDcJrA==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tnjKd-00080v-6z
 for bug-diffutils@gnu.org; Thu, 27 Feb 2025 14:14:03 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Paul Eggert <eggert@cs.ucla.edu>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Thu, 27 Feb 2025 19:14:03 +0000
Resent-Message-ID: <handler.76613.B76613.174068359630649@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 76613
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Nick Smallbone <nick@smallbone.se>
Cc: 76613@debbugs.gnu.org
Received: via spool by 76613-submit@debbugs.gnu.org id=B76613.174068359630649
 (code B ref 76613); Thu, 27 Feb 2025 19:14:03 +0000
Received: (at 76613) by debbugs.gnu.org; 27 Feb 2025 19:13:16 +0000
Received: from localhost ([127.0.0.1]:38013 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tnjJs-0007yG-3a
 for submit@debbugs.gnu.org; Thu, 27 Feb 2025 14:13:16 -0500
Received: from mail.cs.ucla.edu ([131.179.128.66]:44420)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <eggert@cs.ucla.edu>)
 id 1tnjJp-0007x8-Dl
 for 76613@debbugs.gnu.org; Thu, 27 Feb 2025 14:13:14 -0500
Received: from localhost (localhost [127.0.0.1])
 by mail.cs.ucla.edu (Postfix) with ESMTP id AD6BF3C00E413;
 Thu, 27 Feb 2025 11:13:06 -0800 (PST)
Received: from mail.cs.ucla.edu ([127.0.0.1])
 by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10032) with ESMTP
 id HUW4yVErRLxc; Thu, 27 Feb 2025 11:13:06 -0800 (PST)
Received: from localhost (localhost [127.0.0.1])
 by mail.cs.ucla.edu (Postfix) with ESMTP id 742F73C00E41C;
 Thu, 27 Feb 2025 11:13:06 -0800 (PST)
DKIM-Filter: OpenDKIM Filter v2.10.3 mail.cs.ucla.edu 742F73C00E41C
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.ucla.edu;
 s=9D0B346E-2AEB-11ED-9476-E14B719DCE6C; t=1740683586;
 bh=PMVrmgasuchClWStyHgSmWG84fbpjBRabA84oGcGmjg=;
 h=Message-ID:Date:MIME-Version:To:From;
 b=fNDk54wS10jIt2W1zLD399g0OHj3BxrEIBd7d8fsO+B+h2K2NgBnEvCdWRE+PXG3U
 HIYWfgsrW64dxXky00b5MY41pfM+FSvuoVnA00QvFUmUdzsNo5bbI58ir/SSyMUwIk
 HUQTqtAJaXJKwTWk+vBMMbQxG1jFeaIW7hiQU6JLosk/rSaJMnP2YpC973xEkPcQKl
 zW49imkEJNLfHF6e0PkhE8D9JG+fwXpdmlel/nMoE9P1KlMux0SIzrWsxY4n7NWLiL
 hGxKAfC2h2gMSeU9bUWDTUUwCXjgYOjCcY7aJy+h+PJ4TlGqmRoP69WeYZ5dvSoha9
 SamihZCdYVjqQ==
X-Virus-Scanned: amavis at mail.cs.ucla.edu
Received: from mail.cs.ucla.edu ([127.0.0.1])
 by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10026) with ESMTP
 id 7E5fujHCTaCW; Thu, 27 Feb 2025 11:13:06 -0800 (PST)
Received: from [192.168.254.12] (unknown [47.147.225.25])
 by mail.cs.ucla.edu (Postfix) with ESMTPSA id 5454E3C00E413;
 Thu, 27 Feb 2025 11:13:06 -0800 (PST)
Message-ID: <bc7c4558-1968-4c58-b03e-ab41a3177418@cs.ucla.edu>
Date: Thu, 27 Feb 2025 11:13:06 -0800
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
References: <c4a9f6ca-57e1-47b5-886b-adb0be409b7f@app.fastmail.com>
Content-Language: en-US
From: Paul Eggert <eggert@cs.ucla.edu>
Organization: UCLA Computer Science Department
In-Reply-To: <c4a9f6ca-57e1-47b5-886b-adb0be409b7f@app.fastmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Subject: [bug-diffutils] bug#76613: bug#76613: diff -y crashes with apparent
 memory corruption
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Feb 2025 19:14:05 -0000

Thanks for the bug report. I can reproduce it with gcc 
-fsanitize=address on Ubuntu 24.10 x86-64. I plan to take a look at it soon.




From MAILER-DAEMON Thu Feb 27 23:37:05 2025
Received: from list by lists.gnu.org with archive (Exim 4.90_1)
	id 1tns7V-0002HR-Qk
	for mharc-bug-diffutils@gnu.org; Thu, 27 Feb 2025 23:37:05 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tns7U-0002CH-Cn
 for bug-diffutils@gnu.org; Thu, 27 Feb 2025 23:37:04 -0500
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tns7T-0000Rj-Lm
 for bug-diffutils@gnu.org; Thu, 27 Feb 2025 23:37:03 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=MIME-Version:Date:References:In-Reply-To:From:To:Subject;
 bh=pC7tBT81BXY9P3s0mpAs+i07HyFd6oBpzb40qxrkVeU=; 
 b=QIDVhdlDrN3jkxpRD6COibizrK7GQb+B/UKVuVuGCs91cbH3bw+ius8++uNK6djKsYHR82KQ4PHKHA5CD5Prprw8g9Ss1Zg3jv9shGXFvbRv/YXMzratsh3OXD7NBV+VvPymChB2CsWP4SzufN9lMegXPQcGi+4wyCuGfmdwIHaskhkMjTdF9COg57NfziBUu3kFeykmF+dNVa0M1TOEQadnMRgzuKJP5ELqONxm9tIFnMzr1dJ3MCJ3ZqFJXsORL1QwpCL2jYkeRUU4lqmiGe1k/HV0djnT8e+8xgUwNBE/aUqi9nvqBzv+MdknwgywqZ82YADLfQ7F2qBL2M21xg==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tns7T-00005Z-7f
 for bug-diffutils@gnu.org; Thu, 27 Feb 2025 23:37:03 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Collin Funk <collin.funk1@gmail.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Fri, 28 Feb 2025 04:37:03 +0000
Resent-Message-ID: <handler.76613.B76613.174071737432613@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 76613
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Paul Eggert <eggert@cs.ucla.edu>
Cc: 76613@debbugs.gnu.org, Nick Smallbone <nick@smallbone.se>
Received: via spool by 76613-submit@debbugs.gnu.org id=B76613.174071737432613
 (code B ref 76613); Fri, 28 Feb 2025 04:37:03 +0000
Received: (at 76613) by debbugs.gnu.org; 28 Feb 2025 04:36:14 +0000
Received: from localhost ([127.0.0.1]:42936 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tns6f-0008Tn-Jm
 for submit@debbugs.gnu.org; Thu, 27 Feb 2025 23:36:14 -0500
Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]:54595)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.84_2) (envelope-from <collin.funk1@gmail.com>)
 id 1tns6Z-0008SN-Cr
 for 76613@debbugs.gnu.org; Thu, 27 Feb 2025 23:36:11 -0500
Received: by mail-pl1-x62c.google.com with SMTP id
 d9443c01a7336-2235c5818a3so30523165ad.1
 for <76613@debbugs.gnu.org>; Thu, 27 Feb 2025 20:36:07 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1740717360; x=1741322160; darn=debbugs.gnu.org;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=pC7tBT81BXY9P3s0mpAs+i07HyFd6oBpzb40qxrkVeU=;
 b=TgvQLNyLE8WCxU+Bl45CiYP4EJcgSOfsslbclsxBsB+KySMXZXH+P0I+ErxYeIcNs9
 kG3CII4bvi66e//RDvplPrrSUfjzis+pWvCbmiQNWV2DC5AtcY3xhspy/cPLBioFJboT
 N3Nx+1ZmLpxPGcqF59PHnNHkFMzaOYmUDZs+O8ybK3aJ5xzHKa0psMXll5Zwg63cn6uu
 dlLi7iD1b3PMXirDSoCO4XcIb8BQZZGU8wdl/JyU3YuKkyB2FKqoqgpscwnmO8mp/wZh
 iciKpcCaaakJzLklalTZIuzmr3R3+H8UgHOPGCn6lC/0kREWQ6VY05eQQrisYfc8nxDB
 iK/w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1740717360; x=1741322160;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
 :message-id:reply-to;
 bh=pC7tBT81BXY9P3s0mpAs+i07HyFd6oBpzb40qxrkVeU=;
 b=mWJI7mNVHRFdqH0a2No1SrV3u5VdcDjRQ6ahPxKwZzMBPkp+LJ1z/TpQFD6hmVAH43
 2vc4kq63LRDyLE7/OlT+o+dSP96KTG7+rO3NaYDyvcxX9OxI8tdKeG633x138BtrwKAC
 8nl0hl5C8FI/O8HeWRI2nENe5LoItEbi/iQWIYVrL4jbLzPly43EGXhJAW4dvyOYaojt
 dIFhCKyfG0OnQMz5oCzPaYQhqJHj8tVcLUq/cI37guyHEIQu8ZCLBbODAzlUK4CUjo8+
 eLBW9cguO8mhj0KjgNa9ufpXRUmA+PArr8slGVF6VsHgnoeRIP6NGzdNffgu1hzeFdMn
 xy4A==
X-Forwarded-Encrypted: i=1;
 AJvYcCVbImKLa6UKew3nJZzezOPJgz2TrJjxCg/eH20ndzB9iUP11cwkLRGCmJ1KCEgcebWhDyZv0A==@debbugs.gnu.org
X-Gm-Message-State: AOJu0Yy5v8ZkMJv6GoST974KFjxyF02st1j2i5aNSCgsgeOpqiynCfqp
 m9zxFYEdiaRQf7FjUl+kKMc4zcqhGtv4PA5rNe/HM/22pfogyG1IjFyLLIUz
X-Gm-Gg: ASbGncu0xRUWzml4wqR7GVMC/te67UOHkNickAtZh3IQeqlyErvQRPwvjIkH3RJKq22
 MiVgH2HdzdbZKWXMn+kYUX5TG4sG/a3vLk4SpVmSO3JU7F0H9lwFFnS9ykgcm/y0mwGaO7gGs7n
 5ToYajilaa4jQM3LXynyOxkfaGwyzsQAFCeKFCFSPaElOl/7mqEyzK6wxitZreZWFOSTXsN/stB
 6f4AuzL+b6nZS0a0DXa5Kky6fc9SIK3hGA5cGYqJ9tPk61aWKhwG5e6nilDrZN0fagz8+74CEyJ
 LOPIg6fWrxBCSUfsb+SQFC6KgQueACetgicVZYVE0R72lV7fqKT/5Ec=
X-Google-Smtp-Source: AGHT+IFqn4wmLHd8nobSe5/aRxGGqG7dF73hr64wn7dobC4lbtcMFmRTtpvOT6G3YFeW+qh+fzdKDQ==
X-Received: by 2002:a17:902:e54e:b0:21f:85ee:f2df with SMTP id
 d9443c01a7336-22368fbea6cmr35037995ad.15.1740717360083; 
 Thu, 27 Feb 2025 20:36:00 -0800 (PST)
Received: from fedora (c-73-93-224-2.hsd1.ca.comcast.net. [73.93.224.2])
 by smtp.gmail.com with ESMTPSA id
 d9443c01a7336-223501f972esm24498875ad.58.2025.02.27.20.35.58
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Thu, 27 Feb 2025 20:35:58 -0800 (PST)
From: Collin Funk <collin.funk1@gmail.com>
In-Reply-To: <bc7c4558-1968-4c58-b03e-ab41a3177418@cs.ucla.edu>
References: <c4a9f6ca-57e1-47b5-886b-adb0be409b7f@app.fastmail.com>
 <bc7c4558-1968-4c58-b03e-ab41a3177418@cs.ucla.edu>
Date: Thu, 27 Feb 2025 20:35:57 -0800
Message-ID: <87a5a6wus2.fsf@gmail.com>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Spam-Score: 0.3 (/)
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
Errors-To: debbugs-submit-bounces@debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
X-Spam-Score: -0.7 (/)
Subject: [bug-diffutils] bug#76613: bug#76613: bug#76613: diff -y crashes
 with apparent memory corruption
X-BeenThere: bug-diffutils@gnu.org
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
 <mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Feb 2025 04:37:04 -0000

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

Hi Paul,

Paul Eggert <eggert@cs.ucla.edu> writes:

> Thanks for the bug report. I can reproduce it with gcc
> -fsanitize=3Daddress on Ubuntu 24.10 x86-64. I plan to take a look at it
> soon.

I see -fsanitize=3Daddress and valgrind fail this test starting at this
commit f54e901c329ba7b7d98ecae2571712f43444c2bd:

    maint: use xpalloc=20=20=20=20
    * bootstrap.conf (gnulib_modules): Add ialloc, to document
    the now-direct dependency.
    * src/diff.c (add_regexp):
    * src/diff3.c (read_diff):
    * src/dir.c (dir_read):
    * src/io.c (slurp, find_and_hash_each_line, find_identical_ends):
    * src/sdiff.c (diffarg):
    Prefer xpalloc to doing it by hand.
    * src/io.c: Include ialloc.h, for irealloc.
    (equivs_alloc): Now idx_t, not lin, for xpalloc.
    (sip): Don=E2=80=99t bother subtracting 2 * sizeof (word) from the
    buffer_lcm upper bound, as later code works anyway now.
    (slurp): Simplify buffer allocation so that xpalloc can be used.
    Use irealloc for speculative reallocation, since the code could
    work anyway if the irealloc fails.  Use current->eof to check
    for EOF, rather than the less-intuitive buffer size checks.

The previous commit passes it. Here are the relevant lines:

@@ -419,17 +411,16 @@ find_and_hash_each_line (struct file_data *current)
       /* Maybe increase the size of the line table.  */
       if (line =3D=3D alloc_lines)
         {
-          /* Double (alloc_lines - linbuf_base) by adding to alloc_lines. =
 */
-          if (IDX_MAX / 3 <=3D alloc_lines
-              || IDX_MAX / sizeof *cureqs <=3D 2 * alloc_lines - linbuf_ba=
se
-              || IDX_MAX / sizeof *linbuf <=3D alloc_lines - linbuf_base)
-            xalloc_die ();
-          alloc_lines =3D 2 * alloc_lines - linbuf_base;
-          cureqs =3D xirealloc (cureqs, alloc_lines * sizeof *cureqs);
+         idx_t eqs_max =3D MIN (LIN_MAX, IDX_MAX / sizeof *cureqs);
+
+         /* Grow (alloc_lines - linbuf_base) by adding to alloc_lines.  */
+         idx_t n =3D alloc_lines - linbuf_base;
           linbuf +=3D linbuf_base;
-          linbuf =3D xirealloc (linbuf,
-                             (alloc_lines - linbuf_base) * sizeof *linbuf);
+         linbuf =3D xpalloc (linbuf, &n, 1, eqs_max - linbuf_base,
+                           sizeof *linbuf);
           linbuf -=3D linbuf_base;
+         alloc_lines =3D linbuf_base + n;
+          cureqs =3D xirealloc (cureqs, alloc_lines * sizeof *cureqs);
         }
       linbuf[line] =3D ip;
       cureqs[line] =3D i;
@@ -445,16 +436,13 @@ find_and_hash_each_line (struct file_data *current)
          so that we can compute the length of any buffered line.  */
       if (line =3D=3D alloc_lines)
         {
-          /* Double (alloc_lines - linbuf_base) by adding to alloc_lines. =
 */
-          if (IDX_MAX / 3 <=3D alloc_lines
-              || IDX_MAX / sizeof *cureqs <=3D 2 * alloc_lines - linbuf_ba=
se
-              || IDX_MAX / sizeof *linbuf <=3D alloc_lines - linbuf_base)
-            xalloc_die ();
-          alloc_lines =3D 2 * alloc_lines - linbuf_base;
-          linbuf +=3D linbuf_base;
-          linbuf =3D xirealloc (linbuf,
-                             (alloc_lines - linbuf_base) * sizeof *linbuf);
-          linbuf -=3D linbuf_base;
+         /* Grow (alloc_lines - linbuf_base) by adding to alloc_lines.  */
+         idx_t n =3D alloc_lines - linbuf_base;
+         linbuf +=3D linbuf_base;
+         linbuf =3D xpalloc (linbuf, &n, 1, MAX (0, IDX_MAX - linbuf_base),
+                           sizeof *linbuf);
+         linbuf -=3D linbuf_base;
+         alloc_lines =3D n - linbuf_base;
         }
       linbuf[line] =3D p;

In the original version alloc_lines is calculated as
2 * alloc_lines - linbuf_base in both hunks. Afterwards it is
linbuf_base + n in one section and n - linbuf_base in the other.

I've attached a patch that satisfies sanitizers, but maybe I am missing
something in this code...

Collin


--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment;
 filename=0001-diff-fix-allocation-size-computation-that-could-caus.patch

>From 03e529dd69d50c247a217b9b659659538dfa397a Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.funk1@gmail.com>
Date: Thu, 27 Feb 2025 20:15:55 -0800
Subject: [PATCH] diff: fix allocation size computation that could cause bad
 writes

Reported by Nick Smallbone <nick@smallbone.se> in:
<https://lists.gnu.org/r/bug-diffutils/2025-02/msg00012.html>.

* src/io.c (find_and_hash_each_line): Fix size computation.
---
 src/io.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/io.c b/src/io.c
index a62c529..adb4f50 100644
--- a/src/io.c
+++ b/src/io.c
@@ -1012,7 +1012,7 @@ find_and_hash_each_line (struct file_data *current)
 	  linbuf += linbuf_base;
 	  linbuf = xpalloc (linbuf, &n, 1, -1, sizeof *linbuf);
 	  linbuf -= linbuf_base;
-	  alloc_lines = n - linbuf_base;
+          alloc_lines = linbuf_base + n;
         }
       linbuf[line] = p;
 
-- 
2.48.1


--=-=-=--




