From unknown Mon Aug 18 04:47:40 2025 X-Loop: help-debbugs@gnu.org Subject: bug#61193: '-D' option of diff 3.9 - #ifdef directives missing Resent-From: Robert Webb Original-Sender: "Debbugs-submit" Resent-CC: bug-diffutils@gnu.org Resent-Date: Tue, 31 Jan 2023 05:37:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61193 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: To: 61193@debbugs.gnu.org X-Debbugs-Original-To: bug-diffutils@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167514338213166 (code B ref -1); Tue, 31 Jan 2023 05:37:03 +0000 Received: (at submit) by debbugs.gnu.org; 31 Jan 2023 05:36:22 +0000 Received: from localhost ([127.0.0.1]:51138 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMjJd-0003QD-RA for submit@debbugs.gnu.org; Tue, 31 Jan 2023 00:36:22 -0500 Received: from lists.gnu.org ([209.51.188.17]:47220) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMgvD-0007tk-Fz for submit@debbugs.gnu.org; Mon, 30 Jan 2023 22:02:59 -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 ) id 1pMgvD-0006L6-2y for bug-diffutils@gnu.org; Mon, 30 Jan 2023 22:02:59 -0500 Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pMgvB-0004vd-AJ for bug-diffutils@gnu.org; Mon, 30 Jan 2023 22:02:58 -0500 Received: by mail-lf1-x131.google.com with SMTP id br9so22257859lfb.4 for ; Mon, 30 Jan 2023 19:02:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=CAP00T7tPxr2yJhfldZPKyQgi+7+cPBgmA5NuNTtV78=; b=NxbMH5RdaOMHivrOsKrvcANKEE5G3MoMpx1JJLqFeW5mIfALr11kNoW6v6cSEel78A MqHZWrOUj4TNyAU01PU3p1rbqfpjdl2yw0Ygaklt0I09jaohzgOwWFaUdZsKOvd3INPB 7KyursWKVkLM3jMVtFjW8V/cVVh2bktGHUGBh8Q4flPVqqa+K/toKJ2ueLTLTpBK4EDq hy6GhutqY4S3Lxk6lg5F96LdvkQsARBDHIuG3Gx5Tv4tsWeyegpO5WfnnlT7ho+ILCiY oH/Y9h0kn1GTtWsXUGjhA7OHYWVS7SjNdRg1PYZSp3k4Y3s9Jtykuy+Gl4UhebUgaZgE d5Wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=CAP00T7tPxr2yJhfldZPKyQgi+7+cPBgmA5NuNTtV78=; b=NtLtr373UWjMj0vSMKLTQvcP2Qc7sdbeMI9hFrW7d0CosWdeHThr1Pne/5W4K9mDPi Qdg2nt0vcTAkbX/ijfoCt/G5h6nIvOhDWlRI3cVtZ+fAlV6QS4fJWAvMK+cOmWmnI7o4 42kjeYI1FyrXKI7DwK2r3Vv0I6kpdp/07CBpNGqMettCB6+rfRjinZatk1R+Sr2B4AkY 29Rbdvb/QYmL7tarxIxJYbix+DegTDD62ivBYo6peqCwFZ2bGbYz9cahAfZchsMPQRGk sGsiBjF92WG9UBiCRokpIz/nW+f+dRLUXLMQWgkWQx+bbw/Hv6l6VfIhI/btipkx/2r4 kquQ== X-Gm-Message-State: AFqh2kqImZCtWM0V69vCV0m50q5UyNZUu7oxNufIrkpsdaIACyXppCeH smqg35KgXqaQaAcmFDUxLTKr4lE7ZqCPD+8pGTTBqlqVCC0= X-Google-Smtp-Source: AMrXdXs0yMsiWKyBr9/DK4fIOm7IDglH4UfgpZGbFlJ2C/GMHZwj20e1VvhAXNyCaIfsE5lh6eRCdn4HPaTS8c5Y42U= X-Received: by 2002:a05:6512:31cf:b0:4d5:a689:adc9 with SMTP id j15-20020a05651231cf00b004d5a689adc9mr3462360lfe.16.1675134174844; Mon, 30 Jan 2023 19:02:54 -0800 (PST) MIME-Version: 1.0 From: Robert Webb Date: Mon, 30 Jan 2023 19:02:43 -0800 Message-ID: Content-Type: multipart/alternative; boundary="000000000000715a4d05f3869117" Received-SPF: pass client-ip=2a00:1450:4864:20::131; envelope-from=ro.webbdg@gmail.com; helo=mail-lf1-x131.google.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Mailman-Approved-At: Tue, 31 Jan 2023 00:36:19 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --000000000000715a4d05f3869117 Content-Type: text/plain; charset="UTF-8" Hi, The merged output from 'diff -D' (v3.9) is missing the '#ifdef' directives. A test script and logs from runs with two versions of diff, one not working, and the second older one working, follows. ------------------------------------------------------------------------- #!/bin/sh # diff_ifdef_example.sh 2023-01-30 rw # # The -D option (--ifdef) of 'diff' version 3.9 does not work correctly. # The '#ifdef' directives are not included in the merged output. diff -v |grep diff seq 5 > c for OPT in '' '-D ZZZ' '-u' ;do printf '\n=== diff %s\n' "$OPT" sed 2,3d c |diff $OPT c - done ------------------------------------------------------------------------- openSUSE Tumbleweed 20230129 diff (GNU diffutils) 3.9 === diff 2,3d1 < 2 < 3 === diff -D ZZZ 1 2 3 4 5 === diff -u --- c 2023-01-30 16:29:06.165608569 -0800 +++ - 2023-01-30 16:29:06.188398585 -0800 @@ -1,5 +1,3 @@ 1 -2 -3 4 5 ------------------------------------------------------------------------- openSUSE Tumbleweed 20220312 diff (GNU diffutils) 3.8 === diff 2,3d1 < 2 < 3 === diff -D ZZZ 1 #ifndef ZZZ 2 3 #endif /* ! ZZZ */ 4 5 === diff -u --- c 2023-01-30 16:32:59.516569839 -0800 +++ - 2023-01-30 16:32:59.529462800 -0800 @@ -1,5 +1,3 @@ 1 -2 -3 4 5 -- Robert Webb --000000000000715a4d05f3869117 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,
The merged output from 'diff -D' (v3.9) is = missing the '#ifdef'
directives.=C2=A0 A test script and logs fr= om runs with two versions of diff,
one not working, and the second older= one working, follows.

---------------------------------------------= ----------------------------
#!/bin/sh
# diff_ifdef_example.sh =C2=A0= 2023-01-30 =C2=A0 rw
#
# The -D option (--ifdef) of 'diff' v= ersion 3.9 does not work correctly.
# The '#ifdef' directives ar= e not included in the merged output.

diff -v |grep diff
seq 5 >= ; c
for OPT in '' '-D ZZZ' '-u' =C2=A0;do
=C2= =A0 printf '\n=3D=3D=3D diff %s\n' "$OPT"
=C2=A0 sed 2= ,3d c =C2=A0|diff $OPT c -
=C2=A0 done

--------------------------= -----------------------------------------------
openSUSE Tumbleweed 2023= 0129
diff (GNU diffutils) 3.9

=3D=3D=3D diff
2,3d1
< 2<= br>< 3

=3D=3D=3D diff -D ZZZ
1
2
3
4
5

=3D= =3D=3D diff -u
--- c 2023-01-30 16:29:06.165608569 -0800
+++ - 2023-0= 1-30 16:29:06.188398585 -0800
@@ -1,5 +1,3 @@
=C2=A01
-2
-3
= =C2=A04
=C2=A05

-------------------------------------------------= ------------------------
openSUSE Tumbleweed 20220312
diff (GNU diffu= tils) 3.8

=3D=3D=3D diff
2,3d1
< 2
< 3

=3D=3D= =3D diff -D ZZZ
1
#ifndef ZZZ
2
3
#endif /* ! ZZZ */
45

=3D=3D=3D diff -u
--- c 2023-01-30 16:32:59.516569839 -0800+++ - 2023-01-30 16:32:59.529462800 -0800
@@ -1,5 +1,3 @@
=C2=A01-2
-3
=C2=A04
=C2=A05

--
Robert Webb
--000000000000715a4d05f3869117-- From unknown Mon Aug 18 04:47:40 2025 X-Loop: help-debbugs@gnu.org Subject: bug#61193: '-D' option of diff 3.9 - #ifdef directives missing References: In-Reply-To: Resent-From: Robert Webb Original-Sender: "Debbugs-submit" Resent-CC: bug-diffutils@gnu.org Resent-Date: Fri, 10 Feb 2023 22:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61193 X-GNU-PR-Package: diffutils X-GNU-PR-Keywords: To: 61193@debbugs.gnu.org Received: via spool by 61193-submit@debbugs.gnu.org id=B61193.16760695109126 (code B ref 61193); Fri, 10 Feb 2023 22:52:02 +0000 Received: (at 61193) by debbugs.gnu.org; 10 Feb 2023 22:51:50 +0000 Received: from localhost ([127.0.0.1]:38282 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQcFC-0002N8-2w for submit@debbugs.gnu.org; Fri, 10 Feb 2023 17:51:50 -0500 Received: from mail-lj1-f177.google.com ([209.85.208.177]:38542) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQcFA-0002Ms-I2 for 61193@debbugs.gnu.org; Fri, 10 Feb 2023 17:51:48 -0500 Received: by mail-lj1-f177.google.com with SMTP id l3so8008979ljo.5 for <61193@debbugs.gnu.org>; Fri, 10 Feb 2023 14:51:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=6XZxXYMMcY4WkT7CJO7ztYg1/uHmVrNydj8p+KLPuYM=; b=WNMxvfYRjpoBkjuWyYOZLK/8/cHySSDQjuwQ0TzbC/KKCaZkfKRMxhqadz7SGEzbtK Ye0PwWG2VXbr9i8jEiJPaQV/Y5TNko9378zNxrYKc/s7gANIBO4ftQEDjdbZKte+5UNx iwc5KyDfEjUd9JWyNEj9vHAiBH+c6+WKSp1ybyfzdKt0BALXsnkD+zCO8Qjc1U5Z/gFk DkTp7ygskwBq0fhZgmzmpajr3k1gnw+rWVqRbQdRFEahoc/9B6M18p1aafc+Yqc08x6T GdfmF6LDfQtZals34sUF+N68TsWsr9qGUJqhSnBUS7bDl2M1vqCe4mvym2VxQFLiLEOi 9jcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=6XZxXYMMcY4WkT7CJO7ztYg1/uHmVrNydj8p+KLPuYM=; b=Kre32vmlJVf13O7Tdjz0JQ1w1VSK72wmdathW1fjPGakX4HyATytHcGoUXleRTl2xZ BiPk9ydoZtHKyHxfe6nRjrBMzBFjLulMGfIH8UolaDI3zpeoOnladxqWFFUoQRBgGeEr hXHrTSgHWluKzHc5KRFk1w6qMQMKaG8J5DwOjEnYQ5QV0k1YmuKYViFLBXaYKGxiqX0N msERYA/mkkucSzzDsJzVkM5Q2feLnTa1gvHPt2ZbrPS+TvOllcGU0Bs6BkY13BVe1kYr j/lOV2yHLiclRGBjLgicjHnL4UcnleKua+v0DQqPfVkceV301vm1bPo45+5cj1vu4s+X CnDA== X-Gm-Message-State: AO0yUKUDaLrDYUZxUKbZwtPEdh4nB14M7hMhRpENZadUl8gGvrOaaSlt FpMK7TP8p+UwwbsGUt67ZSwdqk45gn+xzLvdCtJXtmUDSJM= X-Google-Smtp-Source: AK7set8iXh9vsBgJiDSdEl1A12jXE4PXH5raAM7r5PuS0PJ2agd7cS7PZb6KH7iZfXi8AYMypWTGxworpH4a/P7iZxs= X-Received: by 2002:a2e:b4b8:0:b0:290:65bb:6b24 with SMTP id q24-20020a2eb4b8000000b0029065bb6b24mr2664825ljm.87.1676069501728; Fri, 10 Feb 2023 14:51:41 -0800 (PST) MIME-Version: 1.0 From: Robert Webb Date: Fri, 10 Feb 2023 14:51:30 -0800 Message-ID: Content-Type: multipart/alternative; boundary="00000000000044fac205f4605709" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --00000000000044fac205f4605709 Content-Type: text/plain; charset="UTF-8" Here is a pass/fail test to compare diff versions: #!/bin/bash diff -D AAAA /dev/null <(echo A) \ |cmp - <(printf '%s\n' '#ifdef AAAA' A '#endif /* AAAA */') The diff in diffutils v3.8 passes. Version 3.9 fails. -- Robert Webb --00000000000044fac205f4605709 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Here is a pass/fail test to compare diff versions:

=C2=A0 =C2=A0 #!/bin/bash
=C2=A0 =C2=A0 diff -D A= AAA /dev/null <(echo A) \
=C2=A0 =C2=A0 =C2=A0 |cmp - <(printf = 9;%s\n' '#ifdef AAAA' A '#endif /* AAAA */')
=
The diff in diffutils v3.8 passes.=C2=A0 Version 3.9 fails.<= /div>
--
Robert Webb
--00000000000044fac205f4605709-- From unknown Mon Aug 18 04:47:40 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Robert Webb Subject: bug#61193: closed (Re: [bug-diffutils] bug#61193: '-D' option of diff 3.9 - #ifdef directives missing) Message-ID: References: <1af2b347-5375-8cb3-edd8-a78da2239067@cs.ucla.edu> X-Gnu-PR-Message: they-closed 61193 X-Gnu-PR-Package: diffutils Reply-To: 61193@debbugs.gnu.org Date: Fri, 10 Feb 2023 23:49:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1676072942-15440-1" This is a multi-part message in MIME format... ------------=_1676072942-15440-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #61193: '-D' option of diff 3.9 - #ifdef directives missing which was filed against the diffutils package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 61193@debbugs.gnu.org. --=20 61193: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D61193 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1676072942-15440-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 61193-done) by debbugs.gnu.org; 10 Feb 2023 23:48:05 +0000 Received: from localhost ([127.0.0.1]:38326 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQd7c-0003y5-CN for submit@debbugs.gnu.org; Fri, 10 Feb 2023 18:48:04 -0500 Received: from zimbra.cs.ucla.edu ([131.179.128.68]:60058) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQd7a-0003wn-6j for 61193-done@debbugs.gnu.org; Fri, 10 Feb 2023 18:48:03 -0500 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id B06E41600A9; Fri, 10 Feb 2023 15:47:55 -0800 (PST) Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id RLh5f73qugY4; Fri, 10 Feb 2023 15:47:54 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 6E2E31600AA; Fri, 10 Feb 2023 15:47:54 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.9.2 zimbra.cs.ucla.edu 6E2E31600AA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.ucla.edu; s=78364E5A-2AF3-11ED-87FA-8298ECA2D365; t=1676072874; bh=k8hmBWTtjBXF5CzvB6KGC7KIoMeYVg7R9d/rn4Uj81w=; h=Content-Type:Message-ID:Date:MIME-Version:Subject:To:From; b=iMo2KrxVSXf8lJXN4Un4Liq565dnKx8ZCQuf/o3ax8JLZmPAFDkvkHvd6SrWuA6ac jNZXveHBNY2D/vWuzCRsWMxIwr5m6VXxzTKX5abxbTLcQCalr8sd5OO+qk9RfhK3C9 f27oOMxGiVsvljgTWISl9UnimEY36qFGrL+z+KAY= X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id dK0BSLFOsNIM; Fri, 10 Feb 2023 15:47:54 -0800 (PST) Received: from [131.179.64.200] (Penguin.CS.UCLA.EDU [131.179.64.200]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 4D48B1600A9; Fri, 10 Feb 2023 15:47:54 -0800 (PST) Content-Type: multipart/mixed; boundary="------------MXpTSbSnYZg5KOaOW9ULw09w" Message-ID: <1af2b347-5375-8cb3-edd8-a78da2239067@cs.ucla.edu> Date: Fri, 10 Feb 2023 15:47:53 -0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Subject: Re: [bug-diffutils] bug#61193: '-D' option of diff 3.9 - #ifdef directives missing Content-Language: en-US To: Robert Webb References: From: Paul Eggert Organization: UCLA Computer Science Department In-Reply-To: X-Spam-Score: -3.4 (---) X-Debbugs-Envelope-To: 61193-done Cc: 61193-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.4 (----) This is a multi-part message in MIME format. --------------MXpTSbSnYZg5KOaOW9ULw09w Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Thanks for the bug report and test case. This is due to a "sizeof sizeof" typo I introduced in diff 3.9; sorry about that. I installed the attached to fix things and add a regression test. --------------MXpTSbSnYZg5KOaOW9ULw09w Content-Type: text/x-patch; charset=UTF-8; name="0001-diff-fix-bug-where-D-does-not-work.patch" Content-Disposition: attachment; filename="0001-diff-fix-bug-where-D-does-not-work.patch" Content-Transfer-Encoding: base64 RnJvbSBiYTA4ZmJiYjBjYTVkYTQ1NWJmNjk1MjM2YzU3YmM1MGU3ZmFlZDUwIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBGcmksIDEwIEZlYiAyMDIzIDE1OjMzOjQwIC0wODAwClN1YmplY3Q6IFtQQVRD SF0gZGlmZjogZml4IGJ1ZyB3aGVyZSAtRCBkb2VzIG5vdCB3b3JrCk1JTUUtVmVyc2lvbjog MS4wCkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD1VVEYtOApDb250ZW50LVRy YW5zZmVyLUVuY29kaW5nOiA4Yml0CgpQcm9ibGVtIHJlcG9ydGVkIGJ5IFJvYmVydCBXZWJi IChidWcjNjExOTMpLgoqIE5FV1M6IE1lbnRpb24gdGhpcy4KKiBzcmMvZGlmZi5jIChtYWlu KTogT21pdCBzdHJheSDigJhzaXplb2bigJkuCiogdGVzdHMvaWZkZWY6IE5ldyB0ZXN0Lgoq IHRlc3RzL01ha2VmaWxlLmFtIChURVNUUyk6IEFkZCBpdC4KLS0tCiBORVdTICAgICAgICAg ICAgICB8ICA1ICsrKysrCiBzcmMvZGlmZi5jICAgICAgICB8ICAyICstCiB0ZXN0cy9NYWtl ZmlsZS5hbSB8ICAxICsKIHRlc3RzL2lmZGVmICAgICAgIHwgMzcgKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKwogNCBmaWxlcyBjaGFuZ2VkLCA0NCBpbnNlcnRpb25z KCspLCAxIGRlbGV0aW9uKC0pCiBjcmVhdGUgbW9kZSAxMDA3NTUgdGVzdHMvaWZkZWYKCmRp ZmYgLS1naXQgYS9ORVdTIGIvTkVXUwppbmRleCBhZDljNmNjLi5mMTQ2NzMwIDEwMDY0NAot LS0gYS9ORVdTCisrKyBiL05FV1MKQEAgLTIsNiArMiwxMSBAQCBHTlUgZGlmZnV0aWxzIE5F V1MgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAtKi0gb3V0bGluZSAtKi0K IAogKiBOb3Rld29ydGh5IGNoYW5nZXMgaW4gcmVsZWFzZSA/Lj8gKD8/Pz8tPz8tPz8pIFs/ XQogCisqKiBCdWcgZml4ZXMKKworICBkaWZmIC1EIG5vIGxvbmdlciBmYWlscyB0byBvdXRw dXQgI2lmbmRlZiBsaW5lcy4KKyAgW2J1ZyM2MTE5MyBpbnRyb2R1Y2VkIGluIDMuOV0KKwog CiAqIE5vdGV3b3J0aHkgY2hhbmdlcyBpbiByZWxlYXNlIDMuOSAoMjAyMy0wMS0xNSkgW3N0 YWJsZV0KIApkaWZmIC0tZ2l0IGEvc3JjL2RpZmYuYyBiL3NyYy9kaWZmLmMKaW5kZXggZGQ2 ZjYzYi4uMmI0ODM0ZiAxMDA2NDQKLS0tIGEvc3JjL2RpZmYuYworKysgYi9zcmMvZGlmZi5j CkBAIC00MTYsNyArNDE2LDcgQEAgbWFpbiAoaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogCSAg ICBjaGFyICpiYXNlID0gYjsKIAkgICAgaW50IGNoYW5nZXMgPSAwOwogCi0JICAgIGZvciAo aSA9IDA7IGkgPCBzaXplb2Ygc2l6ZW9mIENfaWZkZWZfZ3JvdXBfZm9ybWF0czsgaSsrKQor CSAgICBmb3IgKGkgPSAwOyBpIDwgc2l6ZW9mIENfaWZkZWZfZ3JvdXBfZm9ybWF0czsgaSsr KQogCSAgICAgIHsKIAkJY2hhciBjaCA9IENfaWZkZWZfZ3JvdXBfZm9ybWF0c1tpXTsKIAkJ c3dpdGNoIChjaCkKZGlmZiAtLWdpdCBhL3Rlc3RzL01ha2VmaWxlLmFtIGIvdGVzdHMvTWFr ZWZpbGUuYW0KaW5kZXggZDk4ZGY4Mi4uNjI0MTkyZCAxMDA2NDQKLS0tIGEvdGVzdHMvTWFr ZWZpbGUuYW0KKysrIGIvdGVzdHMvTWFrZWZpbGUuYW0KQEAgLTEwLDYgKzEwLDcgQEAgVEVT VFMgPSBcCiAgIGRpZmYzIFwKICAgZXhjZXNzLXNsYXNoIFwKICAgaGVscC12ZXJzaW9uCVwK KyAgaWZkZWYgXAogICBpbnZhbGlkLXJlCVwKICAgZnVuY3Rpb24tbGluZS12cy1sZWFkaW5n LXNwYWNlIFwKICAgaWdub3JlLW1hdGNoaW5nLWxpbmVzIFwKZGlmZiAtLWdpdCBhL3Rlc3Rz L2lmZGVmIGIvdGVzdHMvaWZkZWYKbmV3IGZpbGUgbW9kZSAxMDA3NTUKaW5kZXggMDAwMDAw MC4uZDNiMDVkZAotLS0gL2Rldi9udWxsCisrKyBiL3Rlc3RzL2lmZGVmCkBAIC0wLDAgKzEs MzcgQEAKKyMhL2Jpbi9zaAorIyAtLWlmZGVmCisKKyMgQnVnIHJlcG9ydGVkIGJ5IFJvYmVy dCBXZWJiIGluIDxodHRwOi8vYnVncy5nbnUub3JnLzYxMTkzPi4KKworLiAiJHtzcmNkaXI9 Ln0vaW5pdC5zaCI7IHBhdGhfcHJlcGVuZF8gLi4vc3JjCisKK2ZhaWw9MAorCitjYXQgPDwn RU9GJyA+YQorMQorMgorMworNAorNQorRU9GCisKK2NhdCA8PCdFT0YnID5iCisxCis0Cis1 CitFT0YKKworY2F0IDw8J0VPRicgPmV4cAorMQorI2lmbmRlZiBaWloKKzIKKzMKKyNlbmRp ZiAvKiAhIFpaWiAqLworNAorNQorRU9GCisKK3JldHVybnNfIDEgZGlmZiAtRCBaWlogYSBi ID5vdXQgMj5lcnIgfHwgZmFpbD0xCitjb21wYXJlIGV4cCBvdXQgfHwgZmFpbD0xCisKK0V4 aXQgJGZhaWwKLS0gCjIuMzkuMQoK --------------MXpTSbSnYZg5KOaOW9ULw09w-- ------------=_1676072942-15440-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 31 Jan 2023 05:36:22 +0000 Received: from localhost ([127.0.0.1]:51138 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMjJd-0003QD-RA for submit@debbugs.gnu.org; Tue, 31 Jan 2023 00:36:22 -0500 Received: from lists.gnu.org ([209.51.188.17]:47220) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pMgvD-0007tk-Fz for submit@debbugs.gnu.org; Mon, 30 Jan 2023 22:02:59 -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 ) id 1pMgvD-0006L6-2y for bug-diffutils@gnu.org; Mon, 30 Jan 2023 22:02:59 -0500 Received: from mail-lf1-x131.google.com ([2a00:1450:4864:20::131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pMgvB-0004vd-AJ for bug-diffutils@gnu.org; Mon, 30 Jan 2023 22:02:58 -0500 Received: by mail-lf1-x131.google.com with SMTP id br9so22257859lfb.4 for ; Mon, 30 Jan 2023 19:02:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=CAP00T7tPxr2yJhfldZPKyQgi+7+cPBgmA5NuNTtV78=; b=NxbMH5RdaOMHivrOsKrvcANKEE5G3MoMpx1JJLqFeW5mIfALr11kNoW6v6cSEel78A MqHZWrOUj4TNyAU01PU3p1rbqfpjdl2yw0Ygaklt0I09jaohzgOwWFaUdZsKOvd3INPB 7KyursWKVkLM3jMVtFjW8V/cVVh2bktGHUGBh8Q4flPVqqa+K/toKJ2ueLTLTpBK4EDq hy6GhutqY4S3Lxk6lg5F96LdvkQsARBDHIuG3Gx5Tv4tsWeyegpO5WfnnlT7ho+ILCiY oH/Y9h0kn1GTtWsXUGjhA7OHYWVS7SjNdRg1PYZSp3k4Y3s9Jtykuy+Gl4UhebUgaZgE d5Wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=CAP00T7tPxr2yJhfldZPKyQgi+7+cPBgmA5NuNTtV78=; b=NtLtr373UWjMj0vSMKLTQvcP2Qc7sdbeMI9hFrW7d0CosWdeHThr1Pne/5W4K9mDPi Qdg2nt0vcTAkbX/ijfoCt/G5h6nIvOhDWlRI3cVtZ+fAlV6QS4fJWAvMK+cOmWmnI7o4 42kjeYI1FyrXKI7DwK2r3Vv0I6kpdp/07CBpNGqMettCB6+rfRjinZatk1R+Sr2B4AkY 29Rbdvb/QYmL7tarxIxJYbix+DegTDD62ivBYo6peqCwFZ2bGbYz9cahAfZchsMPQRGk sGsiBjF92WG9UBiCRokpIz/nW+f+dRLUXLMQWgkWQx+bbw/Hv6l6VfIhI/btipkx/2r4 kquQ== X-Gm-Message-State: AFqh2kqImZCtWM0V69vCV0m50q5UyNZUu7oxNufIrkpsdaIACyXppCeH smqg35KgXqaQaAcmFDUxLTKr4lE7ZqCPD+8pGTTBqlqVCC0= X-Google-Smtp-Source: AMrXdXs0yMsiWKyBr9/DK4fIOm7IDglH4UfgpZGbFlJ2C/GMHZwj20e1VvhAXNyCaIfsE5lh6eRCdn4HPaTS8c5Y42U= X-Received: by 2002:a05:6512:31cf:b0:4d5:a689:adc9 with SMTP id j15-20020a05651231cf00b004d5a689adc9mr3462360lfe.16.1675134174844; Mon, 30 Jan 2023 19:02:54 -0800 (PST) MIME-Version: 1.0 From: Robert Webb Date: Mon, 30 Jan 2023 19:02:43 -0800 Message-ID: Subject: '-D' option of diff 3.9 - #ifdef directives missing To: bug-diffutils@gnu.org Content-Type: multipart/alternative; boundary="000000000000715a4d05f3869117" Received-SPF: pass client-ip=2a00:1450:4864:20::131; envelope-from=ro.webbdg@gmail.com; helo=mail-lf1-x131.google.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Tue, 31 Jan 2023 00:36:19 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --000000000000715a4d05f3869117 Content-Type: text/plain; charset="UTF-8" Hi, The merged output from 'diff -D' (v3.9) is missing the '#ifdef' directives. A test script and logs from runs with two versions of diff, one not working, and the second older one working, follows. ------------------------------------------------------------------------- #!/bin/sh # diff_ifdef_example.sh 2023-01-30 rw # # The -D option (--ifdef) of 'diff' version 3.9 does not work correctly. # The '#ifdef' directives are not included in the merged output. diff -v |grep diff seq 5 > c for OPT in '' '-D ZZZ' '-u' ;do printf '\n=== diff %s\n' "$OPT" sed 2,3d c |diff $OPT c - done ------------------------------------------------------------------------- openSUSE Tumbleweed 20230129 diff (GNU diffutils) 3.9 === diff 2,3d1 < 2 < 3 === diff -D ZZZ 1 2 3 4 5 === diff -u --- c 2023-01-30 16:29:06.165608569 -0800 +++ - 2023-01-30 16:29:06.188398585 -0800 @@ -1,5 +1,3 @@ 1 -2 -3 4 5 ------------------------------------------------------------------------- openSUSE Tumbleweed 20220312 diff (GNU diffutils) 3.8 === diff 2,3d1 < 2 < 3 === diff -D ZZZ 1 #ifndef ZZZ 2 3 #endif /* ! ZZZ */ 4 5 === diff -u --- c 2023-01-30 16:32:59.516569839 -0800 +++ - 2023-01-30 16:32:59.529462800 -0800 @@ -1,5 +1,3 @@ 1 -2 -3 4 5 -- Robert Webb --000000000000715a4d05f3869117 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,
The merged output from 'diff -D' (v3.9) is = missing the '#ifdef'
directives.=C2=A0 A test script and logs fr= om runs with two versions of diff,
one not working, and the second older= one working, follows.

---------------------------------------------= ----------------------------
#!/bin/sh
# diff_ifdef_example.sh =C2=A0= 2023-01-30 =C2=A0 rw
#
# The -D option (--ifdef) of 'diff' v= ersion 3.9 does not work correctly.
# The '#ifdef' directives ar= e not included in the merged output.

diff -v |grep diff
seq 5 >= ; c
for OPT in '' '-D ZZZ' '-u' =C2=A0;do
=C2= =A0 printf '\n=3D=3D=3D diff %s\n' "$OPT"
=C2=A0 sed 2= ,3d c =C2=A0|diff $OPT c -
=C2=A0 done

--------------------------= -----------------------------------------------
openSUSE Tumbleweed 2023= 0129
diff (GNU diffutils) 3.9

=3D=3D=3D diff
2,3d1
< 2<= br>< 3

=3D=3D=3D diff -D ZZZ
1
2
3
4
5

=3D= =3D=3D diff -u
--- c 2023-01-30 16:29:06.165608569 -0800
+++ - 2023-0= 1-30 16:29:06.188398585 -0800
@@ -1,5 +1,3 @@
=C2=A01
-2
-3
= =C2=A04
=C2=A05

-------------------------------------------------= ------------------------
openSUSE Tumbleweed 20220312
diff (GNU diffu= tils) 3.8

=3D=3D=3D diff
2,3d1
< 2
< 3

=3D=3D= =3D diff -D ZZZ
1
#ifndef ZZZ
2
3
#endif /* ! ZZZ */
45

=3D=3D=3D diff -u
--- c 2023-01-30 16:32:59.516569839 -0800+++ - 2023-01-30 16:32:59.529462800 -0800
@@ -1,5 +1,3 @@
=C2=A01-2
-3
=C2=A04
=C2=A05

--
Robert Webb
--000000000000715a4d05f3869117-- ------------=_1676072942-15440-1--