From MAILER-DAEMON Thu Dec 20 10:12:06 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1gZzzZ-0004NF-W3
	for mharc-bug-diffutils@gnu.org; Thu, 20 Dec 2018 10:12:06 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:50930)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gZzzX-0004Lu-LA
	for bug-diffutils@gnu.org; Thu, 20 Dec 2018 10:12:04 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gZzzX-0007Ug-1n
	for bug-diffutils@gnu.org; Thu, 20 Dec 2018 10:12:03 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:52395)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1gZzzW-0007UX-ST
	for bug-diffutils@gnu.org; Thu, 20 Dec 2018 10:12:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gZzzW-0004ZL-MQ
	for bug-diffutils@gnu.org; Thu, 20 Dec 2018 10:12:02 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: Ricky Tigg <ricky.tigg@gmail.com>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Thu, 20 Dec 2018 15:12:02 +0000
Resent-Message-ID: <handler.33813.B.154531866617478@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 33813
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: 33813@debbugs.gnu.org
X-Debbugs-Original-To: bug-diffutils@gnu.org
Received: via spool by submit@debbugs.gnu.org id=B.154531866617478
	(code B ref -1); Thu, 20 Dec 2018 15:12:02 +0000
Received: (at submit) by debbugs.gnu.org; 20 Dec 2018 15:11:06 +0000
Received: from localhost ([127.0.0.1]:56653 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1gZzyc-0004Xo-6o
	for submit@debbugs.gnu.org; Thu, 20 Dec 2018 10:11:06 -0500
Received: from eggs.gnu.org ([208.118.235.92]:41018)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <ricky.tigg@gmail.com>) id 1gZzya-0004XH-4w
	for submit@debbugs.gnu.org; Thu, 20 Dec 2018 10:11:04 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ricky.tigg@gmail.com>) id 1gZzyU-0006vY-8C
	for submit@debbugs.gnu.org; Thu, 20 Dec 2018 10:10:58 -0500
Received: from lists.gnu.org ([2001:4830:134:3::11]:50611)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <ricky.tigg@gmail.com>)
	id 1gZzyU-0006vO-3t
	for submit@debbugs.gnu.org; Thu, 20 Dec 2018 10:10:58 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:50604)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ricky.tigg@gmail.com>) id 1gZzyQ-0003lM-UM
	for bug-diffutils@gnu.org; Thu, 20 Dec 2018 10:10:55 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ricky.tigg@gmail.com>) id 1gZzyP-0006sF-Sw
	for bug-diffutils@gnu.org; Thu, 20 Dec 2018 10:10:54 -0500
Received: from mail-oi1-x22e.google.com ([2607:f8b0:4864:20::22e]:37016)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <ricky.tigg@gmail.com>)
	id 1gZzyO-0006r1-4b
	for bug-diffutils@gnu.org; Thu, 20 Dec 2018 10:10:52 -0500
Received: by mail-oi1-x22e.google.com with SMTP id y23so2121471oia.4
	for <bug-diffutils@gnu.org>; Thu, 20 Dec 2018 07:10:51 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; 
	h=mime-version:from:date:message-id:subject:to;
	bh=aaTiDk3AjAGmles1iwVCtExQPXIdh/2HTlKg5BzdQmQ=;
	b=na8RHVya/McRSEoPLT8513vFlld2WdV2WHByouG4SXpZbWryUl+Q+BsoIijGDfvU5J
	f1JFyTymPXmanht5XmGR33EBYd9vgEmskIA4OcZ3AOq/B71OgSsQzek/CGfKvm49Ug/3
	lvqamJSzNEzxbXynU//1ZafFHHqU+jkHgkkp5mazTiOP5NxPHaCEXUbcY2MMbvITrkQa
	fVpPjlrqexL5MvK3US2gTRbmQXgF86VldhQOciLXbiHPpvIp0BnvAPgoBhgaDRpQZ5qy
	Xhj75Bh9aqb3BEhUJwtCHwjMwS/EaA7iAW6ig2qnJge9oAuLDg8Cm203++V/632x1zJr
	oxPg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20161025;
	h=x-gm-message-state:mime-version:from:date:message-id:subject:to;
	bh=aaTiDk3AjAGmles1iwVCtExQPXIdh/2HTlKg5BzdQmQ=;
	b=jKMXkPSa2qNjWqhg8oKTXuElnZbg6im/o5w/p4QtDrzr+EjU6U8aM8YWh9E8oR0JQN
	oIucA0uwFq5MVuf4NQ2EUNVf5kUt/lp9BWybJV8bGIPZNsvW6MYVlC/c8t/M3yYLkmN6
	Zvs7nZQdf2wPPkLR9JFGuqjVMVAgsDtcBhjN9Nl9SO/yiRpz1KG+qXBtE28YBkiARkw6
	ihdMvKg2fkxHLraWkexeFe4p+14vOPxqwDlDdY2vau69CKyGWMEJzZrr+qN3SsY22ivF
	OlqstXi4vdfu9QGX+/wXfdDbQ1RsAadE886j1KnrHsdh6XcPXtuzOP69Viat0hMTJmiS
	yxsw==
X-Gm-Message-State: AA+aEWYQFR8NpMYHL+NeHMXpxIfZtrUrc1uaB4NBEI6VNHmYYLpj+oHP
	f0p38n7FAzM6PfllLR9ehRPlSLBFxtV+rD85XSL2wbjm
X-Google-Smtp-Source: AFSGD/UPP4B9UdVbEdbhvyCGLprY86QuqNLycqnEPMgylYCvpXDBLGqP9JkKjw2KEIJ1/NteZBqHeAJUDztrz+/pvKU=
X-Received: by 2002:aca:720a:: with SMTP id p10mr2481501oic.169.1545318650935; 
	Thu, 20 Dec 2018 07:10:50 -0800 (PST)
MIME-Version: 1.0
From: Ricky Tigg <ricky.tigg@gmail.com>
Date: Thu, 20 Dec 2018 16:10:39 +0100
Message-ID: <CAM_8-Ch_ESJCac5Dbt8P1SJLm0m95CTyVvRfTDdnESNGwu=GWA@mail.gmail.com>
Content-Type: multipart/mixed; boundary="000000000000418297057d75890d"
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
	recognized.
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
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-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] =?utf-8?q?bug=2333813=3A_GNU_diffutils_3=2E6_?=
 =?utf-8?q?=E2=80=93_=27diff_-y=27_=E2=80=93_Several_mark_types_used_as_se?=
 =?utf-8?q?parators_instead_of_one_=E2=80=93_Inappropriate_options_combina?=
 =?utf-8?q?tions?=
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: <http://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, 20 Dec 2018 15:12:04 -0000

--000000000000418297057d75890d
Content-Type: multipart/alternative; boundary="000000000000418295057d75890b"

--000000000000418295057d75890b
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Hi *bug-diffutils@gnu.org <bug-diffutils@gnu.org>* subscribers.

   - Case 1

Commands executed:
$ echo - > a1 && echo + > a2
$ diff -y a1 a2
-                                  |    +

Both terminal,  from which patterns are *copied*, and text editor document,
to which pattern is *pasted *=E2=80=93 *see attachment* =E2=80=93, use mono=
-space font.
Output resulting from 'diff -y a1 a2' contains *tabular* and *point *marks
in the same row as separators between left'-sided column and right'-sided
column. Would it be suitable according to developers to produce separators
relying on a unique mark =E2=80=93 *tabular* or *point* =E2=80=93 ?

   - Case 2

As noticeable, the tool *Diff *allows for *options combinations* that
cannot cohabit together because of their very features. A way for *Diff* to
avoid handling such combinations would be appropriate. Here is an
illustration of such combinations:

$ diff -qsy a1 a2
Files a1 and a2 differ
$ diff -yqs a1 a2
Files a1 and a2 differ
$ diff -qys a1 a2
Files a1 and a2 differ

Regards, R.T.

--000000000000418295057d75890b
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div dir=3D"ltr"><div dir=3D"ltr"><div dir=3D"ltr"><div di=
r=3D"ltr"><div>Hi <i><a href=3D"mailto:bug-diffutils@gnu.org">bug-diffutils=
@gnu.org</a></i> subscribers. <br></div><div></div><div><ul><li>Case 1</li>=
</ul></div><div>Commands executed:</div><div><span style=3D"font-family:mon=
ospace,monospace">$ echo - &gt; a1 &amp;&amp; echo + &gt; a2<br>$ diff -y a=
1 a2<br>-=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=
=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0=C2=A0=C2=A0 +</span></div><div><br></div><=
div></div><div>Both terminal,=C2=A0 from which patterns are <i>copied</i>, =
and text editor document, to which pattern is <i>pasted </i>=E2=80=93 <i>se=
e attachment</i> =E2=80=93, use mono-space font. Output resulting from &#39=
;<span style=3D"font-family:monospace,monospace">diff -y a1 a2</span>&#39; =
contains <b>tabular</b> and <b>point </b>marks in the same row as separator=
s between left&#39;-sided column and right&#39;-sided column. Would it be s=
uitable according to developers to produce separators relying on a unique m=
ark =E2=80=93 <b>tabular</b> or <b>point</b> =E2=80=93 ? <br></div><div></d=
iv><div><ul><li>Case 2</li></ul></div><div>As noticeable, the tool <i>Diff =
</i>allows for <b>options combinations</b> that cannot cohabit together bec=
ause of their very features. A way for <i>Diff</i> to avoid handling such c=
ombinations would be appropriate. Here is an illustration of such combinati=
ons:</div><div><br></div><div><span style=3D"font-family:monospace,monospac=
e">$ diff -qsy a1 a2<br>Files a1 and a2 differ<br>$ diff -yqs a1 a2<br>File=
s a1 and a2 differ<br>$ diff -qys a1 a2<br>Files a1 and a2 differ<br></span=
></div><div></div><div><br></div><div>Regards, R.T.<br></div></div></div></=
div></div></div>

--000000000000418295057d75890b--

--000000000000418297057d75890d
Content-Type: image/png; 
	name="diffutils.x86_64_v.3.6_Option_y_Font_mono-space.png"
Content-Disposition: attachment; 
	filename="diffutils.x86_64_v.3.6_Option_y_Font_mono-space.png"
Content-Transfer-Encoding: base64
Content-ID: <f_jpwpebva0>
X-Attachment-Id: f_jpwpebva0

iVBORw0KGgoAAAANSUhEUgAAAcIAAAApCAYAAACm7CmwAAAABHNCSVQICAgIfAhkiAAAABl0RVh0
U29mdHdhcmUAZ25vbWUtc2NyZWVuc2hvdO8Dvz4AAAtwSURBVHic7d17TJPnHgfw70ulpAW5dlTA
cRlXM8hRyOLiJEODTLbpFAxjE1BxSuYMboepYOQ4MgcEt/2xZF5HvDG8zGMMesJ2OIDbKhsqc8OO
AwpOnUckWgSsBcvlOX+YdXZtoTd4eeH3SZrY9336/L7lRZ4+76UvxxhjIIQQQiYpB74DEEIIIXyi
gZAQQsikNuJAmJaWhrKyMrsWPXv2LDiOQ3Nzs8G6+Ph4REZGDvv6jo4OvPHGG/Dx8YGjoyPc3d2x
detWq9sRQgiZvKYYW6hSqZCbm4vKykq0t7fjq6++wkcffYRNmzZh1apVoxpoyZIl6OnpGbZNbm4u
Tp8+jcLCQkRERMDBwQFyudzqdkK3bt067Nq1C3fv3oVMJhvVWt988w0++OADKJVKuLi4IDY2FkVF
RQgODta16dQMoKD6Nuquq9HzaFDv9Vvm+WBFzOhmJIQQSxgdCNesWYMrV67g+PHj+OSTTxAbG4vB
wUGsXr0afn5+SEhIGLVA69evH7HNhQsXkJ6ejuzsbLu0EyKNRoOffvoJJSUlUCgUY1Kzvr4er776
KlJTU1FUVASVSoWtW7di4cKFUCqVcHJyAgAUVN/G1y3dAAB/dzGq3grHtqr/4RlPJxoECSHjjtFd
ozU1NXjnnXcwZ84cSCQSyGQy5OTkIDU1FZcvX7a4yPbt2yGXy+Hs7IxXXnkF7e3teuvv3bsHjuN0
D1O7RmUyGTiOw6+//ordu3frvebAgQMWt7OHqqoqcByH+vp6g3Vr165FcHAwrDkx99ChQ4iMjIRU
KoW/vz82btwIrVarWx8dHY3ExET4+/ujuLjYpvdgTj0A2LdvHwIDA3Hw4EHExcUhOTkZO3fuRGtr
K3755Rddu7rrapvzEELIWDE6I/T29kZdXR3efvttveXl5eUWFzh27Bjy8/NRVFSE5ORknD9/Hvn5
+XptPDw8dANsYWEhGhsbjfalUCgwMDCAl156CYmJiXj33Xd166ZPn25xO3tYsGABZsyYgT179mD2
7Nm65RqNBkePHkV+fj44jrOoz9raWqxcuRLbt2/H0qVLceHCBWRmZsLT0xN5eXkAgMrKSvj6+sLJ
yQlHjx616T2YUw8A9u7di4cPH8LB4c/PT46OjgAAkUj05zKRZe+XEEL4ZHQgLC4uRmpqKlpaWvDg
wQP4+fmhp6cHrq6uFhcoKytDTEwMcnNzAQChoaFobGxESUmJro1IJNLNAj09PU32FRERAeDxH1+Z
TGZy5mhuO3vJzs5GTk4OPv30U7i7uwMAjh8/jv7+fmRmZlrcX2dnJzIyMrBlyxYAwIwZM1BWVoaq
qirdwBQUFGS3/ObUAwAHBwdMnTpV93xoaAiFhYWIjIxEdHS0bnliuBvKLqnslo8QQkaT0V2jSUlJ
aGpqwvz583H//n2UlJRALpfjvffeQ19fn15btXYIBxvu4T+txk9waWpqwqxZs/SWPffcc3aKb7uR
8gOAVqtFV1eX7tHd3a23PiMjA2KxGIcPH9YtKy0tRUpKCry8vCyumZycbLALd/r06ejs7LTgnZlf
05p6g4ODyMrKwrlz51BeXq43690c54Oc2GmI8XO2Oi8hhIwVk5dPhISEoLi4GPHx8di1axd27tyJ
L774Ahs3btRr1907gMLadhz52fgfTbVaDTc3N71l1swsR8tI+YHHx888PDx0j78OblKpFKtXr8ae
PXsAAC0tLVAoFAa7ls2t2dHRgczMTDz99NNwdHQEx3HYv3+/le9w5JqW1lOr1Vi8eDEqKipQU1OD
qKgovfViEYe1s59CwQJfmzITQshYMBgIGWNoa2vTW+bi4oJVq1Zh06ZNOHnypEUFpFKpwQxKpRLW
brNFixbh+++/1z2+/fZbgzbr169Hc3MzFAoFSktLMWvWLDz//PNW1VuxYgWqqqpw5MgRaDQaMMZG
9bIVS+qpVCq8+OKLuHnzJs6fP4+YmJhRy0UIIWPB4BjhyZMnkZKSgmvXriEgIEBvnUQiMTjxw89N
jJb39WcETwoPD8fFixf1ltXW1tqS2a5Gyg8Acrl8xOsPAwMDsWjRIuzevRvV1dX48MMPra6pUCiQ
nZ2NuXPnAnj84aShocHik27MrWluvd7eXiQkJEAsFqOmpsZgpk8IIUJkMBC+/PLLCAsLQ1JSEnbs
2AG1Wo07d+7gxIkT2LFjB9LS0iwq8PrrryMzMxPbtm3DkiVLoFAo8MMPP+i1aWtrQ39/PwCgq6sL
Wq1W960zEonEYEAerzZs2ID58+fD1dUVb775ptX9BAUFQaFQoKenB319fSgoKICzszNaW1uhVqvh
4uKi+zcA3LhxAwCgVCrh7u4OiUSC8PBwu9YDgLy8PCiVSpw5cwa//fabXh++vr7w9va2+j0TQghv
mBG///47y8jIYL6+vozjOCYWi1loaCgrKChgjx49MvYSk4aGhlheXh7z8vJiUqmULV26lFVXVzMA
rLGxkTHGWEBAAANg9BETE2PQZ0BAANu8efOItc1tZ0/e3t4sOzvbpj7q6upYVFQUc3JyYmFhYezL
L79kDQ0NbNq0aczNzY11d3ezF154weTP7Nlnn7V7PcYYCwwMNFmzqKjIoN8rd3tZ/L5mxhhj//j3
LXbg4l2bfi6EEDIaOMaGv9o7LS0NCxcutHgmOBl99913mDdvHpqamiyakU1UV+/1Yd2pG/TNMoSQ
cc3odYRPSkpKQkhIiPUVnjzOZGzM5Xu9Hdy6dQtKpRJZWVlYuXIlDYKEECIgI84Ibeud0x98xttz
O1m+fDlOnz6NpKQkfP7553B2puvnAEClGcC/mruREe2F2rYH8JCKMNNHyncsQgjRM3oDoalBZwLM
AAkhhEwcozsjJIQQQsY5ukM9IYSQSY0GQkIIIWaJiIjAxx9/zHcMuxvxrFFCCCFEiDo1Ayiovo26
62r0PBrUW7dlno/uci4aCAkhhAjW1atX4eXlZfQWfgXVt/F1y+PvuvZ3F5u8ppn3XaODAjlXRyg5
TRFyfsrODyFnB4Sff6Kz1/ZJT09HRUWF0XV119Vm9cHrQMgAvHXiOg423OMzxoiEktMUIeen7PwQ
cnZA+PknurHaPo4i825UwOtAyAFICHVFUW07zjR38RllWELJaYqQ81N2fgg5OyD8/BPdWG2fxHDz
7pBj8hihVquFRqPRPec4zi633enuG8QQY2Ds8aeCBWFuuH5fi9zKW/CUTMGcABeba9iDUHKaIuT8
lJ0fQs4O8JdfrR3CPy93ws9NjPgQ0zcdt2c7Pvqylb22z507d+Dj46O3rL6+XncP1ddeew2nTp0C
AGyO84HcxRFnrz3A3Yf9Jvs0ORAeOnQIa9as0T0XiUQYGBgwK+hwEkpb0NU7aHTdhoqbOJsVAWcx
74cuBZPTFCHnp+z8EHJ2gL/83b0DKKxtx9zAqcMOJPZsx0dftrLX9pHJZLh06ZLueUZGBpYtW4bF
ixcDgN6ETSzisHb2U5gXPBXrTt0w2afJgfCPu7L/wZabwj5pb1IgBob0D5Ke+W83yn9WYXOcz7j5
jyaUnKYIOT9l54eQswPCzz/R2Wv7TJkyBTNnztQ9l0ql8Pf311tmKZMDoTl3ZbfG3/7ypctnrz3A
scZO/D12GpZFedi9nrWEktMUIeen7PwQcnaAv/x+bmK0vB81pu346MtW4/n3i/ezRj8714HlMz2R
NfspPqMMSyg5TRFyfsrODyFnB4Sff6Ibb9uH1wvqOQAHUoIw1UnEZ4wRCSWnKULOT9n5IeTsgPDz
T3T23D4//vijzX3w/s0yrgL5RRVKTlOEnJ+y80PI2QHh55/oxtP2oaPHhBBCJjXeZ4SEEELIaPKU
TkF69OPvFo17xhUeUv3ZKN2YlxBCyKRGu0YJIYRMajQQEkIImdRoICSEEDKp0UBICCFkUvs/LUQt
ndJLEy4AAAAASUVORK5CYII=
--000000000000418297057d75890d--




From MAILER-DAEMON Mon Dec 24 19:01:09 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1gba9l-0005w3-4G
	for mharc-bug-diffutils@gnu.org; Mon, 24 Dec 2018 19:01:09 -0500
Received: from eggs.gnu.org ([208.118.235.92]:43491)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gba9j-0005vs-IQ
	for bug-diffutils@gnu.org; Mon, 24 Dec 2018 19:01:08 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gba9g-0000me-BJ
	for bug-diffutils@gnu.org; Mon, 24 Dec 2018 19:01:07 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:43684)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1gba9e-0000mO-Um
	for bug-diffutils@gnu.org; Mon, 24 Dec 2018 19:01:03 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gba9e-0002PF-Mq
	for bug-diffutils@gnu.org; Mon, 24 Dec 2018 19:01: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: Tue, 25 Dec 2018 00:01:02 +0000
Resent-Message-ID: <handler.33863.B.15456960459217@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: report 33863
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: patch
To: 33863@debbugs.gnu.org
X-Debbugs-Original-To: bug-diffutils@gnu.org
Received: via spool by submit@debbugs.gnu.org id=B.15456960459217
	(code B ref -1); Tue, 25 Dec 2018 00:01:02 +0000
Received: (at submit) by debbugs.gnu.org; 25 Dec 2018 00:00:45 +0000
Received: from localhost ([127.0.0.1]:35671 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1gba9N-0002Ob-Ea
	for submit@debbugs.gnu.org; Mon, 24 Dec 2018 19:00:45 -0500
Received: from eggs.gnu.org ([208.118.235.92]:51398)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <meyering@gmail.com>) id 1gba9L-0002ON-An
	for submit@debbugs.gnu.org; Mon, 24 Dec 2018 19:00:43 -0500
Received: from lists.gnu.org ([208.118.235.17]:57842)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <meyering@gmail.com>) id 1gba9G-0000hL-4c
	for submit@debbugs.gnu.org; Mon, 24 Dec 2018 19:00:38 -0500
Received: from eggs.gnu.org ([208.118.235.92]:43447)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <meyering@gmail.com>) id 1gba9F-0005t5-AW
	for bug-diffutils@gnu.org; Mon, 24 Dec 2018 19:00:37 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <meyering@gmail.com>) id 1gba9C-0000fk-61
	for bug-diffutils@gnu.org; Mon, 24 Dec 2018 19:00:37 -0500
Received: from mail-wr1-f66.google.com ([209.85.221.66]:45041)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <meyering@gmail.com>) id 1gba9B-0000fK-W2
	for bug-diffutils@gnu.org; Mon, 24 Dec 2018 19:00:34 -0500
Received: by mail-wr1-f66.google.com with SMTP id z5so12674279wrt.11
	for <bug-diffutils@gnu.org>; Mon, 24 Dec 2018 16:00:33 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20161025;
	h=x-gm-message-state:mime-version:from:date:message-id:subject:to;
	bh=mwNhStjx1KfqbswnCRFkI27b8gGNSNnXVAzc//YE6pg=;
	b=ZAT9Se05KWKR8j81deWevM5ijYrOfui9D3pZkEUe7FscgwFhFNffEJsM8ddeQP+z5l
	6b1ctfHcACVHzjXOmOTJE47jT9xe/4aKtBtl3Hcbco5xekLnir3nuBXYBg+EOpPXbDmQ
	rgZuJEZJPEkyNMV891ibOqLZkh47VONzioXtHiF9CQj72DsKXCZmi3PrYFcz5H3t5TjT
	z300oP5qc6kP7XHxXWcci2x26/m2SUrqguNvBqmv5Ys+X7IoJsg7blBROJGyqt3AgLo7
	b/6wTZ8sx6wmlJ0rUi+aVkhaWc4LQ67TIO5v5fuRluipjB7RlKZXaJ8LDOfnpMVSLPqs
	0TCA==
X-Gm-Message-State: AJcUukdc9Glgn+9wei0KUKkNKA/CcRc4RuEcfFPUijodIAyj4/NKiyPU
	GAv059YKJfQLuWeIBOtqHtS2juhjemtPHzZxqoetq7r6
X-Google-Smtp-Source: ALg8bN5oegoUmFWDrmxOUALAXUfbUwTo0wsnkMDN8L3zr1JDXos3Ax9B0MSGyulZGi2kNPrC6RtNBDZzl2w5nG9rxUM=
X-Received: by 2002:adf:8464:: with SMTP id 91mr14003149wrf.251.1545696032215; 
	Mon, 24 Dec 2018 16:00:32 -0800 (PST)
MIME-Version: 1.0
From: Jim Meyering <jim@meyering.net>
Date: Mon, 24 Dec 2018 16:00:20 -0800
Message-ID: <CA+8g5KFtL_8ZUs=EHLatRQoh+rji9vqme4zGfbiDyziPMeE0EQ@mail.gmail.com>
Content-Type: multipart/mixed; boundary="000000000000ee7281057dcd66ae"
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
	[fuzzy]
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
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-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#33863: [PATCH] build: avoid build failure with
 --enable-gcc-warnings and latest gcc
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: <http://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: Tue, 25 Dec 2018 00:01:08 -0000

--000000000000ee7281057dcd66ae
Content-Type: text/plain; charset="UTF-8"

Preparing for a release, I noticed a build failure. Here's what I've
just pushed, along with a few maintenance-related diffs:

* src/diff.c (usage): Assert that each line length is no longer than
the minimum required size of 4095.  This lets newer gcc (currently
9.0.0 20181219) infer that it need not issue this warning:
diff.c:1012:19: error: '%.*s' directive output between 0 and 2147483647
bytes may exceed minimum required size of 4095
[-Werror=format-overflow=]
1012 |        printf ("  %.*s", msglen, msg);

--000000000000ee7281057dcd66ae
Content-Type: application/octet-stream; name="format-overflow-warning.diff"
Content-Disposition: attachment; filename="format-overflow-warning.diff"
Content-Transfer-Encoding: base64
Content-ID: <f_jq2zhub30>
X-Attachment-Id: f_jq2zhub30

RnJvbSBkNWJhYjNhZmQ4OGE3OTI5MzNjNTY1NzQ0YTE2NjY3YmViMmU1OTNhIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gTWV5ZXJpbmcgPG1leWVyaW5nQGZiLmNvbT4KRGF0ZTog
U3VuLCAyMyBEZWMgMjAxOCAxODowMzoxMyAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIGJ1aWxkOiBh
dm9pZCBidWlsZCBmYWlsdXJlIHdpdGggLS1lbmFibGUtZ2NjLXdhcm5pbmdzIGFuZAogbGF0ZXN0
IGdjYwoKKiBzcmMvZGlmZi5jICh1c2FnZSk6IEFzc2VydCB0aGF0IGVhY2ggbGluZSBsZW5ndGgg
aXMgbm8gbG9uZ2VyIHRoYW4KdGhlIG1pbmltdW0gcmVxdWlyZWQgc2l6ZSBvZiA0MDk1LiAgVGhp
cyBsZXRzIG5ld2VyIGdjYyAoY3VycmVudGx5CjkuMC4wIDIwMTgxMjE5KSBpbmZlciB0aGF0IGl0
IG5lZWQgbm90IGlzc3VlIHRoaXMgd2FybmluZzoKZGlmZi5jOjEwMTI6MTk6IGVycm9yOiAnJS4q
cycgZGlyZWN0aXZlIG91dHB1dCBiZXR3ZWVuIDAgYW5kIDIxNDc0ODM2NDcKYnl0ZXMgbWF5IGV4
Y2VlZCBtaW5pbXVtIHJlcXVpcmVkIHNpemUgb2YgNDA5NQpbLVdlcnJvcj1mb3JtYXQtb3ZlcmZs
b3c9XQoxMDEyIHwgICAgICAgIHByaW50ZiAoIiAgJS4qcyIsIG1zZ2xlbiwgbXNnKTsKLS0tCiBz
cmMvZGlmZi5jIHwgMyArKysKIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKykKCmRpZmYg
LS1naXQgYS9zcmMvZGlmZi5jIGIvc3JjL2RpZmYuYwppbmRleCA0NzRkYTFlLi5lMmViMzI0IDEw
MDY0NAotLS0gYS9zcmMvZGlmZi5jCisrKyBiL3NyYy9kaWZmLmMKQEAgLTEwMDksNiArMTAwOSw5
IEBAIE1hbmRhdG9yeSBhcmd1bWVudHMgdG8gbG9uZyBvcHRpb25zIGFyZSBtYW5kYXRvcnkgZm9y
IHNob3J0IG9wdGlvbnMgdG9vLlxuXAogCSAgd2hpbGUgKChubCA9IHN0cmNociAobXNnLCAnXG4n
KSkpCiAJICAgIHsKIAkgICAgICBpbnQgbXNnbGVuID0gbmwgKyAxIC0gbXNnOworCSAgICAgIC8q
IFRoaXMgYXNzZXJ0aW9uIGlzIHNvbGVseSB0byBhdm9pZCBhIHdhcm5pbmcgZnJvbQorCQkgZ2Nj
J3MgLVdmb3JtYXQtb3ZlcmZsb3c9LiAgKi8KKwkgICAgICBhc3NlcnQgKG1zZ2xlbiA8IDQwOTYp
OwogCSAgICAgIHByaW50ZiAoIiAgJS4qcyIsIG1zZ2xlbiwgbXNnKTsKIAkgICAgICBtc2cgPSBu
bCArIDE7CiAJICAgIH0KLS0gCjIuMjAuMS4yLmdiMjFlYmI2NzFiCgo=
--000000000000ee7281057dcd66ae--




From MAILER-DAEMON Mon Dec 24 19:22:11 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1gbaU7-0001C6-2s
	for mharc-bug-diffutils@gnu.org; Mon, 24 Dec 2018 19:22:11 -0500
Received: from eggs.gnu.org ([208.118.235.92]:45423)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gbaU5-0001AW-2C
	for bug-diffutils@gnu.org; Mon, 24 Dec 2018 19:22:09 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gbaU0-0004ET-6g
	for bug-diffutils@gnu.org; Mon, 24 Dec 2018 19:22:09 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:49022)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1gbaU0-0004EJ-3q
	for bug-diffutils@gnu.org; Mon, 24 Dec 2018 19:22:04 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gbaTz-0002ud-T4
	for bug-diffutils@gnu.org; Mon, 24 Dec 2018 19:22:03 -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: Tue, 25 Dec 2018 00:22:01 +0000
Resent-Message-ID: <handler.33863.D33863.154569726611118.done@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: cc-closed 33863
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: patch
To: 33863-done@debbugs.gnu.org
Mail-Followup-To: 33863@debbugs.gnu.org, jim@meyering.net, jim@meyering.net
Received: via spool by 33863-done@debbugs.gnu.org id=D33863.154569726611118
	(code D ref 33863); Tue, 25 Dec 2018 00:22:01 +0000
Received: (at 33863-done) by debbugs.gnu.org; 25 Dec 2018 00:21:06 +0000
Received: from localhost ([127.0.0.1]:35675 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1gbaT4-0002tG-8y
	for submit@debbugs.gnu.org; Mon, 24 Dec 2018 19:21:06 -0500
Received: from mail-wr1-f49.google.com ([209.85.221.49]:38858)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <meyering@gmail.com>) id 1gbaT1-0002sQ-Q2
	for 33863-done@debbugs.gnu.org; Mon, 24 Dec 2018 19:21:05 -0500
Received: by mail-wr1-f49.google.com with SMTP id v13so12710901wrw.5
	for <33863-done@debbugs.gnu.org>; Mon, 24 Dec 2018 16:21:03 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20161025;
	h=x-gm-message-state:mime-version:references:in-reply-to:from:date
	:message-id:subject:to;
	bh=47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=;
	b=cNW1P7mzWS1zgKP4Uixt49TSaflbagTQ6ABcU+H2qXpgHO2tiScK4mc+f65qKJRMfR
	njy524jL4FfWAemHRf6ZmkW+tkbdLLYd5VyjUdi7Kz/0B9MttQOATjB3F7MeiiAITQ+u
	ZyTxAykB7SxOmTo5KiaKpfhjMuYq5VaY5jidHXVvDat0EeRZQmEcFfg4nysH86RwE/0O
	AGVcn11Q8OWv15idlJjDAttmBFxL4DmX6u5SZFwFKRShspmTv+SE/buXMOlAfMETLd9k
	2oiMEvuWjpRpFFSfKhPklPSk3+N3VWDcHCzTPKPd7Bt3BfpFPE77ypofp41IGBDo7vMM
	HNgA==
X-Gm-Message-State: AJcUukfbmD/KjILxBcVUzwDbZvk4lM941CH1raFyBUiegqDroA9Sxhwl
	FYfLctjpyomXxht2P883CsCPj9WIl/mdC5xN4xmeKg==
X-Google-Smtp-Source: ALg8bN6+C8a2rjZn/HRY9Mxu+7ykPardd6F1XHpYgWWuS05+jdlXD3HrczIi1BdEJrCqSSUlEN5OAi80iU60xfnAKdM=
X-Received: by 2002:adf:8464:: with SMTP id 91mr14042530wrf.251.1545697257585; 
	Mon, 24 Dec 2018 16:20:57 -0800 (PST)
MIME-Version: 1.0
References: <CA+8g5KFtL_8ZUs=EHLatRQoh+rji9vqme4zGfbiDyziPMeE0EQ@mail.gmail.com>
In-Reply-To: <CA+8g5KFtL_8ZUs=EHLatRQoh+rji9vqme4zGfbiDyziPMeE0EQ@mail.gmail.com>
From: Jim Meyering <jim@meyering.net>
Date: Mon, 24 Dec 2018 16:20:45 -0800
Message-ID: <CA+8g5KG1Z8ryQx8zH+3ch46CW6fuWVBxuRHJ=Xy8VrjHq8HGrQ@mail.gmail.com>
Content-Type: text/plain; charset="UTF-8"
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-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#33863: bug#33863: [PATCH] build: avoid build
 failure with --enable-gcc-warnings and latest gcc
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: <http://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: Tue, 25 Dec 2018 00:22:09 -0000






From MAILER-DAEMON Fri Dec 28 20:14:10 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1gd3Cc-0005SQ-15
	for mharc-bug-diffutils@gnu.org; Fri, 28 Dec 2018 20:14:10 -0500
Received: from eggs.gnu.org ([208.118.235.92]:56188)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gd3CZ-0005Nd-Hv
	for bug-diffutils@gnu.org; Fri, 28 Dec 2018 20:14:09 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gd3CU-0006pn-ST
	for bug-diffutils@gnu.org; Fri, 28 Dec 2018 20:14:07 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:45063)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1gd3CU-0006pY-JM
	for bug-diffutils@gnu.org; Fri, 28 Dec 2018 20:14:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gd3CU-0004DY-8P
	for bug-diffutils@gnu.org; Fri, 28 Dec 2018 20:14: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: Sat, 29 Dec 2018 01:14:02 +0000
Resent-Message-ID: <handler.31935.B31935.154604601016161@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 31935
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Hongxu Chen <leftcopy.chx@gmail.com>
Cc: 31935@debbugs.gnu.org
Received: via spool by 31935-submit@debbugs.gnu.org id=B31935.154604601016161
	(code B ref 31935); Sat, 29 Dec 2018 01:14:02 +0000
Received: (at 31935) by debbugs.gnu.org; 29 Dec 2018 01:13:30 +0000
Received: from localhost ([127.0.0.1]:40734 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1gd3By-0004Cb-9k
	for submit@debbugs.gnu.org; Fri, 28 Dec 2018 20:13:30 -0500
Received: from mail-wm1-f41.google.com ([209.85.128.41]:35597)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <meyering@gmail.com>) id 1gd3Bw-0004CM-KS
	for 31935@debbugs.gnu.org; Fri, 28 Dec 2018 20:13:29 -0500
Received: by mail-wm1-f41.google.com with SMTP id t200so8856603wmt.0
	for <31935@debbugs.gnu.org>; Fri, 28 Dec 2018 17:13:28 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20161025;
	h=x-gm-message-state:mime-version:references:in-reply-to:from:date
	:message-id:subject:to:cc;
	bh=bkkfFCfRbivr7CaTYxO2DuQoVQJRLPB7gSTHvA4I1Yk=;
	b=dEoR2tBE/MUe5KNUu5WjhWCYcM4QJdgUZQIdsZ/ET3O50t8ecetrrjO0hlwEFCitiU
	DT5nc7XSHzdKNEKMoZREt8Rel1il1BBGf159zo1bipHU+p2nlyZgsnp+4FRs1pWuz7k6
	9MKNpE3Q/0r73KokeKpT2iIqVwatQg25CjmL/bBG5wxF5uOczEMDbC0vnwoFn38C/3U4
	nz2LrrPzt+Z5HpZQpraS92MZwjWMsEv0vKcyCpMeBBNYRurDzQDXrE9pdvaA9nBE10qT
	KRBaVE5UJXnzqG1rrCKvDIlCDOhjAv0tlU/SPSDIB1fNib1+q0QvL1kNKd3ttOD2ajQi
	lM7A==
X-Gm-Message-State: AA+aEWbQyCVAnr0vVakY/lb9DRgmIfyM9AIpyV7FyZMSuxmfuz2CqrFs
	coYjfTJwXblfhzayHlTWkKG+ZqjVG9VmrFWFheU=
X-Google-Smtp-Source: ALg8bN67KVJVwJitVUqOc5MeXcDESWbgRwrD+CQaNXfzXh7iLDVvAhlVTuCPGJJjcglWJ7EqHeFqXIuUaW2nW6nS8PA=
X-Received: by 2002:a1c:f613:: with SMTP id w19mr25522831wmc.0.1546046002944; 
	Fri, 28 Dec 2018 17:13:22 -0800 (PST)
MIME-Version: 1.0
References: <CAJPBKOHSy03XCKwJZr8i0-z+=iN5MswopHPiMr_6Pu+urrKDCw@mail.gmail.com>
In-Reply-To: <CAJPBKOHSy03XCKwJZr8i0-z+=iN5MswopHPiMr_6Pu+urrKDCw@mail.gmail.com>
From: Jim Meyering <jim@meyering.net>
Date: Fri, 28 Dec 2018 17:13:10 -0800
Message-ID: <CA+8g5KEyJLBu1Gct5pU2K7u5qPBs=0J5tNT-wbUb1yoCqt1u1A@mail.gmail.com>
Content-Type: multipart/mixed; boundary="000000000000d038bf057e1ee2d5"
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-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#31935: bug#31935: 2 crashes in diffutills
 commit version 576645c
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: <http://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, 29 Dec 2018 01:14:09 -0000

--000000000000d038bf057e1ee2d5
Content-Type: text/plain; charset="UTF-8"

On Fri, Jun 22, 2018 at 7:49 AM Hongxu Chen <leftcopy.chx@gmail.com> wrote:
>     We found with our fuzzer 2 crashes on diffutils version 576645c: one is a heap-buffer-overflow at util.c:1249, another is an invalid read resulting from `output_1_line' at util.c:1274.
>     The executing command is: `./diff -a --strip-trailing-cr $file add.wasm` where $file is the poc file (I attached them as  *.input.txt); "add.wasm" is also attached however it seems that content of the comparison file is not important.

Thank you for fuzz-testing diffutils.
FYI, here is a reproducer for the limit[-1]-related UMR bugs:

  valgrind src/diff -a --strip-trailing-cr <(printf '\r') <(echo a)

I've attached a patch:

--000000000000d038bf057e1ee2d5
Content-Type: application/octet-stream; name="diffutils-UMR.diff"
Content-Disposition: attachment; filename="diffutils-UMR.diff"
Content-Transfer-Encoding: base64
Content-ID: <f_jq8rsy7j0>
X-Attachment-Id: f_jq8rsy7j0

RnJvbSA0Y2ZiNzA5YmQ4NDhhZmJhNjgzNDg5NWE2OWViMDFkMmJiZmRhNzM2IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gTWV5ZXJpbmcgPG1leWVyaW5nQGZiLmNvbT4KRGF0ZTog
RnJpLCAyOCBEZWMgMjAxOCAxNjoxMjoxMSAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIGRpZmY6IGF2
b2lkIHVuaW5pdGlhbGl6ZWQgbWVtb3J5IHJlYWQgd2l0aAogLS1zdHJpcC10cmFpbGluZy1jcgoK
KiBORVdTOiAoQnVnIGZpeGVkKTogTWVudGlvbiBpdC4KKiBzcmMvdXRpbC5jIChwcmludF8xX2xp
bmVfbmwpOiBBdm9pZCAtLXN0cmlwLXRyYWlsaW5nLWNyIFVNUiB3aGVuIHRoZQpidWZmZXIgY29u
c2lzdHMgb2YgYSBzb2xlIENSLiBUaGF0IGhhcHBlbmVkIGR1ZSB0byBhbiB1bmNoZWNrZWQKcmVm
ZXJlbmNlIHRvIGxpbWl0Wy0xXS4gRW5zdXJlIGxpbWl0Wy0xXSBpcyB2YWxpZCBiZWZvcmUgYWNj
ZXNzaW5nIGl0LgoqIHNyYy9ub3JtYWwuYyAocHJpbnRfbm9ybWFsX2h1bmspOiBMaWtld2lzZS4K
KiB0ZXN0cy9zdHJpcC10cmFpbGluZy1jcjogTmV3IGZpbGUuIFRlc3QgZm9yIHRoYXQgYnVnLgoq
IHRlc3RzL01ha2VmaWxlLmFtIChURVNUUyk6IEFkZCBpdC4KUmVwb3J0ZWQgYnkgSG9uZ3h1IENo
ZW4gPGxlZnRjb3B5LmNoeEBnbWFpbC5jb20+IGluCmh0dHA6Ly9idWdzLmdudS5vcmcvMzE5MzUK
LS0tCiBORVdTICAgICAgICAgICAgICAgICAgICB8ICA3ICsrKysrKysKIHNyYy9ub3JtYWwuYyAg
ICAgICAgICAgIHwgIDQgKysrLQogc3JjL3V0aWwuYyAgICAgICAgICAgICAgfCAgNCArKy0tCiB0
ZXN0cy9NYWtlZmlsZS5hbSAgICAgICB8ICAxICsKIHRlc3RzL3N0cmlwLXRyYWlsaW5nLWNyIHwg
MjAgKysrKysrKysrKysrKysrKysrKysKIDUgZmlsZXMgY2hhbmdlZCwgMzMgaW5zZXJ0aW9ucygr
KSwgMyBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDc1NSB0ZXN0cy9zdHJpcC10cmFpbGlu
Zy1jcgoKZGlmZiAtLWdpdCBhL05FV1MgYi9ORVdTCmluZGV4IDU2ZTA0NDUuLjdkMTE1YTMgMTAw
NjQ0Ci0tLSBhL05FV1MKKysrIGIvTkVXUwpAQCAtMiw2ICsyLDEzIEBAIEdOVSBkaWZmdXRpbHMg
TkVXUyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC0qLSBvdXRsaW5lIC0qLQoK
ICogTm90ZXdvcnRoeSBjaGFuZ2VzIGluIHJlbGVhc2UgPy4/ICg/Pz8/LT8/LT8/KSBbP10KCisq
KiBCdWcgZml4ZXMKKworICBkaWZmIC0tc3RyaXAtdHJhaWxpbmctY3Igd2l0aCBhIHNpbmdsZSBD
UiBieXRlIGluIG9uZSBpbnB1dCBmaWxlCisgIHdvdWxkIHByb3Zva2UgYW4gdW5pbml0aWFsaXpl
ZCBtZW1vcnkgcmVhZCwgZS5nLiwKKyAgICBkaWZmIC1hIC0tc3RyaXAtdHJhaWxpbmctY3IgPChw
cmludGYgJ1xyJykgPChlY2hvIGEpCisgIFtidWcgaW50cm9kdWNlZCBpbiAyLjggd2l0aCBhZGRp
dGlvbiBvZiB0aGUgLS1zdHJpcC10cmFpbGluZy1jciBvcHRpb25dCisKCiAqIE5vdGV3b3J0aHkg
Y2hhbmdlcyBpbiByZWxlYXNlIDMuNiAoMjAxNy0wNS0yMSkgW3N0YWJsZV0KCmRpZmYgLS1naXQg
YS9zcmMvbm9ybWFsLmMgYi9zcmMvbm9ybWFsLmMKaW5kZXggYzZhYWMwNy4uNTc1ZmJiZSAxMDA2
NDQKLS0tIGEvc3JjL25vcm1hbC5jCisrKyBiL3NyYy9ub3JtYWwuYwpAQCAtNjYsNyArNjYsOSBA
QCBwcmludF9ub3JtYWxfaHVuayAoc3RydWN0IGNoYW5nZSAqaHVuaykKICAgICAgICAgICBwcmlu
dF8xX2xpbmVfbmwgKCI8IiwgJmZpbGVzWzBdLmxpbmJ1ZltpXSwgdHJ1ZSk7CiAgICAgICAgICAg
aWYgKGkgPT0gbGFzdDApCiAgICAgICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoUkVTRVRfQ09O
VEVYVCk7Ci0gICAgICAgICAgaWYgKGZpbGVzWzBdLmxpbmJ1ZltpICsgMV1bLTFdID09ICdcbicp
CisgICAgICAgICAgY2hhciBjb25zdCAqYmFzZSA9IGZpbGVzWzBdLmxpbmJ1ZltpXTsKKyAgICAg
ICAgICBjaGFyIGNvbnN0ICpsaW1pdCA9IGZpbGVzWzBdLmxpbmJ1ZltpICsgMV07CisgICAgICAg
ICAgaWYgKGJhc2UgPCBsaW1pdCAmJiBsaW1pdFstMV0gPT0gJ1xuJykKICAgICAgICAgICAgIHB1
dGMgKCdcbicsIG91dGZpbGUpOwogICAgICAgICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvc3JjL3V0
aWwuYyBiL3NyYy91dGlsLmMKaW5kZXggNGY0ZDliYi4uZTRjZDBhZSAxMDA2NDQKLS0tIGEvc3Jj
L3V0aWwuYworKysgYi9zcmMvdXRpbC5jCkBAIC0xMjQ2LDkgKzEyNDYsOSBAQCBwcmludF8xX2xp
bmVfbmwgKGNoYXIgY29uc3QgKmxpbmVfZmxhZywgY2hhciBjb25zdCAqY29uc3QgKmxpbmUsIGJv
b2wgc2tpcF9ubCkKICAgICAgIGZwcmludGYgKG91dCwgZmxhZ19mb3JtYXRfMSwgbGluZV9mbGFn
XzEpOwogICAgIH0KCi0gIG91dHB1dF8xX2xpbmUgKGJhc2UsIGxpbWl0IC0gKHNraXBfbmwgJiYg
bGltaXRbLTFdID09ICdcbicpLCBmbGFnX2Zvcm1hdCwgbGluZV9mbGFnKTsKKyAgb3V0cHV0XzFf
bGluZSAoYmFzZSwgbGltaXQgLSAoc2tpcF9ubCAmJiBiYXNlIDwgbGltaXQgJiYgbGltaXRbLTFd
ID09ICdcbicpLCBmbGFnX2Zvcm1hdCwgbGluZV9mbGFnKTsKCi0gIGlmICgoIWxpbmVfZmxhZyB8
fCBsaW5lX2ZsYWdbMF0pICYmIGxpbWl0Wy0xXSAhPSAnXG4nKQorICBpZiAoKCFsaW5lX2ZsYWcg
fHwgbGluZV9mbGFnWzBdKSAmJiBiYXNlIDwgbGltaXQgJiYgbGltaXRbLTFdICE9ICdcbicpCiAg
ICAgewogICAgICAgc2V0X2NvbG9yX2NvbnRleHQgKFJFU0VUX0NPTlRFWFQpOwogICAgICAgZnBy
aW50ZiAob3V0LCAiXG5cXCAlc1xuIiwgXygiTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZSIpKTsK
ZGlmZiAtLWdpdCBhL3Rlc3RzL01ha2VmaWxlLmFtIGIvdGVzdHMvTWFrZWZpbGUuYW0KaW5kZXgg
MjY2NDZjMC4uYjFmZTMyMSAxMDA2NDQKLS0tIGEvdGVzdHMvTWFrZWZpbGUuYW0KKysrIGIvdGVz
dHMvTWFrZWZpbGUuYW0KQEAgLTIxLDYgKzIxLDcgQEAgVEVTVFMgPSBcCiAgIHN0ZGluIFwKICAg
c3RyY29sbC0wLW5hbWVzIFwKICAgZmlsZW5hbWUtcXVvdGluZyBcCisgIHN0cmlwLXRyYWlsaW5n
LWNyIFwKICAgY29sb3JzCgogWEZBSUxfVEVTVFMgPSBsYXJnZS1zdWJvcHQKZGlmZiAtLWdpdCBh
L3Rlc3RzL3N0cmlwLXRyYWlsaW5nLWNyIGIvdGVzdHMvc3RyaXAtdHJhaWxpbmctY3IKbmV3IGZp
bGUgbW9kZSAxMDA3NTUKaW5kZXggMDAwMDAwMC4uOWVjOTZmMQotLS0gL2Rldi9udWxsCisrKyBi
L3Rlc3RzL3N0cmlwLXRyYWlsaW5nLWNyCkBAIC0wLDAgKzEsMjAgQEAKKyMhL2Jpbi9zaAorIyBC
ZWZvcmUgZGlmZi0zLjcsIHRoaXMgd291bGQgcHJvdm9rZSBhIFVNUgorCisuICIke3NyY2Rpcj0u
fS9pbml0LnNoIjsgcGF0aF9wcmVwZW5kXyAuLi9zcmMKKworZmFpbD0wCisKK3JlcXVpcmVfdmFs
Z3JpbmRfCisKK3ByaW50ZiAnXHInID4gciB8fCBmcmFtZXdvcmtfZmFpbHVyZV8KK2VjaG8gYiA+
IGIgfHwgZnJhbWV3b3JrX2ZhaWx1cmVfCitwcmludGYgJyVzXG4nIDFjMSAnPCAtLS0nICc+IGIn
ID4gZXhwIHx8IGZyYW1ld29ya19mYWlsdXJlXworCityZXR1cm5zXyAxIHZhbGdyaW5kIC0tcXVp
ZXQgLS1lcnJvci1leGl0Y29kZT0zIFwKKyAgIGRpZmYgLWEgLS1zdHJpcC10cmFpbGluZy1jciBy
IGIgPiBvdXQgMj4gZXJyIHx8IGZhaWw9MQorCitjb21wYXJlIGV4cCBvdXQgfHwgZmFpbD0xCitj
b21wYXJlIC9kZXYvbnVsbCBlcnIgfHwgZmFpbD0xCisKK0V4aXQgJGZhaWwKLS0gCjIuMjAuMS4y
LmdiMjFlYmI2NzFiCgo=
--000000000000d038bf057e1ee2d5--




From MAILER-DAEMON Fri Dec 28 21:01:06 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1gd3w2-0005gm-OP
	for mharc-bug-diffutils@gnu.org; Fri, 28 Dec 2018 21:01:06 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36549)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gd3vx-0005cj-Nd
	for bug-diffutils@gnu.org; Fri, 28 Dec 2018 21:01:05 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gd3nc-0005ye-CH
	for bug-diffutils@gnu.org; Fri, 28 Dec 2018 20:52:28 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:59976)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1gd3Zi-0000d4-70
	for bug-diffutils@gnu.org; Fri, 28 Dec 2018 20:38:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gd3Zh-0004oj-Vs
	for bug-diffutils@gnu.org; Fri, 28 Dec 2018 20:38: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: Sat, 29 Dec 2018 01:38:01 +0000
Resent-Message-ID: <handler.31935.B31935.154604745218479@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 31935
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Hongxu Chen <leftcopy.chx@gmail.com>
Cc: 31935@debbugs.gnu.org
Received: via spool by 31935-submit@debbugs.gnu.org id=B31935.154604745218479
	(code B ref 31935); Sat, 29 Dec 2018 01:38:01 +0000
Received: (at 31935) by debbugs.gnu.org; 29 Dec 2018 01:37:32 +0000
Received: from localhost ([127.0.0.1]:40749 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1gd3ZE-0004ny-34
	for submit@debbugs.gnu.org; Fri, 28 Dec 2018 20:37:32 -0500
Received: from mail-wr1-f68.google.com ([209.85.221.68]:33847)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <meyering@gmail.com>) id 1gd3ZC-0004nm-N9
	for 31935@debbugs.gnu.org; Fri, 28 Dec 2018 20:37:31 -0500
Received: by mail-wr1-f68.google.com with SMTP id j2so22344637wrw.1
	for <31935@debbugs.gnu.org>; Fri, 28 Dec 2018 17:37:30 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20161025;
	h=x-gm-message-state:mime-version:references:in-reply-to:from:date
	:message-id:subject:to:cc;
	bh=ljjpf2h4EaaiNR7znQziM/po0S9q6kILwIjpTZwVXno=;
	b=UB9pTPwHGxvbneSyO5kRwwmqG+rDfBrPX4mACEPYsk9ohEnNOyK9VsO0YAIpSqa0VH
	S5pzJfFZD6QaKNz94dTkGPWwVoAhoCH50zuWdpqKERc6u+vfi3PAMMW2OSILlOUxF1gM
	HvsEog7DnS+COkFElSUyX4h6oiLvst2geTATNq6ON+Y11t6ySco0m+NkHY47M7FqjnQk
	AcLeIe8RdBjQTSOzaDzGIvDsbAMa0XZA7aFxMhpkRNAGxkinwsjRpMkGB8XAF9Hwae84
	Vk0ZUvO8zyLf/DBUdPOZs/1Ia4fSVBWKVAyLYoLtoGgb6e2ZPN0Ry8BArJto12tjNtz/
	yI1Q==
X-Gm-Message-State: AJcUukd8OYzHoaMtgIwww71UDtNErvkNdutmDy3QvzxDDRmN/5i8dgZJ
	JOP7SyA306K+IcS6y9ZRCdRJixQ/9WvuVAorOvU=
X-Google-Smtp-Source: ALg8bN7US/JSc6DSzdTp3ScGbPHDP8K7Ib0M/Vg2gZ4Qo0mzWwv/0d3XSZJ9qsji+r9TrO3qvm/JS3qRhKWKrMt/Kl0=
X-Received: by 2002:adf:8464:: with SMTP id 91mr28380277wrf.251.1546047444986; 
	Fri, 28 Dec 2018 17:37:24 -0800 (PST)
MIME-Version: 1.0
References: <CAJPBKOHSy03XCKwJZr8i0-z+=iN5MswopHPiMr_6Pu+urrKDCw@mail.gmail.com>
	<CA+8g5KEyJLBu1Gct5pU2K7u5qPBs=0J5tNT-wbUb1yoCqt1u1A@mail.gmail.com>
In-Reply-To: <CA+8g5KEyJLBu1Gct5pU2K7u5qPBs=0J5tNT-wbUb1yoCqt1u1A@mail.gmail.com>
From: Jim Meyering <jim@meyering.net>
Date: Fri, 28 Dec 2018 17:37:12 -0800
Message-ID: <CA+8g5KFidAhHLAk-+k-a2zFpjtz8bAFK1krG+JiCktMZiv1DxQ@mail.gmail.com>
Content-Type: multipart/mixed; boundary="000000000000c3cc9b057e1f38ef"
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-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#31935: bug#31935: 2 crashes in diffutills
 commit version 576645c
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: <http://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, 29 Dec 2018 02:01:05 -0000

--000000000000c3cc9b057e1f38ef
Content-Type: text/plain; charset="UTF-8"

On Fri, Dec 28, 2018 at 5:13 PM Jim Meyering <jim@meyering.net> wrote:
>
> On Fri, Jun 22, 2018 at 7:49 AM Hongxu Chen <leftcopy.chx@gmail.com> wrote:
> >     We found with our fuzzer 2 crashes on diffutils version 576645c: one is a heap-buffer-overflow at util.c:1249, another is an invalid read resulting from `output_1_line' at util.c:1274.
> >     The executing command is: `./diff -a --strip-trailing-cr $file add.wasm` where $file is the poc file (I attached them as  *.input.txt); "add.wasm" is also attached however it seems that content of the comparison file is not important.
>
> Thank you for fuzz-testing diffutils.
> FYI, here is a reproducer for the limit[-1]-related UMR bugs:
>
>   valgrind src/diff -a --strip-trailing-cr <(printf '\r') <(echo a)
>
> I've attached a patch:

That patch was provably incomplete.
I ran this (adding -u to the above) and found one new UMR. Guarding
yet another [-1] reference fixes it.
There are still numerous unguarded [-1] references, so this updated
patch is doubtless still incomplete:

for i in hbo*; do echo $i; valgrind --quiet src/diff -u -a
--strip-trailing-cr $i add.wasm > /dev/null; echo $?; done

--000000000000c3cc9b057e1f38ef
Content-Type: application/octet-stream; name="diffutils-UMR.diff"
Content-Disposition: attachment; filename="diffutils-UMR.diff"
Content-Transfer-Encoding: base64
Content-ID: <f_jq8spz710>
X-Attachment-Id: f_jq8spz710

RnJvbSA0Y2ZiNzA5YmQ4NDhhZmJhNjgzNDg5NWE2OWViMDFkMmJiZmRhNzM2IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gTWV5ZXJpbmcgPG1leWVyaW5nQGZiLmNvbT4KRGF0ZTog
RnJpLCAyOCBEZWMgMjAxOCAxNjoxMjoxMSAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIGRpZmY6IGF2
b2lkIHVuaW5pdGlhbGl6ZWQgbWVtb3J5IHJlYWQgd2l0aAogLS1zdHJpcC10cmFpbGluZy1jcgoK
KiBORVdTOiAoQnVnIGZpeGVkKTogTWVudGlvbiBpdC4KKiBzcmMvdXRpbC5jIChwcmludF8xX2xp
bmVfbmwpOiBBdm9pZCAtLXN0cmlwLXRyYWlsaW5nLWNyIFVNUiB3aGVuIHRoZQpidWZmZXIgY29u
c2lzdHMgb2YgYSBzb2xlIENSLiBUaGF0IGhhcHBlbmVkIGR1ZSB0byBhbiB1bmNoZWNrZWQKcmVm
ZXJlbmNlIHRvIGxpbWl0Wy0xXS4gRW5zdXJlIGxpbWl0Wy0xXSBpcyB2YWxpZCBiZWZvcmUgYWNj
ZXNzaW5nIGl0LgoqIHNyYy9ub3JtYWwuYyAocHJpbnRfbm9ybWFsX2h1bmspOiBMaWtld2lzZS4K
KiB0ZXN0cy9zdHJpcC10cmFpbGluZy1jcjogTmV3IGZpbGUuIFRlc3QgZm9yIHRoYXQgYnVnLgoq
IHRlc3RzL01ha2VmaWxlLmFtIChURVNUUyk6IEFkZCBpdC4KUmVwb3J0ZWQgYnkgSG9uZ3h1IENo
ZW4gPGxlZnRjb3B5LmNoeEBnbWFpbC5jb20+IGluCmh0dHA6Ly9idWdzLmdudS5vcmcvMzE5MzUK
LS0tCiBORVdTICAgICAgICAgICAgICAgICAgICB8ICA3ICsrKysrKysKIHNyYy9ub3JtYWwuYyAg
ICAgICAgICAgIHwgIDQgKysrLQogc3JjL3V0aWwuYyAgICAgICAgICAgICAgfCAgNCArKy0tCiB0
ZXN0cy9NYWtlZmlsZS5hbSAgICAgICB8ICAxICsKIHRlc3RzL3N0cmlwLXRyYWlsaW5nLWNyIHwg
MjAgKysrKysrKysrKysrKysrKysrKysKIDUgZmlsZXMgY2hhbmdlZCwgMzMgaW5zZXJ0aW9ucygr
KSwgMyBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDc1NSB0ZXN0cy9zdHJpcC10cmFpbGlu
Zy1jcgoKZGlmZiAtLWdpdCBhL05FV1MgYi9ORVdTCmluZGV4IDU2ZTA0NDUuLjdkMTE1YTMgMTAw
NjQ0Ci0tLSBhL05FV1MKKysrIGIvTkVXUwpAQCAtMiw2ICsyLDEzIEBAIEdOVSBkaWZmdXRpbHMg
TkVXUyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC0qLSBvdXRsaW5lIC0qLQoK
ICogTm90ZXdvcnRoeSBjaGFuZ2VzIGluIHJlbGVhc2UgPy4/ICg/Pz8/LT8/LT8/KSBbP10KCisq
KiBCdWcgZml4ZXMKKworICBkaWZmIC0tc3RyaXAtdHJhaWxpbmctY3Igd2l0aCBhIHNpbmdsZSBD
UiBieXRlIGluIG9uZSBpbnB1dCBmaWxlCisgIHdvdWxkIHByb3Zva2UgYW4gdW5pbml0aWFsaXpl
ZCBtZW1vcnkgcmVhZCwgZS5nLiwKKyAgICBkaWZmIC1hIC0tc3RyaXAtdHJhaWxpbmctY3IgPChw
cmludGYgJ1xyJykgPChlY2hvIGEpCisgIFtidWcgaW50cm9kdWNlZCBpbiAyLjggd2l0aCBhZGRp
dGlvbiBvZiB0aGUgLS1zdHJpcC10cmFpbGluZy1jciBvcHRpb25dCisKCiAqIE5vdGV3b3J0aHkg
Y2hhbmdlcyBpbiByZWxlYXNlIDMuNiAoMjAxNy0wNS0yMSkgW3N0YWJsZV0KCmRpZmYgLS1naXQg
YS9zcmMvbm9ybWFsLmMgYi9zcmMvbm9ybWFsLmMKaW5kZXggYzZhYWMwNy4uNTc1ZmJiZSAxMDA2
NDQKLS0tIGEvc3JjL25vcm1hbC5jCisrKyBiL3NyYy9ub3JtYWwuYwpAQCAtNjYsNyArNjYsOSBA
QCBwcmludF9ub3JtYWxfaHVuayAoc3RydWN0IGNoYW5nZSAqaHVuaykKICAgICAgICAgICBwcmlu
dF8xX2xpbmVfbmwgKCI8IiwgJmZpbGVzWzBdLmxpbmJ1ZltpXSwgdHJ1ZSk7CiAgICAgICAgICAg
aWYgKGkgPT0gbGFzdDApCiAgICAgICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoUkVTRVRfQ09O
VEVYVCk7Ci0gICAgICAgICAgaWYgKGZpbGVzWzBdLmxpbmJ1ZltpICsgMV1bLTFdID09ICdcbicp
CisgICAgICAgICAgY2hhciBjb25zdCAqYmFzZSA9IGZpbGVzWzBdLmxpbmJ1ZltpXTsKKyAgICAg
ICAgICBjaGFyIGNvbnN0ICpsaW1pdCA9IGZpbGVzWzBdLmxpbmJ1ZltpICsgMV07CisgICAgICAg
ICAgaWYgKGJhc2UgPCBsaW1pdCAmJiBsaW1pdFstMV0gPT0gJ1xuJykKICAgICAgICAgICAgIHB1
dGMgKCdcbicsIG91dGZpbGUpOwogICAgICAgICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvc3JjL3V0
aWwuYyBiL3NyYy91dGlsLmMKaW5kZXggNGY0ZDliYi4uZTRjZDBhZSAxMDA2NDQKLS0tIGEvc3Jj
L3V0aWwuYworKysgYi9zcmMvdXRpbC5jCkBAIC0xMjQ2LDkgKzEyNDYsOSBAQCBwcmludF8xX2xp
bmVfbmwgKGNoYXIgY29uc3QgKmxpbmVfZmxhZywgY2hhciBjb25zdCAqY29uc3QgKmxpbmUsIGJv
b2wgc2tpcF9ubCkKICAgICAgIGZwcmludGYgKG91dCwgZmxhZ19mb3JtYXRfMSwgbGluZV9mbGFn
XzEpOwogICAgIH0KCi0gIG91dHB1dF8xX2xpbmUgKGJhc2UsIGxpbWl0IC0gKHNraXBfbmwgJiYg
bGltaXRbLTFdID09ICdcbicpLCBmbGFnX2Zvcm1hdCwgbGluZV9mbGFnKTsKKyAgb3V0cHV0XzFf
bGluZSAoYmFzZSwgbGltaXQgLSAoc2tpcF9ubCAmJiBiYXNlIDwgbGltaXQgJiYgbGltaXRbLTFd
ID09ICdcbicpLCBmbGFnX2Zvcm1hdCwgbGluZV9mbGFnKTsKCi0gIGlmICgoIWxpbmVfZmxhZyB8
fCBsaW5lX2ZsYWdbMF0pICYmIGxpbWl0Wy0xXSAhPSAnXG4nKQorICBpZiAoKCFsaW5lX2ZsYWcg
fHwgbGluZV9mbGFnWzBdKSAmJiBiYXNlIDwgbGltaXQgJiYgbGltaXRbLTFdICE9ICdcbicpCiAg
ICAgewogICAgICAgc2V0X2NvbG9yX2NvbnRleHQgKFJFU0VUX0NPTlRFWFQpOwogICAgICAgZnBy
aW50ZiAob3V0LCAiXG5cXCAlc1xuIiwgXygiTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZSIpKTsK
ZGlmZiAtLWdpdCBhL3Rlc3RzL01ha2VmaWxlLmFtIGIvdGVzdHMvTWFrZWZpbGUuYW0KaW5kZXgg
MjY2NDZjMC4uYjFmZTMyMSAxMDA2NDQKLS0tIGEvdGVzdHMvTWFrZWZpbGUuYW0KKysrIGIvdGVz
dHMvTWFrZWZpbGUuYW0KQEAgLTIxLDYgKzIxLDcgQEAgVEVTVFMgPSBcCiAgIHN0ZGluIFwKICAg
c3RyY29sbC0wLW5hbWVzIFwKICAgZmlsZW5hbWUtcXVvdGluZyBcCisgIHN0cmlwLXRyYWlsaW5n
LWNyIFwKICAgY29sb3JzCgogWEZBSUxfVEVTVFMgPSBsYXJnZS1zdWJvcHQKZGlmZiAtLWdpdCBh
L3Rlc3RzL3N0cmlwLXRyYWlsaW5nLWNyIGIvdGVzdHMvc3RyaXAtdHJhaWxpbmctY3IKbmV3IGZp
bGUgbW9kZSAxMDA3NTUKaW5kZXggMDAwMDAwMC4uOWVjOTZmMQotLS0gL2Rldi9udWxsCisrKyBi
L3Rlc3RzL3N0cmlwLXRyYWlsaW5nLWNyCkBAIC0wLDAgKzEsMjAgQEAKKyMhL2Jpbi9zaAorIyBC
ZWZvcmUgZGlmZi0zLjcsIHRoaXMgd291bGQgcHJvdm9rZSBhIFVNUgorCisuICIke3NyY2Rpcj0u
fS9pbml0LnNoIjsgcGF0aF9wcmVwZW5kXyAuLi9zcmMKKworZmFpbD0wCisKK3JlcXVpcmVfdmFs
Z3JpbmRfCisKK3ByaW50ZiAnXHInID4gciB8fCBmcmFtZXdvcmtfZmFpbHVyZV8KK2VjaG8gYiA+
IGIgfHwgZnJhbWV3b3JrX2ZhaWx1cmVfCitwcmludGYgJyVzXG4nIDFjMSAnPCAtLS0nICc+IGIn
ID4gZXhwIHx8IGZyYW1ld29ya19mYWlsdXJlXworCityZXR1cm5zXyAxIHZhbGdyaW5kIC0tcXVp
ZXQgLS1lcnJvci1leGl0Y29kZT0zIFwKKyAgIGRpZmYgLWEgLS1zdHJpcC10cmFpbGluZy1jciBy
IGIgPiBvdXQgMj4gZXJyIHx8IGZhaWw9MQorCitjb21wYXJlIGV4cCBvdXQgfHwgZmFpbD0xCitj
b21wYXJlIC9kZXYvbnVsbCBlcnIgfHwgZmFpbD0xCisKK0V4aXQgJGZhaWwKLS0gCjIuMjAuMS4y
LmdiMjFlYmI2NzFiCgo=
--000000000000c3cc9b057e1f38ef--




From MAILER-DAEMON Fri Dec 28 22:16:44 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1gd57D-00060I-Vp
	for mharc-bug-diffutils@gnu.org; Fri, 28 Dec 2018 22:16:44 -0500
Received: from eggs.gnu.org ([208.118.235.92]:54368)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gd57A-0005rg-5f
	for bug-diffutils@gnu.org; Fri, 28 Dec 2018 22:16:43 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gd52g-00036O-LT
	for bug-diffutils@gnu.org; Fri, 28 Dec 2018 22:12:06 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:48711)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1gd52f-00034T-Vh
	for bug-diffutils@gnu.org; Fri, 28 Dec 2018 22:12:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gd52f-000734-PR
	for bug-diffutils@gnu.org; Fri, 28 Dec 2018 22:12:01 -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, 29 Dec 2018 03:12:01 +0000
Resent-Message-ID: <handler.31935.B31935.154605307427040@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 31935
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Jim Meyering <jim@meyering.net>, Hongxu Chen <leftcopy.chx@gmail.com>
Cc: 31935@debbugs.gnu.org
Received: via spool by 31935-submit@debbugs.gnu.org id=B31935.154605307427040
	(code B ref 31935); Sat, 29 Dec 2018 03:12:01 +0000
Received: (at 31935) by debbugs.gnu.org; 29 Dec 2018 03:11:14 +0000
Received: from localhost ([127.0.0.1]:40773 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1gd51t-000723-AO
	for submit@debbugs.gnu.org; Fri, 28 Dec 2018 22:11:14 -0500
Received: from zimbra.cs.ucla.edu ([131.179.128.68]:60972)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <eggert@cs.ucla.edu>) id 1gd51q-00071o-KV
	for 31935@debbugs.gnu.org; Fri, 28 Dec 2018 22:11:11 -0500
Received: from localhost (localhost [127.0.0.1])
	by zimbra.cs.ucla.edu (Postfix) with ESMTP id 309F7160E1A;
	Fri, 28 Dec 2018 19:11:04 -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 hejH3Oaxmoha; Fri, 28 Dec 2018 19:11:03 -0800 (PST)
Received: from localhost (localhost [127.0.0.1])
	by zimbra.cs.ucla.edu (Postfix) with ESMTP id 44097160E1E;
	Fri, 28 Dec 2018 19:11:03 -0800 (PST)
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 WXcb7QsHtIyl; Fri, 28 Dec 2018 19:11:03 -0800 (PST)
Received: from [192.168.1.9] (cpe-23-242-74-103.socal.res.rr.com
	[23.242.74.103])
	by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 1625D160D37;
	Fri, 28 Dec 2018 19:11:03 -0800 (PST)
References: <CAJPBKOHSy03XCKwJZr8i0-z+=iN5MswopHPiMr_6Pu+urrKDCw@mail.gmail.com>
	<CA+8g5KEyJLBu1Gct5pU2K7u5qPBs=0J5tNT-wbUb1yoCqt1u1A@mail.gmail.com>
	<CA+8g5KFidAhHLAk-+k-a2zFpjtz8bAFK1krG+JiCktMZiv1DxQ@mail.gmail.com>
From: Paul Eggert <eggert@cs.ucla.edu>
Organization: UCLA Computer Science Department
Message-ID: <f483f4a4-5ce0-fc42-231b-afc3594417ea@cs.ucla.edu>
Date: Fri, 28 Dec 2018 19:11:02 -0800
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
	Thunderbird/60.2.1
MIME-Version: 1.0
In-Reply-To: <CA+8g5KFidAhHLAk-+k-a2zFpjtz8bAFK1krG+JiCktMZiv1DxQ@mail.gmail.com>
Content-Type: multipart/mixed; boundary="------------A901DA17227073F06831BACC"
Content-Language: en-US
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-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#31935: bug#31935: bug#31935: 2 crashes in
 diffutills commit version 576645c
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: <http://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, 29 Dec 2018 03:16:43 -0000

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

Jim Meyering wrote:
> There are still numerous unguarded [-1] references, so this updated
> patch is doubtless still incomplete:

The real bug was elsewhere, I think. I installed the attached patch. This patch 
lacks your test case, which didn't work for me because there is no 
require_valgrind_ in diffutils. Is require_valgrind_ from coreutils or from some 
other location?

--------------A901DA17227073F06831BACC
Content-Type: text/x-patch;
 name="0001-diff-fix-UMR-with-strip-trailing-cr.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0001-diff-fix-UMR-with-strip-trailing-cr.patch"

>From c0097514df398ab70c58fe75af17ba0d7ec58c73 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 28 Dec 2018 19:00:50 -0800
Subject: [PATCH] diff: fix UMR with --strip-trailing-cr

Problem reported by Hongxu Chen (Bug#31935).
* src/io.c (prepare_text): Strip trailing CR before
doing the rest of the analysis.
* NEWS: Mention the fix.
Co-authored-by: Jim Meyering <jim@meyering.net>
---
 NEWS     |  7 +++++++
 src/io.c | 39 +++++++++++++++------------------------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/NEWS b/NEWS
index 56e0445..7d115a3 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,13 @@ GNU diffutils NEWS                                    -*- outline -*-
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
+** Bug fixes
+
+  diff --strip-trailing-cr with a single CR byte in one input file
+  would provoke an uninitialized memory read, e.g.,
+    diff -a --strip-trailing-cr <(printf '\r') <(echo a)
+  [bug introduced in 2.8 with addition of the --strip-trailing-cr option]
+
 
 * Noteworthy changes in release 3.6 (2017-05-21) [stable]
 
diff --git a/src/io.c b/src/io.c
index fb86392..6c03c70 100644
--- a/src/io.c
+++ b/src/io.c
@@ -481,42 +481,33 @@ prepare_text (struct file_data *current)
 {
   size_t buffered = current->buffered;
   char *p = FILE_BUFFER (current);
-
-  if (buffered == 0 || p[buffered - 1] == '\n')
-    current->missing_newline = false;
-  else
-    {
-      p[buffered++] = '\n';
-      current->missing_newline = true;
-    }
-
   if (!p)
     return;
 
-  /* Don't use uninitialized storage when planting or using sentinels.  */
-  memset (p + buffered, 0, sizeof (word));
-
   if (strip_trailing_cr)
     {
-      char *dst;
       char *srclim = p + buffered;
       *srclim = '\r';
-      dst = rawmemchr (p, '\r');
+      char *dst = rawmemchr (p, '\r');
 
-      if (dst != srclim)
+      for (char const *src = dst; src != srclim; src++)
 	{
-	  char const *src = dst;
-	  do
-	    {
-	      *dst = *src++;
-	      dst += ! (*dst == '\r' && *src == '\n');
-	    }
-	  while (src < srclim);
-
-	  buffered -= src - dst;
+	  src += *src == '\r' && src[1] == '\n';
+	  *dst++ = *src;
 	}
+
+      buffered -= srclim - dst;
     }
 
+  if (buffered != 0 && p[buffered - 1] != '\n')
+    {
+      p[buffered++] = '\n';
+      current->missing_newline = true;
+    }
+
+  /* Don't use uninitialized storage when planting or using sentinels.  */
+  memset (p + buffered, 0, sizeof (word));
+
   current->buffered = buffered;
 }
 
-- 
2.17.1


--------------A901DA17227073F06831BACC--




From MAILER-DAEMON Sat Dec 29 00:20:03 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1gd72Z-0006Zb-GN
	for mharc-bug-diffutils@gnu.org; Sat, 29 Dec 2018 00:20:03 -0500
Received: from eggs.gnu.org ([208.118.235.92]:50466)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gd72U-0006EL-3z
	for bug-diffutils@gnu.org; Sat, 29 Dec 2018 00:20:03 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gd6ru-0008EM-Oc
	for bug-diffutils@gnu.org; Sat, 29 Dec 2018 00:09:07 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:45214)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1gd6ru-0008DS-Ky
	for bug-diffutils@gnu.org; Sat, 29 Dec 2018 00:09:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gd6ru-0001Ou-Bf
	for bug-diffutils@gnu.org; Sat, 29 Dec 2018 00:09: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: Sat, 29 Dec 2018 05:09:02 +0000
Resent-Message-ID: <handler.31935.B31935.15460601325366@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 31935
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Paul Eggert <eggert@cs.ucla.edu>
Cc: 31935@debbugs.gnu.org, Hongxu Chen <leftcopy.chx@gmail.com>
Received: via spool by 31935-submit@debbugs.gnu.org id=B31935.15460601325366
	(code B ref 31935); Sat, 29 Dec 2018 05:09:02 +0000
Received: (at 31935) by debbugs.gnu.org; 29 Dec 2018 05:08:52 +0000
Received: from localhost ([127.0.0.1]:40786 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1gd6rj-0001OU-TM
	for submit@debbugs.gnu.org; Sat, 29 Dec 2018 00:08:52 -0500
Received: from mail-wr1-f50.google.com ([209.85.221.50]:34501)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <meyering@gmail.com>) id 1gd6rh-0001OF-Q6
	for 31935@debbugs.gnu.org; Sat, 29 Dec 2018 00:08:50 -0500
Received: by mail-wr1-f50.google.com with SMTP id j2so22536242wrw.1
	for <31935@debbugs.gnu.org>; Fri, 28 Dec 2018 21:08:49 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20161025;
	h=x-gm-message-state:mime-version:references:in-reply-to:from:date
	:message-id:subject:to:cc;
	bh=Z6qXSa9jI7iLPmHRnjhRxYmpmTg5sDCmooolELOUo10=;
	b=tb2Ti/8RMNIBP/7+SKJj3Jr7tlvXlBAGRUybwU+Bv9nXuwTFmpCo/iOC4tvVsEl736
	+ejkEde36XX198xAxyxocw6hIgMK8wbm1pP+dho3XcqoLY/Mnl+To+7+K2jtkjAOySUy
	hXYKEOZ4WBKBtZzT8lz5X864dR2OVkj3HlAY4E5TXRfqMUZucxtEiyi/JDjkOvtZSGEj
	HaY+jE8XuxI6pLMH3WxzndvrWx7lI0yXj4Us18NaKb7/QNYcofro2jZj33Z+B/WQ/kkU
	Lrt7UgKLOZ+vXiYxQ3gOYQshRkt/bPctlhYOFDvPVI/nra7eUk7CJH078HhcdAY0iD5x
	suNQ==
X-Gm-Message-State: AJcUukc1DR+pq4E4e0/5sN9F3SVQydcNG3Vv/zoDNZONLykizMZBDsAb
	BWFhdyFVy+xrF7kLWlDvZ73GNgiATS0y+Dtv46U=
X-Google-Smtp-Source: ALg8bN47rq27z4fOqfkICuQYSWalfNazdYWFkzwkQ5e60tbU0H6msp7e1dmKwQSV6iouUPB/6/D+OgQLUWvwWAj6e+A=
X-Received: by 2002:adf:9422:: with SMTP id 31mr28773505wrq.106.1546060124161; 
	Fri, 28 Dec 2018 21:08:44 -0800 (PST)
MIME-Version: 1.0
References: <CAJPBKOHSy03XCKwJZr8i0-z+=iN5MswopHPiMr_6Pu+urrKDCw@mail.gmail.com>
	<CA+8g5KEyJLBu1Gct5pU2K7u5qPBs=0J5tNT-wbUb1yoCqt1u1A@mail.gmail.com>
	<CA+8g5KFidAhHLAk-+k-a2zFpjtz8bAFK1krG+JiCktMZiv1DxQ@mail.gmail.com>
	<f483f4a4-5ce0-fc42-231b-afc3594417ea@cs.ucla.edu>
In-Reply-To: <f483f4a4-5ce0-fc42-231b-afc3594417ea@cs.ucla.edu>
From: Jim Meyering <jim@meyering.net>
Date: Fri, 28 Dec 2018 21:08:31 -0800
Message-ID: <CA+8g5KHb1bk_a8WE4y2bboCDjxR0_q5yhi=YxcMBf+T9Re1CKA@mail.gmail.com>
Content-Type: text/plain; charset="UTF-8"
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-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#31935: bug#31935: bug#31935: 2 crashes in
 diffutills commit version 576645c
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: <http://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, 29 Dec 2018 05:20:03 -0000

On Fri, Dec 28, 2018 at 7:11 PM Paul Eggert <eggert@cs.ucla.edu> wrote:
>
> Jim Meyering wrote:
> > There are still numerous unguarded [-1] references, so this updated
> > patch is doubtless still incomplete:
>
> The real bug was elsewhere, I think. I installed the attached patch. This patch
> lacks your test case, which didn't work for me because there is no
> require_valgrind_ in diffutils. Is require_valgrind_ from coreutils or from some
> other location?

Thanks. Nice patch.
I've pushed the two test-related patches.




From MAILER-DAEMON Sat Dec 29 02:19:10 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1gd8tq-0000QD-43
	for mharc-bug-diffutils@gnu.org; Sat, 29 Dec 2018 02:19:10 -0500
Received: from eggs.gnu.org ([208.118.235.92]:47529)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gd8tk-0000Gw-9B
	for bug-diffutils@gnu.org; Sat, 29 Dec 2018 02:19:08 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gd8qo-0006NU-Lj
	for bug-diffutils@gnu.org; Sat, 29 Dec 2018 02:16:07 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:60974)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1gd8qo-0006NE-Go
	for bug-diffutils@gnu.org; Sat, 29 Dec 2018 02:16:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gd8qo-0004cM-91
	for bug-diffutils@gnu.org; Sat, 29 Dec 2018 02:16:02 -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: Sat, 29 Dec 2018 07:16:01 +0000
Resent-Message-ID: <handler.31935.D31935.154606775317729.done@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: cc-closed 31935
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: 
To: Paul Eggert <eggert@cs.ucla.edu>
Cc: 31935-done@debbugs.gnu.org, Hongxu Chen <leftcopy.chx@gmail.com>
Mail-Followup-To: 31935@debbugs.gnu.org, jim@meyering.net,
	leftcopy.chx@gmail.com
Received: via spool by 31935-done@debbugs.gnu.org id=D31935.154606775317729
	(code D ref 31935); Sat, 29 Dec 2018 07:16:01 +0000
Received: (at 31935-done) by debbugs.gnu.org; 29 Dec 2018 07:15:53 +0000
Received: from localhost ([127.0.0.1]:40799 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1gd8qe-0004bt-Rn
	for submit@debbugs.gnu.org; Sat, 29 Dec 2018 02:15:53 -0500
Received: from mail-wm1-f65.google.com ([209.85.128.65]:37911)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <meyering@gmail.com>) id 1gd8qc-0004bf-PY
	for 31935-done@debbugs.gnu.org; Sat, 29 Dec 2018 02:15:51 -0500
Received: by mail-wm1-f65.google.com with SMTP id m22so21238645wml.3
	for <31935-done@debbugs.gnu.org>; Fri, 28 Dec 2018 23:15:50 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20161025;
	h=x-gm-message-state:mime-version:references:in-reply-to:from:date
	:message-id:subject:to:cc;
	bh=ippVQAWfcq5nQ+bTNlAUQ8ZO3wBN745SKvRuTYZstZY=;
	b=lxKKLPvBREBAz/ycP9eopShvOdZ3dijAT6J78Xm+qUjxlSlAl5oohjCI+PnlhQVBrn
	WgItYcCfG70XmpTbKn9+X875KjAO2wK6/p+dd/hLRvWQPYhud1wWHI5dfGTqOxN9phCi
	9TWjvkFsS4zA/QAVY1ux/MfiZMQ2sg+5X+Kw1rSMPcd33WIRvSMNX0r3SxOjJC/koD9n
	xkR4wCr1UM25DQguzBEiQazSTtAUvDqqplsFVV27nRD4HTBiPbtitFXu0HNJytjf4FXr
	oA7+PE/Q51cstu8A2C+PPbKswXyJ579RuI+ZV3OtfZpGWWfMjq/igX6n7MQBZFBiKYJf
	ZnBw==
X-Gm-Message-State: AA+aEWa8hwRSnF6MChApycuOFE2CISCIgRYP7WOMPPf8GZcc8Np6NZ+Y
	nywIUGixsQzMLPeOXDRs8r57G5dE9y1mfVLFw0I=
X-Google-Smtp-Source: ALg8bN41gtiGFI2/vC9DuIYhkwzEQyveY8bs0VR3Tk8pYMop6c1LzUn0xmCc9JR48qPIyS2VAeuIcUTaRuPjm8mITjc=
X-Received: by 2002:a1c:4346:: with SMTP id q67mr27571933wma.114.1546067745094;
	Fri, 28 Dec 2018 23:15:45 -0800 (PST)
MIME-Version: 1.0
References: <CAJPBKOHSy03XCKwJZr8i0-z+=iN5MswopHPiMr_6Pu+urrKDCw@mail.gmail.com>
	<CA+8g5KEyJLBu1Gct5pU2K7u5qPBs=0J5tNT-wbUb1yoCqt1u1A@mail.gmail.com>
	<CA+8g5KFidAhHLAk-+k-a2zFpjtz8bAFK1krG+JiCktMZiv1DxQ@mail.gmail.com>
	<f483f4a4-5ce0-fc42-231b-afc3594417ea@cs.ucla.edu>
	<CA+8g5KHb1bk_a8WE4y2bboCDjxR0_q5yhi=YxcMBf+T9Re1CKA@mail.gmail.com>
In-Reply-To: <CA+8g5KHb1bk_a8WE4y2bboCDjxR0_q5yhi=YxcMBf+T9Re1CKA@mail.gmail.com>
From: Jim Meyering <jim@meyering.net>
Date: Fri, 28 Dec 2018 23:15:33 -0800
Message-ID: <CA+8g5KEkm6JoECh4wKri+jrQ+Ed3oWy=CKLcAOUnF6LhH_AEVg@mail.gmail.com>
Content-Type: multipart/mixed; boundary="000000000000bee36b057e23f2a7"
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-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#31935: bug#31935: bug#31935: bug#31935: 2
 crashes in diffutills commit version 576645c
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: <http://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, 29 Dec 2018 07:19:08 -0000

--000000000000bee36b057e23f2a7
Content-Type: text/plain; charset="UTF-8"

On Fri, Dec 28, 2018 at 9:20 PM Jim Meyering <jim@meyering.net> wrote:
>
> On Fri, Dec 28, 2018 at 7:11 PM Paul Eggert <eggert@cs.ucla.edu> wrote:
> >
> > Jim Meyering wrote:
> > > There are still numerous unguarded [-1] references, so this updated
> > > patch is doubtless still incomplete:
> >
> > The real bug was elsewhere, I think. I installed the attached patch. This patch
> > lacks your test case, which didn't work for me because there is no
> > require_valgrind_ in diffutils. Is require_valgrind_ from coreutils or from some
> > other location?
>
> Thanks. Nice patch.
> I've pushed the two test-related patches.

I noticed that the new test would fail when built with ASAN, so will push this:

--000000000000bee36b057e23f2a7
Content-Type: application/octet-stream; name="umr-test-vs-asan.diff"
Content-Disposition: attachment; filename="umr-test-vs-asan.diff"
Content-Transfer-Encoding: base64
Content-ID: <f_jq94sqcy0>
X-Attachment-Id: f_jq94sqcy0

RnJvbSBmNWRhZWE3ZjEwZTA2YmIxYjVmYzgyNjZmYzc1N2RmOTcyNzQ4MDIxIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gTWV5ZXJpbmcgPG1leWVyaW5nQGZiLmNvbT4KRGF0ZTog
RnJpLCAyOCBEZWMgMjAxOCAyMzoxMzowMSAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIHRlc3RzOiBz
dHJpcC10cmFpbGluZy1jcjogYXZvaWQgZmFpbHVyZSB3aXRoIEFTQU4KCiogdGVzdHMvc3RyaXAt
dHJhaWxpbmctY3IgKHZhbGdyaW5kKTogRGVmaW5lIGFzIG5vLW9wIHdoZW4gZGlmZgpoYXMgY29t
cGlsZWQgd2l0aCBzYW5pdGl6ZXIgc3VwcG9ydC4KLS0tCiB0ZXN0cy9zdHJpcC10cmFpbGluZy1j
ciB8IDcgKysrKysrLQogMSBmaWxlIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlv
bigtKQoKZGlmZiAtLWdpdCBhL3Rlc3RzL3N0cmlwLXRyYWlsaW5nLWNyIGIvdGVzdHMvc3RyaXAt
dHJhaWxpbmctY3IKaW5kZXggMzE4ODI5NC4uMjgxMDU5NSAxMDA3NTUKLS0tIGEvdGVzdHMvc3Ry
aXAtdHJhaWxpbmctY3IKKysrIGIvdGVzdHMvc3RyaXAtdHJhaWxpbmctY3IKQEAgLTEwLDggKzEw
LDEzIEBAIHJlcXVpcmVfdmFsZ3JpbmRfCiBwcmludGYgJ1xyJyA+IHIgfHwgZnJhbWV3b3JrX2Zh
aWx1cmVfCiBlY2hvIGIgPiBiIHx8IGZyYW1ld29ya19mYWlsdXJlXwoKKyMgVXNlIHZhbGdyaW5k
IG9ubHkgd2hlbiBubyBTYW5pdGl6ZXIgaXMgaW4gdXNlOgorQVNBTl9PUFRJT05TPWhlbHA9dHJ1
ZSBkaWZmIC0taGVscCAyPiYxIHxncmVwIFNhbml0aXplciA+IC9kZXYvbnVsbCBcCisgICYmIGV2
YWwgJ3ZhbGdyaW5kKCkgeyAiJEAiOyB9JyBcCisgIHx8IGV2YWwgJ3ZhbGdyaW5kKCkgeyBlbnYg
dmFsZ3JpbmQgLS1xdWlldCAtLWVycm9yLWV4aXRjb2RlPTMgIiRAIjsgfScKKwogZm9yIG9wdCBp
biAnJyB1IGMgRGZvbzsgZG8KLSAgcmV0dXJuc18gMSB2YWxncmluZCAtLXF1aWV0IC0tZXJyb3It
ZXhpdGNvZGU9MyBcCisgIHJldHVybnNfIDEgdmFsZ3JpbmQgXAogICAgIGRpZmYgLWEkb3B0IC0t
c3RyaXAtdHJhaWxpbmctY3IgciBiID4gb3V0IDI+IGVyciB8fCBmYWlsPTEKIGRvbmUKCi0tIAoy
LjIwLjEuMi5nYjIxZWJiNjcxYgoK
--000000000000bee36b057e23f2a7--




From MAILER-DAEMON Sat Dec 29 16:16:42 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1gdLyM-0007jC-3H
	for mharc-bug-diffutils@gnu.org; Sat, 29 Dec 2018 16:16:42 -0500
Received: from eggs.gnu.org ([208.118.235.92]:36859)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gdLyG-0007cU-Qb
	for bug-diffutils@gnu.org; Sat, 29 Dec 2018 16:16:40 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gdLvm-0004qf-MK
	for bug-diffutils@gnu.org; Sat, 29 Dec 2018 16:14:05 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:38764)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1gdLvm-0004pu-HG
	for bug-diffutils@gnu.org; Sat, 29 Dec 2018 16:14:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gdLvm-0004np-7O
	for bug-diffutils@gnu.org; Sat, 29 Dec 2018 16:14: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: Sat, 29 Dec 2018 21:14:02 +0000
Resent-Message-ID: <handler.31105.B31105.154611803818441@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 31105
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: patch
To: "Dennis Lambe Jr." <malsyned@malsyned.net>
Cc: 31105@debbugs.gnu.org
Received: via spool by 31105-submit@debbugs.gnu.org id=B31105.154611803818441
	(code B ref 31105); Sat, 29 Dec 2018 21:14:02 +0000
Received: (at 31105) by debbugs.gnu.org; 29 Dec 2018 21:13:58 +0000
Received: from localhost ([127.0.0.1]:41667 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1gdLvh-0004nM-In
	for submit@debbugs.gnu.org; Sat, 29 Dec 2018 16:13:57 -0500
Received: from mail-wr1-f68.google.com ([209.85.221.68]:41172)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <meyering@gmail.com>) id 1gdLve-0004n8-JC
	for 31105@debbugs.gnu.org; Sat, 29 Dec 2018 16:13:55 -0500
Received: by mail-wr1-f68.google.com with SMTP id x10so23729806wrs.8
	for <31105@debbugs.gnu.org>; Sat, 29 Dec 2018 13:13:54 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20161025;
	h=x-gm-message-state:mime-version:references:in-reply-to:from:date
	:message-id:subject:to:cc;
	bh=KPMPYLBryu0L5ZuWVM9LwVWbbiPSTtQlCp1j2QBzsKo=;
	b=hgOqHUUatCksg9UfgD8yFbMMo1lkVKFv3ubpTyJ6rQ4j4HhVVo6waPsq2m7UyNTfwk
	5MeFZDl8Y2qA9974ZNg6JSE3erJS6GtNduN639ygAkPHyPvzc79bHHcqIOQxcwrMVDNx
	4JfN+ko4sItyKGzmilayVOsmXU9Eyn2fpSB6ji8L6w+o1GfGJb+eGNDnxt3ei3/AwK0g
	iwfXht9oi2uGcPntFYj6BPDN6OqpeZhsHiMmy5w24oFo2poET0HBjThE7IQ0xBCEDiHH
	JkEaunWyi7kQYm6kQjN/ndkkAw2u+QNM+TOjTu5tJJ8Ltfbm9ZX3uOxPWS0QQil01kAN
	fXfg==
X-Gm-Message-State: AJcUukdMolZVzJwTC+suhx7i+h++HBo5BW84otTmybKiMednXGBYdzz2
	6+3trIgjBJUBW5wd1adRI5rmmcWtEGFMtjVGlaSITvac
X-Google-Smtp-Source: ALg8bN5JeOJivVx8xebY/En6ggJb04vgZ/ejsOMpkW6QCHxY7X/yoO9TVNHyQLCE4K5gTxEUlyNpEmoqoqATPWrw1CY=
X-Received: by 2002:adf:9422:: with SMTP id 31mr30795914wrq.106.1546118028849; 
	Sat, 29 Dec 2018 13:13:48 -0800 (PST)
MIME-Version: 1.0
References: <20180408195931.16701jbt40zlibqb@ssl.uofr.net>
	<20180409115317.54022sqdbsktmzxp@ssl.uofr.net>
In-Reply-To: <20180409115317.54022sqdbsktmzxp@ssl.uofr.net>
From: Jim Meyering <jim@meyering.net>
Date: Sat, 29 Dec 2018 13:13:37 -0800
Message-ID: <CA+8g5KH74bqt-76yDz_qeLEWJyp75pFiUZ2Oim55K1PxCDT86w@mail.gmail.com>
Content-Type: multipart/mixed; boundary="000000000000e413b8057e2fa797"
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-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#31105: bug#31105: bug#31105: [PATCH] Restart
 and reset ANSI escapes on each line for compatibility with less -R
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: <http://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, 29 Dec 2018 21:16:40 -0000

--000000000000e413b8057e2fa797
Content-Type: text/plain; charset="UTF-8"

On Mon, Apr 9, 2018 at 12:02 PM Dennis Lambe Jr. <malsyned@malsyned.net> wrote:
>
> The previous patch had an error in the first hunk for normal.c. I
> forgot to remove an "if" line when I removed the following conditional
> line. Due to its placement before a "for" line that tested the same
> condition, it didn't affect the behavior of the patch, but it was
> unsightly. I've attached an updated patch.
>
> Quoting "Dennis Lambe Jr." <malsyned@malsyned.net>:
>
> > Hello!
> >
> > GNU less can display ANSI-colored text with the -R flag, but this
> > support has some limitations. One of them is that if an escape
> > sequence starts on one line and ends on a different line, only the
> > first line will be colored in less.
> >
> > As a result, when diff creates colored output with multi-line
> > deletes  or adds, less will only color the first line.
> >
> > I've attached a patch to reset ANSI color to the default at the end
> > of  every line and restart it at the beginning of the next. It
> > patches  normal and context mode. Side-by-side already worked in my
> > testing.
> >
> > I hope it's useful to you. Please let me know if there are changes
> > you  would like made before you can accept it.

Thank you for the contribution.
I've written a ChangeLog entry for you and attached a rebased commit.
However, the change is large enough that we'll also need a copyright
assignment from you. Can you do that?
Here are instructions:
https://git.savannah.gnu.org/cgit/gnulib.git/tree/doc/Copyright/request-assign.changes

--000000000000e413b8057e2fa797
Content-Type: application/octet-stream; name="ansi-reset-less.diff"
Content-Disposition: attachment; filename="ansi-reset-less.diff"
Content-Transfer-Encoding: base64
Content-ID: <f_jq9yqt0o0>
X-Attachment-Id: f_jq9yqt0o0

RnJvbSBiODhkMzA5MGE2NDkxOGFmYzNkMGIxOTFiNzRlMjU1ODhmMDhjZDNmIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBEZW5uaXMgTGFtYmUgSnIgPG1hbHN5bmVkQG1hbHN5bmVkLm5l
dD4KRGF0ZTogU2F0LCAyOSBEZWMgMjAxOCAxMzowNDoxMCAtMDgwMApTdWJqZWN0OiBbUEFUQ0hd
IGRpZmY6IGFkanVzdCBBTlNJIGVzY2FwZXMgZm9yIGNvbXBhdGliaWxpdHkgd2l0aCBsZXNzIC1S
CgpHTlUgbGVzcyBjYW4gZGlzcGxheSBBTlNJLWNvbG9yZWQgdGV4dCB3aXRoIHRoZSAtUiBmbGFn
LCBidXQgdGhpcwpzdXBwb3J0IGhhcyBzb21lIGxpbWl0YXRpb25zLiBPbmUgb2YgdGhlbSBpcyB0
aGF0IGlmIGFuIGVzY2FwZQpzZXF1ZW5jZSBzdGFydHMgb24gb25lIGxpbmUgYW5kIGVuZHMgb24g
YSBkaWZmZXJlbnQgbGluZSwgb25seSB0aGUKZmlyc3QgbGluZSB3aWxsIGJlIGNvbG9yZWQgaW4g
bGVzcy4KCkFzIGEgcmVzdWx0LCB3aGVuIGRpZmYgY3JlYXRlcyBjb2xvcmVkIG91dHB1dCB3aXRo
IG11bHRpLWxpbmUgZGVsZXRlcwpvciBhZGRzLCBsZXNzIHdpbGwgb25seSBjb2xvciB0aGUgZmly
c3QgbGluZS4KClRoaXMgY2hhbmdlIHJlc2V0cyBBTlNJIGNvbG9yIHRvIHRoZSBkZWZhdWx0IGF0
IHRoZSBlbmQgb2YKZWFjaCBsaW5lIGFuZCByZXN0YXJ0cyBpdCBhdCB0aGUgYmVnaW5uaW5nIG9m
IHRoZSBuZXh0LiBJdCBwYXRjaGVzCm5vcm1hbCBhbmQgY29udGV4dCBtb2RlLiBTaWRlLWJ5LXNp
ZGUgYWxyZWFkeSB3b3JrZWQgaW4gbXkgdGVzdGluZy4KKiBzcmMvY29udGV4dC5jIChwcmludF9j
b250ZXh0X2xhYmVsLCBwcl9jb250ZXh0X2h1bmspOiBBcyBhYm92ZS4KKHByX3VuaWRpZmZfaHVu
aywgcHJpbnRfY29udGV4dF9oZWFkZXIpOiBMaWtld2lzZS4KKiBzcmMvbm9ybWFsLmMgKHByaW50
X25vcm1hbF9odW5rKTogTGlrZXdpc2UuCiogdGVzdHMvY29sb3JzOiBBZGp1c3QgZXhpc3Rpbmcg
dGVzdHMgdG8gYWNjb21tb2RhdGUgdGhpcy4KaHR0cDovL2J1Z3MuZ251Lm9yZy8zMTEwNQotLS0K
IHNyYy9jb250ZXh0LmMgfCAzOSArKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0KIHNyYy9ub3JtYWwuYyAgfCAxMiArKysrLS0tLS0tLS0KIHRlc3RzL2NvbG9ycyAgfCAxMiAr
KysrKystLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMjcgaW5zZXJ0aW9ucygrKSwgMzYgZGVsZXRp
b25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL2NvbnRleHQuYyBiL3NyYy9jb250ZXh0LmMKaW5kZXgg
NGRkODgyZC4uYzhkZTUxMiAxMDA2NDQKLS0tIGEvc3JjL2NvbnRleHQuYworKysgYi9zcmMvY29u
dGV4dC5jCkBAIC00Myw4ICs0MywxMSBAQCBwcmludF9jb250ZXh0X2xhYmVsIChjaGFyIGNvbnN0
ICptYXJrLAogCQkgICAgIGNoYXIgY29uc3QgKm5hbWUsCiAJCSAgICAgY2hhciBjb25zdCAqbGFi
ZWwpCiB7CisgIHNldF9jb2xvcl9jb250ZXh0IChIRUFERVJfQ09OVEVYVCk7CiAgIGlmIChsYWJl
bCkKLSAgICBmcHJpbnRmIChvdXRmaWxlLCAiJXMgJXNcbiIsIG1hcmssIGxhYmVsKTsKKyAgICB7
CisgICAgICBmcHJpbnRmIChvdXRmaWxlLCAiJXMgJXMiLCBtYXJrLCBsYWJlbCk7CisgICAgfQog
ICBlbHNlCiAgICAgewogICAgICAgY2hhciBidWZbTUFYIChJTlRfU1RSTEVOX0JPVU5EIChpbnQp
ICsgMzIsCkBAIC03MSw4ICs3NCwxMCBAQCBwcmludF9jb250ZXh0X2xhYmVsIChjaGFyIGNvbnN0
ICptYXJrLAogCSAgICAgIHNwcmludGYgKGJ1ZiwgIiUiUFJJdU1BWCIuJS45ZCIsIHNlYywgbnNl
Yyk7CiAJICAgIH0KIAl9Ci0gICAgICBmcHJpbnRmIChvdXRmaWxlLCAiJXMgJXNcdCVzXG4iLCBt
YXJrLCBuYW1lLCBidWYpOworICAgICAgZnByaW50ZiAob3V0ZmlsZSwgIiVzICVzXHQlcyIsIG1h
cmssIG5hbWUsIGJ1Zik7CiAgICAgfQorICBzZXRfY29sb3JfY29udGV4dCAoUkVTRVRfQ09OVEVY
VCk7CisgIGZwcmludGYgKG91dGZpbGUsICJcbiIpOwogfQoKIC8qIFByaW50IGEgaGVhZGVyIGZv
ciBhIGNvbnRleHQgZGlmZiwgd2l0aCB0aGUgZmlsZSBuYW1lcyBhbmQgZGF0ZXMuICAqLwpAQCAt
ODAsNyArODUsNiBAQCBwcmludF9jb250ZXh0X2xhYmVsIChjaGFyIGNvbnN0ICptYXJrLAogdm9p
ZAogcHJpbnRfY29udGV4dF9oZWFkZXIgKHN0cnVjdCBmaWxlX2RhdGEgaW5mW10sIGNoYXIgY29u
c3QgKmNvbnN0ICpuYW1lcywgYm9vbCB1bmlkaWZmKQogewotICBzZXRfY29sb3JfY29udGV4dCAo
SEVBREVSX0NPTlRFWFQpOwogICBpZiAodW5pZGlmZikKICAgICB7CiAgICAgICBwcmludF9jb250
ZXh0X2xhYmVsICgiLS0tIiwgJmluZlswXSwgbmFtZXNbMF0sIGZpbGVfbGFiZWxbMF0pOwpAQCAt
OTEsNyArOTUsNiBAQCBwcmludF9jb250ZXh0X2hlYWRlciAoc3RydWN0IGZpbGVfZGF0YSBpbmZb
XSwgY2hhciBjb25zdCAqY29uc3QgKm5hbWVzLCBib29sIHVuaQogICAgICAgcHJpbnRfY29udGV4
dF9sYWJlbCAoIioqKiIsICZpbmZbMF0sIG5hbWVzWzBdLCBmaWxlX2xhYmVsWzBdKTsKICAgICAg
IHByaW50X2NvbnRleHRfbGFiZWwgKCItLS0iLCAmaW5mWzFdLCBuYW1lc1sxXSwgZmlsZV9sYWJl
bFsxXSk7CiAgICAgfQotICBzZXRfY29sb3JfY29udGV4dCAoUkVTRVRfQ09OVEVYVCk7CiB9Cgog
LyogUHJpbnQgYW4gZWRpdCBzY3JpcHQgaW4gY29udGV4dCBmb3JtYXQuICAqLwpAQCAtMjE5LDEx
ICsyMjIsMTAgQEAgcHJfY29udGV4dF9odW5rIChzdHJ1Y3QgY2hhbmdlICpodW5rKQogICAgIHsK
ICAgICAgIHN0cnVjdCBjaGFuZ2UgKm5leHQgPSBodW5rOwoKLSAgICAgIGlmIChmaXJzdDAgPD0g
bGFzdDApCi0gICAgICAgIHNldF9jb2xvcl9jb250ZXh0IChERUxFVEVfQ09OVEVYVCk7Ci0KICAg
ICAgIGZvciAoaSA9IGZpcnN0MDsgaSA8PSBsYXN0MDsgaSsrKQogCXsKKyAgICAgICAgICBzZXRf
Y29sb3JfY29udGV4dCAoREVMRVRFX0NPTlRFWFQpOworCiAJICAvKiBTa2lwIHBhc3QgY2hhbmdl
cyB0aGF0IGFwcGx5IChpbiBmaWxlIDApCiAJICAgICBvbmx5IHRvIGxpbmVzIGJlZm9yZSBsaW5l
IEkuICAqLwoKQEAgLTI0MSw4ICsyNDMsNyBAQCBwcl9jb250ZXh0X2h1bmsgKHN0cnVjdCBjaGFu
Z2UgKmh1bmspCiAgICAgICAgICAgICAgIHByZWZpeCA9IChuZXh0LT5pbnNlcnRlZCA+IDAgPyAi
ISIgOiAiLSIpOwogICAgICAgICAgICAgfQogCSAgcHJpbnRfMV9saW5lX25sIChwcmVmaXgsICZm
aWxlc1swXS5saW5idWZbaV0sIHRydWUpOwotICAgICAgICAgIGlmIChpID09IGxhc3QwKQotICAg
ICAgICAgICAgc2V0X2NvbG9yX2NvbnRleHQgKFJFU0VUX0NPTlRFWFQpOworICAgICAgICAgIHNl
dF9jb2xvcl9jb250ZXh0IChSRVNFVF9DT05URVhUKTsKICAgICAgICAgICBpZiAoZmlsZXNbMF0u
bGluYnVmW2kgKyAxXVstMV0gPT0gJ1xuJykKICAgICAgICAgICAgIHB1dGMgKCdcbicsIG91dCk7
CiAJfQpAQCAtMjU5LDExICsyNjAsMTAgQEAgcHJfY29udGV4dF9odW5rIChzdHJ1Y3QgY2hhbmdl
ICpodW5rKQogICAgIHsKICAgICAgIHN0cnVjdCBjaGFuZ2UgKm5leHQgPSBodW5rOwoKLSAgICAg
IGlmIChmaXJzdDEgPD0gbGFzdDEpCi0gICAgICAgIHNldF9jb2xvcl9jb250ZXh0IChBRERfQ09O
VEVYVCk7Ci0KICAgICAgIGZvciAoaSA9IGZpcnN0MTsgaSA8PSBsYXN0MTsgaSsrKQogCXsKKyAg
ICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoQUREX0NPTlRFWFQpOworCiAJICAvKiBTa2lwIHBh
c3QgY2hhbmdlcyB0aGF0IGFwcGx5IChpbiBmaWxlIDEpCiAJICAgICBvbmx5IHRvIGxpbmVzIGJl
Zm9yZSBsaW5lIEkuICAqLwoKQEAgLTI4MSw4ICsyODEsNyBAQCBwcl9jb250ZXh0X2h1bmsgKHN0
cnVjdCBjaGFuZ2UgKmh1bmspCiAgICAgICAgICAgICAgIHByZWZpeCA9IChuZXh0LT5kZWxldGVk
ID4gMCA/ICIhIiA6ICIrIik7CiAgICAgICAgICAgICB9CiAJICBwcmludF8xX2xpbmVfbmwgKHBy
ZWZpeCwgJmZpbGVzWzFdLmxpbmJ1ZltpXSwgdHJ1ZSk7Ci0gICAgICAgICAgaWYgKGkgPT0gbGFz
dDEpCi0gICAgICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoUkVTRVRfQ09OVEVYVCk7CisJICBz
ZXRfY29sb3JfY29udGV4dCAoUkVTRVRfQ09OVEVYVCk7CiAgICAgICAgICAgaWYgKGZpbGVzWzFd
LmxpbmJ1ZltpICsgMV1bLTFdID09ICdcbicpCiAgICAgICAgICAgICBwdXRjICgnXG4nLCBvdXQp
OwogCX0KQEAgLTM5MCwxOSArMzg5LDE3IEBAIHByX3VuaWRpZmZfaHVuayAoc3RydWN0IGNoYW5n
ZSAqaHVuaykKIAkgIC8qIEZvciBlYWNoIGRpZmZlcmVuY2UsIGZpcnN0IG91dHB1dCB0aGUgZGVs
ZXRlZCBwYXJ0LiAqLwoKIAkgIGsgPSBuZXh0LT5kZWxldGVkOwotICAgICAgICAgIGlmIChrKQot
ICAgICAgICAgICAgc2V0X2NvbG9yX2NvbnRleHQgKERFTEVURV9DT05URVhUKTsKCiAJICB3aGls
ZSAoay0tKQogCSAgICB7CiAJICAgICAgY2hhciBjb25zdCAqIGNvbnN0ICpsaW5lID0gJmZpbGVz
WzBdLmxpbmJ1ZltpKytdOworICAgICAgICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoREVMRVRF
X0NPTlRFWFQpOwogCSAgICAgIHB1dGMgKCctJywgb3V0KTsKIAkgICAgICBpZiAoaW5pdGlhbF90
YWIgJiYgISAoc3VwcHJlc3NfYmxhbmtfZW1wdHkgJiYgKipsaW5lID09ICdcbicpKQogCQlwdXRj
ICgnXHQnLCBvdXQpOwogCSAgICAgIHByaW50XzFfbGluZV9ubCAoTlVMTCwgbGluZSwgdHJ1ZSk7
CgotICAgICAgICAgICAgICBpZiAoIWspCi0gICAgICAgICAgICAgICAgc2V0X2NvbG9yX2NvbnRl
eHQgKFJFU0VUX0NPTlRFWFQpOworCSAgICAgIHNldF9jb2xvcl9jb250ZXh0IChSRVNFVF9DT05U
RVhUKTsKCiAgICAgICAgICAgICAgIGlmIChsaW5lWzFdWy0xXSA9PSAnXG4nKQogICAgICAgICAg
ICAgICAgIHB1dGMgKCdcbicsIG91dCk7CkBAIC00MTEsMTkgKzQwOCwxNyBAQCBwcl91bmlkaWZm
X2h1bmsgKHN0cnVjdCBjaGFuZ2UgKmh1bmspCiAJICAvKiBUaGVuIG91dHB1dCB0aGUgaW5zZXJ0
ZWQgcGFydC4gKi8KCiAJICBrID0gbmV4dC0+aW5zZXJ0ZWQ7Ci0gICAgICAgICAgaWYgKGspCi0g
ICAgICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoQUREX0NPTlRFWFQpOwoKICAgICAgICAgICB3
aGlsZSAoay0tKQogCSAgICB7CiAJICAgICAgY2hhciBjb25zdCAqIGNvbnN0ICpsaW5lID0gJmZp
bGVzWzFdLmxpbmJ1ZltqKytdOworICAgICAgICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoQURE
X0NPTlRFWFQpOwogCSAgICAgIHB1dGMgKCcrJywgb3V0KTsKIAkgICAgICBpZiAoaW5pdGlhbF90
YWIgJiYgISAoc3VwcHJlc3NfYmxhbmtfZW1wdHkgJiYgKipsaW5lID09ICdcbicpKQogCQlwdXRj
ICgnXHQnLCBvdXQpOwogCSAgICAgIHByaW50XzFfbGluZV9ubCAoTlVMTCwgbGluZSwgdHJ1ZSk7
CgotICAgICAgICAgICAgICBpZiAoIWspCi0gICAgICAgICAgICAgICAgc2V0X2NvbG9yX2NvbnRl
eHQgKFJFU0VUX0NPTlRFWFQpOworCSAgICAgIHNldF9jb2xvcl9jb250ZXh0IChSRVNFVF9DT05U
RVhUKTsKCiAgICAgICAgICAgICAgIGlmIChsaW5lWzFdWy0xXSA9PSAnXG4nKQogICAgICAgICAg
ICAgICAgIHB1dGMgKCdcbicsIG91dCk7CmRpZmYgLS1naXQgYS9zcmMvbm9ybWFsLmMgYi9zcmMv
bm9ybWFsLmMKaW5kZXggYzZhYWMwNy4uYmRiNzE4YiAxMDA2NDQKLS0tIGEvc3JjL25vcm1hbC5j
CisrKyBiL3NyYy9ub3JtYWwuYwpAQCAtNTksMTMgKzU5LDExIEBAIHByaW50X25vcm1hbF9odW5r
IChzdHJ1Y3QgY2hhbmdlICpodW5rKQogICAvKiBQcmludCB0aGUgbGluZXMgdGhhdCB0aGUgZmly
c3QgZmlsZSBoYXMuICAqLwogICBpZiAoY2hhbmdlcyAmIE9MRCkKICAgICB7Ci0gICAgICBpZiAo
Zmlyc3QwIDw9IGxhc3QwKQotICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoREVMRVRFX0NPTlRF
WFQpOwogICAgICAgZm9yIChpID0gZmlyc3QwOyBpIDw9IGxhc3QwOyBpKyspCiAgICAgICAgIHsK
KyAgICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoREVMRVRFX0NPTlRFWFQpOwogICAgICAgICAg
IHByaW50XzFfbGluZV9ubCAoIjwiLCAmZmlsZXNbMF0ubGluYnVmW2ldLCB0cnVlKTsKLSAgICAg
ICAgICBpZiAoaSA9PSBsYXN0MCkKLSAgICAgICAgICAgIHNldF9jb2xvcl9jb250ZXh0IChSRVNF
VF9DT05URVhUKTsKKyAgICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoUkVTRVRfQ09OVEVYVCk7
CiAgICAgICAgICAgaWYgKGZpbGVzWzBdLmxpbmJ1ZltpICsgMV1bLTFdID09ICdcbicpCiAgICAg
ICAgICAgICBwdXRjICgnXG4nLCBvdXRmaWxlKTsKICAgICAgICAgfQpAQCAtNzcsMTMgKzc1LDEx
IEBAIHByaW50X25vcm1hbF9odW5rIChzdHJ1Y3QgY2hhbmdlICpodW5rKQogICAvKiBQcmludCB0
aGUgbGluZXMgdGhhdCB0aGUgc2Vjb25kIGZpbGUgaGFzLiAgKi8KICAgaWYgKGNoYW5nZXMgJiBO
RVcpCiAgICAgewotICAgICAgaWYgKGZpcnN0MSA8PSBsYXN0MSkKLSAgICAgICAgc2V0X2NvbG9y
X2NvbnRleHQgKEFERF9DT05URVhUKTsKICAgICAgIGZvciAoaSA9IGZpcnN0MTsgaSA8PSBsYXN0
MTsgaSsrKQogICAgICAgICB7CisgICAgICAgICAgc2V0X2NvbG9yX2NvbnRleHQgKEFERF9DT05U
RVhUKTsKICAgICAgICAgICBwcmludF8xX2xpbmVfbmwgKCI+IiwgJmZpbGVzWzFdLmxpbmJ1Zltp
XSwgdHJ1ZSk7Ci0gICAgICAgICAgaWYgKGkgPT0gbGFzdDEpCi0gICAgICAgICAgICBzZXRfY29s
b3JfY29udGV4dCAoUkVTRVRfQ09OVEVYVCk7CisgICAgICAgICAgc2V0X2NvbG9yX2NvbnRleHQg
KFJFU0VUX0NPTlRFWFQpOwogICAgICAgICAgIGlmIChmaWxlc1sxXS5saW5idWZbaSArIDFdWy0x
XSA9PSAnXG4nKQogICAgICAgICAgICAgcHV0YyAoJ1xuJywgb3V0ZmlsZSk7CiAgICAgICAgIH0K
ZGlmZiAtLWdpdCBhL3Rlc3RzL2NvbG9ycyBiL3Rlc3RzL2NvbG9ycwppbmRleCBlNWI1ZjM2Li5k
MjhhNjFjIDEwMDc1NQotLS0gYS90ZXN0cy9jb2xvcnMKKysrIGIvdGVzdHMvY29sb3JzCkBAIC0y
OSw5ICsyOSw5IEBAIGdlbl9leHBfdSgpCiAgICAgbG9jYWwgZGU9JChwcmludGYgIiRlWyR7ZGV9
bSIpCiAgICAgbG9jYWwgbG49JChwcmludGYgIiRlWyR7bG59bSIpCiAgICAgcHJpbnRmICclcycg
XAotIiRoZC0tLSBhJHRhYiRlcG9jaF9wbHVzCi0rKysgYiR0YWIkZXBvY2hfcGx1cwotJHJzJHts
bn1AQCAtMSArMSBAQCRycworIiRoZC0tLSBhJHRhYiRlcG9jaF9wbHVzJHJzCiskaGQrKysgYiR0
YWIkZXBvY2hfcGx1cyRycworJHtsbn1AQCAtMSArMSBAQCRycwogJGRlLWEkcnMKICRhZCtiJHJz
CiAiCkBAIC00Niw5ICs0Niw5IEBAIGdlbl9leHBfYygpCiAgICAgbG9jYWwgZGU9JChwcmludGYg
IiRlWyR7ZGV9bSIpCiAgICAgbG9jYWwgbG49JChwcmludGYgIiRlWyR7bG59bSIpCiAgICAgcHJp
bnRmICclcycgXAotIiRoZCoqKiBhJHRhYiRlcG9jaF9wb3NpeF8xMDAzXzFfMjAwMQotLS0tIGIk
dGFiJGVwb2NoX3Bvc2l4XzEwMDNfMV8yMDAxCi0kcnMqKioqKioqKioqKioqKioKKyIkaGQqKiog
YSR0YWIkZXBvY2hfcG9zaXhfMTAwM18xXzIwMDEkcnMKKyRoZC0tLSBiJHRhYiRlcG9jaF9wb3Np
eF8xMDAzXzFfMjAwMSRycworKioqKioqKioqKioqKioqCiAkbG4qKiogMSAqKioqJHJzCiAkZGUh
IGEkcnMKICRsbi0tLSAxIC0tLS0kcnMKLS0gCjIuMjAuMS4yLmdiMjFlYmI2NzFiCgo=
--000000000000e413b8057e2fa797--




From MAILER-DAEMON Sat Dec 29 17:00:59 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1gdMfD-0001EX-N9
	for mharc-bug-diffutils@gnu.org; Sat, 29 Dec 2018 17:00:59 -0500
Received: from eggs.gnu.org ([208.118.235.92]:48316)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gdMf9-0000pa-O8
	for bug-diffutils@gnu.org; Sat, 29 Dec 2018 17:00:59 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gdMUc-0002CF-4l
	for bug-diffutils@gnu.org; Sat, 29 Dec 2018 16:50:06 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:43273)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1gdMUc-0002B7-19
	for bug-diffutils@gnu.org; Sat, 29 Dec 2018 16:50:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gdMUb-0005uQ-LR
	for bug-diffutils@gnu.org; Sat, 29 Dec 2018 16:50:01 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: "Dennis Lambe Jr." <malsyned@malsyned.net>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Sat, 29 Dec 2018 21:50:01 +0000
Resent-Message-ID: <handler.31105.B31105.154612018822690@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 31105
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: patch
To: Jim Meyering <jim@meyering.net>
Cc: 31105@debbugs.gnu.org
Received: via spool by 31105-submit@debbugs.gnu.org id=B31105.154612018822690
	(code B ref 31105); Sat, 29 Dec 2018 21:50:01 +0000
Received: (at 31105) by debbugs.gnu.org; 29 Dec 2018 21:49:48 +0000
Received: from localhost ([127.0.0.1]:41680 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1gdMUN-0005tu-Og
	for submit@debbugs.gnu.org; Sat, 29 Dec 2018 16:49:47 -0500
Received: from uofr.net ([50.116.51.30]:53434)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <malsyned@malsyned.net>) id 1gdMUL-0005tf-Bh
	for 31105@debbugs.gnu.org; Sat, 29 Dec 2018 16:49:45 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=uofr.net;
	s=selector-1; 
	h=MIME-Version:Content-Type:In-Reply-To:References:Subject:Cc:To:From:Message-ID:Date;
	bh=rAebhbQVlw68+a25dlxer1iMfnR8DJ5TERINf7vIo/I=; 
	b=US6sH7/2McB1vMb73XkTfXvG8R5ikVxI/fAzuDC8XfgWgOZR8i3y9JACe0MM9fYC2RyQPk/TC+l0DSixk626PdILs+8+kVcXZgbOP14OykM5m+qr+OSLUYDiKi0wrLcQH34koj97E08SSkIYNeIHJyXknM8tpEHoK+cJtl3qtzU=;
Received: from malsyned by uofr.net with esmtpsa id 1gdMTj-00036d-93;
	Sat, 29 Dec 2018 16:49:07 -0500
Received: from pool-96-230-124-99.bstnma.fios.verizon.net
	(pool-96-230-124-99.bstnma.fios.verizon.net [96.230.124.99]) by
	ssl.uofr.net
	(Horde Framework) with HTTPS; Sat, 29 Dec 2018 16:48:59 -0500
Date: Sat, 29 Dec 2018 16:48:59 -0500
Message-ID: <20181229164859.Horde.JFiyHKdTe0V3lV77agJaa8n@ssl.uofr.net>
From: "Dennis Lambe Jr." <malsyned@malsyned.net>
References: <20180408195931.16701jbt40zlibqb@ssl.uofr.net>
	<20180409115317.54022sqdbsktmzxp@ssl.uofr.net>
	<CA+8g5KH74bqt-76yDz_qeLEWJyp75pFiUZ2Oim55K1PxCDT86w@mail.gmail.com>
In-Reply-To: <CA+8g5KH74bqt-76yDz_qeLEWJyp75pFiUZ2Oim55K1PxCDT86w@mail.gmail.com>
User-Agent: Horde Application Framework 5
Content-Type: text/plain; charset=utf-8; format=flowed; DelSp=Yes
MIME-Version: 1.0
Content-Disposition: inline
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-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#31105: bug#31105: bug#31105: [PATCH] Restart
 and reset ANSI escapes on each line for compatibility with less -R
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: <http://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, 29 Dec 2018 22:00:59 -0000


Quoting Jim Meyering <jim@meyering.net>:

> However, the change is large enough that we'll also need a copyright
> assignment from you. Can you do that?
> Here are instructions:
> https://git.savannah.gnu.org/cgit/gnulib.git/tree/doc/Copyright/request-assign.changes

I sent an email with the necessary information to assign@gnu.org

Thanks for integrating this patch

--Dennis





From MAILER-DAEMON Sat Dec 29 17:24:32 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1gdN20-0005D4-D5
	for mharc-bug-diffutils@gnu.org; Sat, 29 Dec 2018 17:24:32 -0500
Received: from eggs.gnu.org ([208.118.235.92]:53952)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gdN1v-00058d-RB
	for bug-diffutils@gnu.org; Sat, 29 Dec 2018 17:24:30 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gdN0Y-000245-Fi
	for bug-diffutils@gnu.org; Sat, 29 Dec 2018 17:23:07 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:41987)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1gdN0Y-00022e-5M
	for bug-diffutils@gnu.org; Sat, 29 Dec 2018 17:23:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gdN0X-0006hx-Tj
	for bug-diffutils@gnu.org; Sat, 29 Dec 2018 17:23:01 -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: Sat, 29 Dec 2018 22:23:01 +0000
Resent-Message-ID: <handler.31105.B31105.154612214625726@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 31105
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: patch
To: "Dennis Lambe Jr." <malsyned@malsyned.net>
Cc: 31105@debbugs.gnu.org
Received: via spool by 31105-submit@debbugs.gnu.org id=B31105.154612214625726
	(code B ref 31105); Sat, 29 Dec 2018 22:23:01 +0000
Received: (at 31105) by debbugs.gnu.org; 29 Dec 2018 22:22:26 +0000
Received: from localhost ([127.0.0.1]:41685 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1gdMzw-0006go-DY
	for submit@debbugs.gnu.org; Sat, 29 Dec 2018 17:22:25 -0500
Received: from mail-wr1-f46.google.com ([209.85.221.46]:43434)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <meyering@gmail.com>) id 1gdMzv-0006gd-5y
	for 31105@debbugs.gnu.org; Sat, 29 Dec 2018 17:22:23 -0500
Received: by mail-wr1-f46.google.com with SMTP id r10so23809754wrs.10
	for <31105@debbugs.gnu.org>; Sat, 29 Dec 2018 14:22:23 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20161025;
	h=x-gm-message-state:mime-version:references:in-reply-to:from:date
	:message-id:subject:to:cc;
	bh=f6zR8kbAPy8OCNYy02BH1F6BAdTWYnfb+BDGDrg7LxQ=;
	b=J8XF4AQrXQ3uc27ZbYgpX86o3pG6XQSDqFg/58DmlwGcJ89++Ek8vuBQI0MwZgDxeV
	swGbDKzRjojThrngAMpHRSvuwTDh4oT26nkADmC+mJ21iHNwuONpwxj346ThhyCErdxp
	qwDlsvRv5AMsWwR9d/Xvj9cRyytrPj3W723hhYg74WWCtNl1aa6eC96Fi5F/C2J6bJUk
	IDUKJAzJe13KfLaZOLks+kOs7ZeVQwhGZB2CnOJEHMutSz2tXfhx3WtwGfjAZd0Y5ItY
	E4gqKN1ZiFhXJX5bM1y3OWudqJNVrsSDUWK6FjatzOPFmq6+xI3YBgLakObvNo3pygLn
	somA==
X-Gm-Message-State: AJcUukcNIPTbQnRB81W1+mzIItqXy4lPxyU8ZwATxuRbAXus6dbBf3ju
	WyEn+brD845oHL+vK+yzegLnT9vKC2irEE9fA8U=
X-Google-Smtp-Source: ALg8bN5YzZnzPJ43rfBQsyU52OQanPhEyuhxNyfgZH/tBXUm6OTxrQNl21eFDtsgE9eJH5NVHspcWJvmvCDy4ym7ENI=
X-Received: by 2002:adf:83e7:: with SMTP id 94mr29522353wre.278.1546122137477; 
	Sat, 29 Dec 2018 14:22:17 -0800 (PST)
MIME-Version: 1.0
References: <20180408195931.16701jbt40zlibqb@ssl.uofr.net>
	<20180409115317.54022sqdbsktmzxp@ssl.uofr.net>
	<CA+8g5KH74bqt-76yDz_qeLEWJyp75pFiUZ2Oim55K1PxCDT86w@mail.gmail.com>
	<20181229164859.Horde.JFiyHKdTe0V3lV77agJaa8n@ssl.uofr.net>
In-Reply-To: <20181229164859.Horde.JFiyHKdTe0V3lV77agJaa8n@ssl.uofr.net>
From: Jim Meyering <jim@meyering.net>
Date: Sat, 29 Dec 2018 14:22:04 -0800
Message-ID: <CA+8g5KGxYq9AJ2PyruktsZVun02-pfpdhRLppufyRXUJkxZ7=A@mail.gmail.com>
Content-Type: multipart/alternative; boundary="000000000000c8a87e057e309cbf"
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-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#31105: bug#31105: bug#31105: [PATCH] Restart
 and reset ANSI escapes on each line for compatibility with less -R
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: <http://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, 29 Dec 2018 22:24:31 -0000

--000000000000c8a87e057e309cbf
Content-Type: text/plain; charset="UTF-8"

On Sat, Dec 29, 2018, 13:49 Dennis Lambe Jr. <malsyned@malsyned.net wrote:

>
> Quoting Jim Meyering <jim@meyering.net>:
>
> > However, the change is large enough that we'll also need a copyright
> > assignment from you. Can you do that?
> > Here are instructions:
> >
> https://git.savannah.gnu.org/cgit/gnulib.git/tree/doc/Copyright/request-assign.changes
>
> I sent an email with the necessary information to assign@gnu.org
>
> Thanks for integrating this patch
>

Thanks for contributing. Want to write the NEWS blurb for it?

>

--000000000000c8a87e057e309cbf
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"auto"><div><div class=3D"gmail_quote"><div dir=3D"ltr">On Sat, =
Dec 29, 2018, 13:49 Dennis Lambe Jr. &lt;<a href=3D"mailto:malsyned@malsyne=
d.net">malsyned@malsyned.net</a> wrote:<br></div><blockquote class=3D"gmail=
_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:=
1ex"><br>
Quoting Jim Meyering &lt;<a href=3D"mailto:jim@meyering.net" target=3D"_bla=
nk" rel=3D"noreferrer">jim@meyering.net</a>&gt;:<br>
<br>
&gt; However, the change is large enough that we&#39;ll also need a copyrig=
ht<br>
&gt; assignment from you. Can you do that?<br>
&gt; Here are instructions:<br>
&gt; <a href=3D"https://git.savannah.gnu.org/cgit/gnulib.git/tree/doc/Copyr=
ight/request-assign.changes" rel=3D"noreferrer noreferrer" target=3D"_blank=
">https://git.savannah.gnu.org/cgit/gnulib.git/tree/doc/Copyright/request-a=
ssign.changes</a><br>
<br>
I sent an email with the necessary information to <a href=3D"mailto:assign@=
gnu.org" target=3D"_blank" rel=3D"noreferrer">assign@gnu.org</a><br>
<br>
Thanks for integrating this patch<br></blockquote></div></div><div dir=3D"a=
uto"><br></div><div dir=3D"auto">Thanks for contributing. Want to write the=
 NEWS blurb for it?</div><div dir=3D"auto"><div class=3D"gmail_quote"><bloc=
kquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #cc=
c solid;padding-left:1ex">
</blockquote></div></div></div>

--000000000000c8a87e057e309cbf--




From MAILER-DAEMON Sat Dec 29 17:49:13 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1gdNPt-0002qo-MX
	for mharc-bug-diffutils@gnu.org; Sat, 29 Dec 2018 17:49:13 -0500
Received: from eggs.gnu.org ([208.118.235.92]:60015)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gdNPo-0002iF-7V
	for bug-diffutils@gnu.org; Sat, 29 Dec 2018 17:49:12 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gdNMo-0002lk-MS
	for bug-diffutils@gnu.org; Sat, 29 Dec 2018 17:46:06 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:45944)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1gdNMo-0002kC-DH
	for bug-diffutils@gnu.org; Sat, 29 Dec 2018 17:46:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gdNMo-0007J2-4v
	for bug-diffutils@gnu.org; Sat, 29 Dec 2018 17:46:02 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: "Dennis Lambe Jr." <malsyned@malsyned.net>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Sat, 29 Dec 2018 22:46:02 +0000
Resent-Message-ID: <handler.31105.B31105.154612354628056@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 31105
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: patch
To: Jim Meyering <jim@meyering.net>
Cc: 31105@debbugs.gnu.org
Received: via spool by 31105-submit@debbugs.gnu.org id=B31105.154612354628056
	(code B ref 31105); Sat, 29 Dec 2018 22:46:02 +0000
Received: (at 31105) by debbugs.gnu.org; 29 Dec 2018 22:45:46 +0000
Received: from localhost ([127.0.0.1]:41692 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1gdNMY-0007IR-0K
	for submit@debbugs.gnu.org; Sat, 29 Dec 2018 17:45:46 -0500
Received: from uofr.net ([50.116.51.30]:54064)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <malsyned@malsyned.net>) id 1gdNMW-0007ID-Ge
	for 31105@debbugs.gnu.org; Sat, 29 Dec 2018 17:45:44 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=uofr.net;
	s=selector-1; 
	h=MIME-Version:Content-Type:In-Reply-To:References:Subject:Cc:To:From:Message-ID:Date;
	bh=AFixfy/gYIMJGDygpfLMs9ruH/3KLSkcI/elnotiGAI=; 
	b=Yu7s7qMQjC4AD4BGh1GbD0isvUpUlIT20flcXnbuNXtjSoJc6knmVEVp5LMiHtSIFUWC0ogsgshnH+4ll1IQZOogQKmxcZHKW7a5hrSjuOt8NFsUiWUt92c16pbhU5zuOpXoOhMXtiPqPKBWc/ZTpSASfs8SuI7eriFeg2O8vrE=;
Received: from malsyned by uofr.net with esmtpsa id 1gdNMQ-0003Rh-Lh;
	Sat, 29 Dec 2018 17:45:38 -0500
Received: from pool-96-230-124-99.bstnma.fios.verizon.net
	(pool-96-230-124-99.bstnma.fios.verizon.net [96.230.124.99]) by
	ssl.uofr.net
	(Horde Framework) with HTTPS; Sat, 29 Dec 2018 17:45:38 -0500
Date: Sat, 29 Dec 2018 17:45:38 -0500
Message-ID: <20181229174538.Horde.u9tqR9cMfBzhM9xg6B1q0Jh@ssl.uofr.net>
From: "Dennis Lambe Jr." <malsyned@malsyned.net>
References: <20180408195931.16701jbt40zlibqb@ssl.uofr.net>
	<20180409115317.54022sqdbsktmzxp@ssl.uofr.net>
	<CA+8g5KH74bqt-76yDz_qeLEWJyp75pFiUZ2Oim55K1PxCDT86w@mail.gmail.com>
	<20181229164859.Horde.JFiyHKdTe0V3lV77agJaa8n@ssl.uofr.net>
	<CA+8g5KGxYq9AJ2PyruktsZVun02-pfpdhRLppufyRXUJkxZ7=A@mail.gmail.com>
In-Reply-To: <CA+8g5KGxYq9AJ2PyruktsZVun02-pfpdhRLppufyRXUJkxZ7=A@mail.gmail.com>
User-Agent: Horde Application Framework 5
Content-Type: text/plain; charset=utf-8; format=flowed; DelSp=Yes
MIME-Version: 1.0
Content-Disposition: inline
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-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#31105: bug#31105: bug#31105: [PATCH] Restart
 and reset ANSI escapes on each line for compatibility with less -R
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: <http://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, 29 Dec 2018 22:49:12 -0000


Quoting Jim Meyering <jim@meyering.net>:

> Thanks for contributing. Want to write the NEWS blurb for it?

Sure. I don't know if this qualifies as a bug fix, or new feature, or  
what. But how about this?

   diff --color now produces output compatible with less -R.






From MAILER-DAEMON Sun Dec 30 19:16:07 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1gdlFX-00022i-JQ
	for mharc-bug-diffutils@gnu.org; Sun, 30 Dec 2018 19:16:07 -0500
Received: from eggs.gnu.org ([208.118.235.92]:44846)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gdlFV-00022b-Sk
	for bug-diffutils@gnu.org; Sun, 30 Dec 2018 19:16:06 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gdlFS-00047C-Pl
	for bug-diffutils@gnu.org; Sun, 30 Dec 2018 19:16:05 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:58909)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1gdlFS-000476-LL
	for bug-diffutils@gnu.org; Sun, 30 Dec 2018 19:16:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gdlFS-0004Fs-GB
	for bug-diffutils@gnu.org; Sun, 30 Dec 2018 19:16: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, 31 Dec 2018 00:16:02 +0000
Resent-Message-ID: <handler.31105.B31105.154621534916331@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 31105
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: patch
To: "Dennis Lambe Jr." <malsyned@malsyned.net>
Cc: 31105@debbugs.gnu.org
Received: via spool by 31105-submit@debbugs.gnu.org id=B31105.154621534916331
	(code B ref 31105); Mon, 31 Dec 2018 00:16:02 +0000
Received: (at 31105) by debbugs.gnu.org; 31 Dec 2018 00:15:49 +0000
Received: from localhost ([127.0.0.1]:42715 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1gdlFF-0004FL-0T
	for submit@debbugs.gnu.org; Sun, 30 Dec 2018 19:15:49 -0500
Received: from mail-wr1-f66.google.com ([209.85.221.66]:41991)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <meyering@gmail.com>) id 1gdlFC-0004F5-Nf
	for 31105@debbugs.gnu.org; Sun, 30 Dec 2018 19:15:47 -0500
Received: by mail-wr1-f66.google.com with SMTP id q18so25418600wrx.9
	for <31105@debbugs.gnu.org>; Sun, 30 Dec 2018 16:15:46 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20161025;
	h=x-gm-message-state:mime-version:references:in-reply-to:from:date
	:message-id:subject:to:cc;
	bh=ux2Hf/sc8Mow4V9qAvCVCnxhGkvNIuPYc22aV7m+ZBc=;
	b=OH1zlZzk8Qq1b3h6EJAb8NpKm2jbBdALJ/ztg/QHcLkEpmn+/lANt08gHW5LPNA8Cj
	VvHkQtvEEMo2UDZJ+mw5kLl5aele7g0gjyUX0vfyuSIxakAoC1+Jro/MyWvHBURpJadu
	oFGF4WCwNsLrGI7OoeNHCFk095lBMALmOd0k89m/EPx4GllbmzCRPpCNNjjmVHwJ0VRR
	BOJSfABK2n8HajQl8FYFXVgK9D1YI4EIfABW8lAYT715ZBl3/UXM6s79U6CU4rDVc9nV
	RNtk1XuCi2hhSwEladXvfdIZa3zMpDDT4lNq/7bwGVhHkpaYqzTNW00zdoce/rkNFV1O
	+v+w==
X-Gm-Message-State: AJcUukeY3zBMMP2FKfp9EfVjdk24hW/zWVzFETMXwq1pKGNOMU/cLO+k
	y0dsmWiLWn8D+dnCZ8gQWTlErI7UBRUIMDjACmeAegaT
X-Google-Smtp-Source: ALg8bN7LL+6drPdiu/zMKZ5XcaryvL0Dmf4H66zRW7uI0kSryKXx1prPZK0bFsg1YqY8v/Zi/lHVYSTr/WvRwTMDxcE=
X-Received: by 2002:adf:c108:: with SMTP id r8mr32915121wre.233.1546215340969; 
	Sun, 30 Dec 2018 16:15:40 -0800 (PST)
MIME-Version: 1.0
References: <20180408195931.16701jbt40zlibqb@ssl.uofr.net>
	<20180409115317.54022sqdbsktmzxp@ssl.uofr.net>
	<CA+8g5KH74bqt-76yDz_qeLEWJyp75pFiUZ2Oim55K1PxCDT86w@mail.gmail.com>
	<20181229164859.Horde.JFiyHKdTe0V3lV77agJaa8n@ssl.uofr.net>
	<CA+8g5KGxYq9AJ2PyruktsZVun02-pfpdhRLppufyRXUJkxZ7=A@mail.gmail.com>
	<20181229174538.Horde.u9tqR9cMfBzhM9xg6B1q0Jh@ssl.uofr.net>
In-Reply-To: <20181229174538.Horde.u9tqR9cMfBzhM9xg6B1q0Jh@ssl.uofr.net>
From: Jim Meyering <jim@meyering.net>
Date: Sun, 30 Dec 2018 16:15:28 -0800
Message-ID: <CA+8g5KEF8SB+g52W3gWCTSCSLgOA0c7zq121i=OORMYJ+YhOpA@mail.gmail.com>
Content-Type: multipart/mixed; boundary="000000000000252fcc057e46507f"
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-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#31105: bug#31105: bug#31105: [PATCH] Restart
 and reset ANSI escapes on each line for compatibility with less -R
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: <http://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, 31 Dec 2018 00:16:06 -0000

--000000000000252fcc057e46507f
Content-Type: text/plain; charset="UTF-8"

On Sat, Dec 29, 2018 at 2:45 PM Dennis Lambe Jr. <malsyned@malsyned.net> wrote:
...
> Sure. I don't know if this qualifies as a bug fix, or new feature, or
> what. But how about this?
>
>    diff --color now produces output compatible with less -R.

Thanks. I put that in a NEWS section labeled "Improvements."
I've made some trivial SP/TAB indentation changes in an attempt to
reach consistency (the existing code is not consistent on that front),
removed the braces you added around a single-statement "then" block,
and made this change:
-  fprintf (outfile, "\n");
+  putc ('\n', outfile);

Re TAB-vs-SP indentation, after the upcoming release, I will make the
global substitution to convert all indentation TABs to spaces.

Here's the result. Please review carefully and let me know if you
would like to change anything. I won't push until after I've heard
from you.

--000000000000252fcc057e46507f
Content-Type: application/octet-stream; name="diff-less-color.diff"
Content-Disposition: attachment; filename="diff-less-color.diff"
Content-Transfer-Encoding: base64
Content-ID: <f_jqbkhvtr0>
X-Attachment-Id: f_jqbkhvtr0

RnJvbSBhZDY1NTkxZDg0NDJmMGQ3OTQxZmE3ZGJkZmRiYTgzNGM4NzQzOWY2IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBEZW5uaXMgTGFtYmUgSnIgPG1hbHN5bmVkQG1hbHN5bmVkLm5l
dD4KRGF0ZTogU2F0LCAyOSBEZWMgMjAxOCAxMzowNDoxMCAtMDgwMApTdWJqZWN0OiBbUEFUQ0hd
IGRpZmY6IGFkanVzdCBBTlNJIGVzY2FwZXMgZm9yIGNvbXBhdGliaWxpdHkgd2l0aCBsZXNzIC1S
CgpHTlUgbGVzcyBjYW4gZGlzcGxheSBBTlNJLWNvbG9yZWQgdGV4dCB3aXRoIHRoZSAtUiBmbGFn
LCBidXQgdGhpcwpzdXBwb3J0IGhhcyBzb21lIGxpbWl0YXRpb25zLiBPbmUgb2YgdGhlbSBpcyB0
aGF0IGlmIGFuIGVzY2FwZQpzZXF1ZW5jZSBzdGFydHMgb24gb25lIGxpbmUgYW5kIGVuZHMgb24g
YSBkaWZmZXJlbnQgbGluZSwgb25seSB0aGUKZmlyc3QgbGluZSB3aWxsIGJlIGNvbG9yZWQgaW4g
bGVzcy4KCkFzIGEgcmVzdWx0LCB3aGVuIGRpZmYgY3JlYXRlcyBjb2xvcmVkIG91dHB1dCB3aXRo
IG11bHRpLWxpbmUgZGVsZXRlcwpvciBhZGRzLCBsZXNzIHdpbGwgb25seSBjb2xvciB0aGUgZmly
c3QgbGluZS4KClRoaXMgY2hhbmdlIHJlc2V0cyBBTlNJIGNvbG9yIHRvIHRoZSBkZWZhdWx0IGF0
IHRoZSBlbmQgb2YKZWFjaCBsaW5lIGFuZCByZXN0YXJ0cyBpdCBhdCB0aGUgYmVnaW5uaW5nIG9m
IHRoZSBuZXh0LiBJdCBwYXRjaGVzCm5vcm1hbCBhbmQgY29udGV4dCBtb2RlLiBTaWRlLWJ5LXNp
ZGUgYWxyZWFkeSB3b3JrZWQgaW4gbXkgdGVzdGluZy4KKiBzcmMvY29udGV4dC5jIChwcmludF9j
b250ZXh0X2xhYmVsLCBwcl9jb250ZXh0X2h1bmspOiBBcyBhYm92ZS4KKHByX3VuaWRpZmZfaHVu
aywgcHJpbnRfY29udGV4dF9oZWFkZXIpOiBMaWtld2lzZS4KKiBzcmMvbm9ybWFsLmMgKHByaW50
X25vcm1hbF9odW5rKTogTGlrZXdpc2UuCiogdGVzdHMvY29sb3JzOiBBZGp1c3QgZXhpc3Rpbmcg
dGVzdHMgdG8gYWNjb21tb2RhdGUgdGhpcy4KKiBORVdTIChJbXByb3ZlbWVudHMpOiBNZW50aW9u
IGl0LgpQcm9wb3NlZCBpbiBodHRwOi8vYnVncy5nbnUub3JnLzMxMTA1Ci0tLQogTkVXUyAgICAg
ICAgICB8ICA0ICsrKysKIHNyYy9jb250ZXh0LmMgfCAzNyArKysrKysrKysrKysrKystLS0tLS0t
LS0tLS0tLS0tLS0tLS0tCiBzcmMvbm9ybWFsLmMgIHwgMTIgKysrKy0tLS0tLS0tCiB0ZXN0cy9j
b2xvcnMgIHwgMTIgKysrKysrLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDI5IGluc2VydGlvbnMo
KyksIDM2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL05FV1MgYi9ORVdTCmluZGV4IDdkMTE1
YTMuLmRiNDdjNGEgMTAwNjQ0Ci0tLSBhL05FV1MKKysrIGIvTkVXUwpAQCAtOSw2ICs5LDEwIEBA
IEdOVSBkaWZmdXRpbHMgTkVXUyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC0q
LSBvdXRsaW5lIC0qLQogICAgIGRpZmYgLWEgLS1zdHJpcC10cmFpbGluZy1jciA8KHByaW50ZiAn
XHInKSA8KGVjaG8gYSkKICAgW2J1ZyBpbnRyb2R1Y2VkIGluIDIuOCB3aXRoIGFkZGl0aW9uIG9m
IHRoZSAtLXN0cmlwLXRyYWlsaW5nLWNyIG9wdGlvbl0KCisqKiBJbXByb3ZlbWVudHMKKworICBk
aWZmIC0tY29sb3Igbm93IHByb2R1Y2VzIG91dHB1dCBjb21wYXRpYmxlIHdpdGggbGVzcyAtUi4K
KwoKICogTm90ZXdvcnRoeSBjaGFuZ2VzIGluIHJlbGVhc2UgMy42ICgyMDE3LTA1LTIxKSBbc3Rh
YmxlXQoKZGlmZiAtLWdpdCBhL3NyYy9jb250ZXh0LmMgYi9zcmMvY29udGV4dC5jCmluZGV4IDRk
ZDg4MmQuLmQxOTMwZDkgMTAwNjQ0Ci0tLSBhL3NyYy9jb250ZXh0LmMKKysrIGIvc3JjL2NvbnRl
eHQuYwpAQCAtNDMsOCArNDMsOSBAQCBwcmludF9jb250ZXh0X2xhYmVsIChjaGFyIGNvbnN0ICpt
YXJrLAogCQkgICAgIGNoYXIgY29uc3QgKm5hbWUsCiAJCSAgICAgY2hhciBjb25zdCAqbGFiZWwp
CiB7CisgIHNldF9jb2xvcl9jb250ZXh0IChIRUFERVJfQ09OVEVYVCk7CiAgIGlmIChsYWJlbCkK
LSAgICBmcHJpbnRmIChvdXRmaWxlLCAiJXMgJXNcbiIsIG1hcmssIGxhYmVsKTsKKyAgICBmcHJp
bnRmIChvdXRmaWxlLCAiJXMgJXMiLCBtYXJrLCBsYWJlbCk7CiAgIGVsc2UKICAgICB7CiAgICAg
ICBjaGFyIGJ1ZltNQVggKElOVF9TVFJMRU5fQk9VTkQgKGludCkgKyAzMiwKQEAgLTcxLDggKzcy
LDEwIEBAIHByaW50X2NvbnRleHRfbGFiZWwgKGNoYXIgY29uc3QgKm1hcmssCiAJICAgICAgc3By
aW50ZiAoYnVmLCAiJSJQUkl1TUFYIi4lLjlkIiwgc2VjLCBuc2VjKTsKIAkgICAgfQogCX0KLSAg
ICAgIGZwcmludGYgKG91dGZpbGUsICIlcyAlc1x0JXNcbiIsIG1hcmssIG5hbWUsIGJ1Zik7Cisg
ICAgICBmcHJpbnRmIChvdXRmaWxlLCAiJXMgJXNcdCVzIiwgbWFyaywgbmFtZSwgYnVmKTsKICAg
ICB9CisgIHNldF9jb2xvcl9jb250ZXh0IChSRVNFVF9DT05URVhUKTsKKyAgcHV0YyAoJ1xuJywg
b3V0ZmlsZSk7CiB9CgogLyogUHJpbnQgYSBoZWFkZXIgZm9yIGEgY29udGV4dCBkaWZmLCB3aXRo
IHRoZSBmaWxlIG5hbWVzIGFuZCBkYXRlcy4gICovCkBAIC04MCw3ICs4Myw2IEBAIHByaW50X2Nv
bnRleHRfbGFiZWwgKGNoYXIgY29uc3QgKm1hcmssCiB2b2lkCiBwcmludF9jb250ZXh0X2hlYWRl
ciAoc3RydWN0IGZpbGVfZGF0YSBpbmZbXSwgY2hhciBjb25zdCAqY29uc3QgKm5hbWVzLCBib29s
IHVuaWRpZmYpCiB7Ci0gIHNldF9jb2xvcl9jb250ZXh0IChIRUFERVJfQ09OVEVYVCk7CiAgIGlm
ICh1bmlkaWZmKQogICAgIHsKICAgICAgIHByaW50X2NvbnRleHRfbGFiZWwgKCItLS0iLCAmaW5m
WzBdLCBuYW1lc1swXSwgZmlsZV9sYWJlbFswXSk7CkBAIC05MSw3ICs5Myw2IEBAIHByaW50X2Nv
bnRleHRfaGVhZGVyIChzdHJ1Y3QgZmlsZV9kYXRhIGluZltdLCBjaGFyIGNvbnN0ICpjb25zdCAq
bmFtZXMsIGJvb2wgdW5pCiAgICAgICBwcmludF9jb250ZXh0X2xhYmVsICgiKioqIiwgJmluZlsw
XSwgbmFtZXNbMF0sIGZpbGVfbGFiZWxbMF0pOwogICAgICAgcHJpbnRfY29udGV4dF9sYWJlbCAo
Ii0tLSIsICZpbmZbMV0sIG5hbWVzWzFdLCBmaWxlX2xhYmVsWzFdKTsKICAgICB9Ci0gIHNldF9j
b2xvcl9jb250ZXh0IChSRVNFVF9DT05URVhUKTsKIH0KCiAvKiBQcmludCBhbiBlZGl0IHNjcmlw
dCBpbiBjb250ZXh0IGZvcm1hdC4gICovCkBAIC0yMTksMTEgKzIyMCwxMCBAQCBwcl9jb250ZXh0
X2h1bmsgKHN0cnVjdCBjaGFuZ2UgKmh1bmspCiAgICAgewogICAgICAgc3RydWN0IGNoYW5nZSAq
bmV4dCA9IGh1bms7CgotICAgICAgaWYgKGZpcnN0MCA8PSBsYXN0MCkKLSAgICAgICAgc2V0X2Nv
bG9yX2NvbnRleHQgKERFTEVURV9DT05URVhUKTsKLQogICAgICAgZm9yIChpID0gZmlyc3QwOyBp
IDw9IGxhc3QwOyBpKyspCiAJeworCSAgc2V0X2NvbG9yX2NvbnRleHQgKERFTEVURV9DT05URVhU
KTsKKwogCSAgLyogU2tpcCBwYXN0IGNoYW5nZXMgdGhhdCBhcHBseSAoaW4gZmlsZSAwKQogCSAg
ICAgb25seSB0byBsaW5lcyBiZWZvcmUgbGluZSBJLiAgKi8KCkBAIC0yNDEsOCArMjQxLDcgQEAg
cHJfY29udGV4dF9odW5rIChzdHJ1Y3QgY2hhbmdlICpodW5rKQogICAgICAgICAgICAgICBwcmVm
aXggPSAobmV4dC0+aW5zZXJ0ZWQgPiAwID8gIiEiIDogIi0iKTsKICAgICAgICAgICAgIH0KIAkg
IHByaW50XzFfbGluZV9ubCAocHJlZml4LCAmZmlsZXNbMF0ubGluYnVmW2ldLCB0cnVlKTsKLSAg
ICAgICAgICBpZiAoaSA9PSBsYXN0MCkKLSAgICAgICAgICAgIHNldF9jb2xvcl9jb250ZXh0IChS
RVNFVF9DT05URVhUKTsKKyAgICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoUkVTRVRfQ09OVEVY
VCk7CiAgICAgICAgICAgaWYgKGZpbGVzWzBdLmxpbmJ1ZltpICsgMV1bLTFdID09ICdcbicpCiAg
ICAgICAgICAgICBwdXRjICgnXG4nLCBvdXQpOwogCX0KQEAgLTI1OSwxMSArMjU4LDEwIEBAIHBy
X2NvbnRleHRfaHVuayAoc3RydWN0IGNoYW5nZSAqaHVuaykKICAgICB7CiAgICAgICBzdHJ1Y3Qg
Y2hhbmdlICpuZXh0ID0gaHVuazsKCi0gICAgICBpZiAoZmlyc3QxIDw9IGxhc3QxKQotICAgICAg
ICBzZXRfY29sb3JfY29udGV4dCAoQUREX0NPTlRFWFQpOwotCiAgICAgICBmb3IgKGkgPSBmaXJz
dDE7IGkgPD0gbGFzdDE7IGkrKykKIAl7CisJICBzZXRfY29sb3JfY29udGV4dCAoQUREX0NPTlRF
WFQpOworCiAJICAvKiBTa2lwIHBhc3QgY2hhbmdlcyB0aGF0IGFwcGx5IChpbiBmaWxlIDEpCiAJ
ICAgICBvbmx5IHRvIGxpbmVzIGJlZm9yZSBsaW5lIEkuICAqLwoKQEAgLTI4MSw4ICsyNzksNyBA
QCBwcl9jb250ZXh0X2h1bmsgKHN0cnVjdCBjaGFuZ2UgKmh1bmspCiAgICAgICAgICAgICAgIHBy
ZWZpeCA9IChuZXh0LT5kZWxldGVkID4gMCA/ICIhIiA6ICIrIik7CiAgICAgICAgICAgICB9CiAJ
ICBwcmludF8xX2xpbmVfbmwgKHByZWZpeCwgJmZpbGVzWzFdLmxpbmJ1ZltpXSwgdHJ1ZSk7Ci0g
ICAgICAgICAgaWYgKGkgPT0gbGFzdDEpCi0gICAgICAgICAgICBzZXRfY29sb3JfY29udGV4dCAo
UkVTRVRfQ09OVEVYVCk7CisgICAgICAgICAgc2V0X2NvbG9yX2NvbnRleHQgKFJFU0VUX0NPTlRF
WFQpOwogICAgICAgICAgIGlmIChmaWxlc1sxXS5saW5idWZbaSArIDFdWy0xXSA9PSAnXG4nKQog
ICAgICAgICAgICAgcHV0YyAoJ1xuJywgb3V0KTsKIAl9CkBAIC0zOTAsMTkgKzM4NywxNyBAQCBw
cl91bmlkaWZmX2h1bmsgKHN0cnVjdCBjaGFuZ2UgKmh1bmspCiAJICAvKiBGb3IgZWFjaCBkaWZm
ZXJlbmNlLCBmaXJzdCBvdXRwdXQgdGhlIGRlbGV0ZWQgcGFydC4gKi8KCiAJICBrID0gbmV4dC0+
ZGVsZXRlZDsKLSAgICAgICAgICBpZiAoaykKLSAgICAgICAgICAgIHNldF9jb2xvcl9jb250ZXh0
IChERUxFVEVfQ09OVEVYVCk7CgogCSAgd2hpbGUgKGstLSkKIAkgICAgewogCSAgICAgIGNoYXIg
Y29uc3QgKiBjb25zdCAqbGluZSA9ICZmaWxlc1swXS5saW5idWZbaSsrXTsKKwkgICAgICBzZXRf
Y29sb3JfY29udGV4dCAoREVMRVRFX0NPTlRFWFQpOwogCSAgICAgIHB1dGMgKCctJywgb3V0KTsK
IAkgICAgICBpZiAoaW5pdGlhbF90YWIgJiYgISAoc3VwcHJlc3NfYmxhbmtfZW1wdHkgJiYgKips
aW5lID09ICdcbicpKQogCQlwdXRjICgnXHQnLCBvdXQpOwogCSAgICAgIHByaW50XzFfbGluZV9u
bCAoTlVMTCwgbGluZSwgdHJ1ZSk7CgotICAgICAgICAgICAgICBpZiAoIWspCi0gICAgICAgICAg
ICAgICAgc2V0X2NvbG9yX2NvbnRleHQgKFJFU0VUX0NPTlRFWFQpOworCSAgICAgIHNldF9jb2xv
cl9jb250ZXh0IChSRVNFVF9DT05URVhUKTsKCiAgICAgICAgICAgICAgIGlmIChsaW5lWzFdWy0x
XSA9PSAnXG4nKQogICAgICAgICAgICAgICAgIHB1dGMgKCdcbicsIG91dCk7CkBAIC00MTEsMTkg
KzQwNiwxNyBAQCBwcl91bmlkaWZmX2h1bmsgKHN0cnVjdCBjaGFuZ2UgKmh1bmspCiAJICAvKiBU
aGVuIG91dHB1dCB0aGUgaW5zZXJ0ZWQgcGFydC4gKi8KCiAJICBrID0gbmV4dC0+aW5zZXJ0ZWQ7
Ci0gICAgICAgICAgaWYgKGspCi0gICAgICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoQUREX0NP
TlRFWFQpOwoKICAgICAgICAgICB3aGlsZSAoay0tKQogCSAgICB7CiAJICAgICAgY2hhciBjb25z
dCAqIGNvbnN0ICpsaW5lID0gJmZpbGVzWzFdLmxpbmJ1ZltqKytdOworCSAgICAgIHNldF9jb2xv
cl9jb250ZXh0IChBRERfQ09OVEVYVCk7CiAJICAgICAgcHV0YyAoJysnLCBvdXQpOwogCSAgICAg
IGlmIChpbml0aWFsX3RhYiAmJiAhIChzdXBwcmVzc19ibGFua19lbXB0eSAmJiAqKmxpbmUgPT0g
J1xuJykpCiAJCXB1dGMgKCdcdCcsIG91dCk7CiAJICAgICAgcHJpbnRfMV9saW5lX25sIChOVUxM
LCBsaW5lLCB0cnVlKTsKCi0gICAgICAgICAgICAgIGlmICghaykKLSAgICAgICAgICAgICAgICBz
ZXRfY29sb3JfY29udGV4dCAoUkVTRVRfQ09OVEVYVCk7CisgICAgICAgICAgICAgIHNldF9jb2xv
cl9jb250ZXh0IChSRVNFVF9DT05URVhUKTsKCiAgICAgICAgICAgICAgIGlmIChsaW5lWzFdWy0x
XSA9PSAnXG4nKQogICAgICAgICAgICAgICAgIHB1dGMgKCdcbicsIG91dCk7CmRpZmYgLS1naXQg
YS9zcmMvbm9ybWFsLmMgYi9zcmMvbm9ybWFsLmMKaW5kZXggYzZhYWMwNy4uYmRiNzE4YiAxMDA2
NDQKLS0tIGEvc3JjL25vcm1hbC5jCisrKyBiL3NyYy9ub3JtYWwuYwpAQCAtNTksMTMgKzU5LDEx
IEBAIHByaW50X25vcm1hbF9odW5rIChzdHJ1Y3QgY2hhbmdlICpodW5rKQogICAvKiBQcmludCB0
aGUgbGluZXMgdGhhdCB0aGUgZmlyc3QgZmlsZSBoYXMuICAqLwogICBpZiAoY2hhbmdlcyAmIE9M
RCkKICAgICB7Ci0gICAgICBpZiAoZmlyc3QwIDw9IGxhc3QwKQotICAgICAgICBzZXRfY29sb3Jf
Y29udGV4dCAoREVMRVRFX0NPTlRFWFQpOwogICAgICAgZm9yIChpID0gZmlyc3QwOyBpIDw9IGxh
c3QwOyBpKyspCiAgICAgICAgIHsKKyAgICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoREVMRVRF
X0NPTlRFWFQpOwogICAgICAgICAgIHByaW50XzFfbGluZV9ubCAoIjwiLCAmZmlsZXNbMF0ubGlu
YnVmW2ldLCB0cnVlKTsKLSAgICAgICAgICBpZiAoaSA9PSBsYXN0MCkKLSAgICAgICAgICAgIHNl
dF9jb2xvcl9jb250ZXh0IChSRVNFVF9DT05URVhUKTsKKyAgICAgICAgICBzZXRfY29sb3JfY29u
dGV4dCAoUkVTRVRfQ09OVEVYVCk7CiAgICAgICAgICAgaWYgKGZpbGVzWzBdLmxpbmJ1ZltpICsg
MV1bLTFdID09ICdcbicpCiAgICAgICAgICAgICBwdXRjICgnXG4nLCBvdXRmaWxlKTsKICAgICAg
ICAgfQpAQCAtNzcsMTMgKzc1LDExIEBAIHByaW50X25vcm1hbF9odW5rIChzdHJ1Y3QgY2hhbmdl
ICpodW5rKQogICAvKiBQcmludCB0aGUgbGluZXMgdGhhdCB0aGUgc2Vjb25kIGZpbGUgaGFzLiAg
Ki8KICAgaWYgKGNoYW5nZXMgJiBORVcpCiAgICAgewotICAgICAgaWYgKGZpcnN0MSA8PSBsYXN0
MSkKLSAgICAgICAgc2V0X2NvbG9yX2NvbnRleHQgKEFERF9DT05URVhUKTsKICAgICAgIGZvciAo
aSA9IGZpcnN0MTsgaSA8PSBsYXN0MTsgaSsrKQogICAgICAgICB7CisgICAgICAgICAgc2V0X2Nv
bG9yX2NvbnRleHQgKEFERF9DT05URVhUKTsKICAgICAgICAgICBwcmludF8xX2xpbmVfbmwgKCI+
IiwgJmZpbGVzWzFdLmxpbmJ1ZltpXSwgdHJ1ZSk7Ci0gICAgICAgICAgaWYgKGkgPT0gbGFzdDEp
Ci0gICAgICAgICAgICBzZXRfY29sb3JfY29udGV4dCAoUkVTRVRfQ09OVEVYVCk7CisgICAgICAg
ICAgc2V0X2NvbG9yX2NvbnRleHQgKFJFU0VUX0NPTlRFWFQpOwogICAgICAgICAgIGlmIChmaWxl
c1sxXS5saW5idWZbaSArIDFdWy0xXSA9PSAnXG4nKQogICAgICAgICAgICAgcHV0YyAoJ1xuJywg
b3V0ZmlsZSk7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL3Rlc3RzL2NvbG9ycyBiL3Rlc3RzL2Nv
bG9ycwppbmRleCBlNWI1ZjM2Li5kMjhhNjFjIDEwMDc1NQotLS0gYS90ZXN0cy9jb2xvcnMKKysr
IGIvdGVzdHMvY29sb3JzCkBAIC0yOSw5ICsyOSw5IEBAIGdlbl9leHBfdSgpCiAgICAgbG9jYWwg
ZGU9JChwcmludGYgIiRlWyR7ZGV9bSIpCiAgICAgbG9jYWwgbG49JChwcmludGYgIiRlWyR7bG59
bSIpCiAgICAgcHJpbnRmICclcycgXAotIiRoZC0tLSBhJHRhYiRlcG9jaF9wbHVzCi0rKysgYiR0
YWIkZXBvY2hfcGx1cwotJHJzJHtsbn1AQCAtMSArMSBAQCRycworIiRoZC0tLSBhJHRhYiRlcG9j
aF9wbHVzJHJzCiskaGQrKysgYiR0YWIkZXBvY2hfcGx1cyRycworJHtsbn1AQCAtMSArMSBAQCRy
cwogJGRlLWEkcnMKICRhZCtiJHJzCiAiCkBAIC00Niw5ICs0Niw5IEBAIGdlbl9leHBfYygpCiAg
ICAgbG9jYWwgZGU9JChwcmludGYgIiRlWyR7ZGV9bSIpCiAgICAgbG9jYWwgbG49JChwcmludGYg
IiRlWyR7bG59bSIpCiAgICAgcHJpbnRmICclcycgXAotIiRoZCoqKiBhJHRhYiRlcG9jaF9wb3Np
eF8xMDAzXzFfMjAwMQotLS0tIGIkdGFiJGVwb2NoX3Bvc2l4XzEwMDNfMV8yMDAxCi0kcnMqKioq
KioqKioqKioqKioKKyIkaGQqKiogYSR0YWIkZXBvY2hfcG9zaXhfMTAwM18xXzIwMDEkcnMKKyRo
ZC0tLSBiJHRhYiRlcG9jaF9wb3NpeF8xMDAzXzFfMjAwMSRycworKioqKioqKioqKioqKioqCiAk
bG4qKiogMSAqKioqJHJzCiAkZGUhIGEkcnMKICRsbi0tLSAxIC0tLS0kcnMKLS0gCjIuMjAuMS4y
LmdiMjFlYmI2NzFiCgo=
--000000000000252fcc057e46507f--




From MAILER-DAEMON Sun Dec 30 23:19:13 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1gdp2n-00061V-K0
	for mharc-bug-diffutils@gnu.org; Sun, 30 Dec 2018 23:19:13 -0500
Received: from eggs.gnu.org ([208.118.235.92]:58392)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gdp2i-0005zQ-4y
	for bug-diffutils@gnu.org; Sun, 30 Dec 2018 23:19:09 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gdp2e-0003ln-NS
	for bug-diffutils@gnu.org; Sun, 30 Dec 2018 23:19:08 -0500
Received: from debbugs.gnu.org ([208.118.235.43]:59749)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1gdp2c-0003jV-0k
	for bug-diffutils@gnu.org; Sun, 30 Dec 2018 23:19:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gdp2b-0001fx-Ql
	for bug-diffutils@gnu.org; Sun, 30 Dec 2018 23:19:01 -0500
X-Loop: help-debbugs@gnu.org
Resent-From: "Dennis Lambe Jr." <malsyned@malsyned.net>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: bug-diffutils@gnu.org
Resent-Date: Mon, 31 Dec 2018 04:19:01 +0000
Resent-Message-ID: <handler.31105.B31105.15462299126407@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 31105
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: patch
To: Jim Meyering <jim@meyering.net>
Cc: 31105@debbugs.gnu.org
Received: via spool by 31105-submit@debbugs.gnu.org id=B31105.15462299126407
	(code B ref 31105); Mon, 31 Dec 2018 04:19:01 +0000
Received: (at 31105) by debbugs.gnu.org; 31 Dec 2018 04:18:32 +0000
Received: from localhost ([127.0.0.1]:42756 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1gdp28-0001fG-0n
	for submit@debbugs.gnu.org; Sun, 30 Dec 2018 23:18:32 -0500
Received: from uofr.net ([50.116.51.30]:46366)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <malsyned@malsyned.net>) id 1gdp25-0001f1-O8
	for 31105@debbugs.gnu.org; Sun, 30 Dec 2018 23:18:30 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=uofr.net;
	s=selector-1; 
	h=MIME-Version:Content-Type:In-Reply-To:References:Subject:Cc:To:From:Message-ID:Date;
	bh=AlnYxylFMavrvov5hC3+uMHGK2SFj3F/yL6itOlvQxY=; 
	b=MRUkIJkKzRQIWB237AFsbxeZBLUm1MHtE0bm27kon7TfNt95VohalRlAKLnfwMKObyYohnhzlQtM/Jle9rlM5SrZEHhPiAqthi+kudmETXZ7vFdM9aGOmz4ruFVWBqPg1nlurX0Y0aQF6w1vQsWPgSz2GY9EnaLj2VRTmsG8U58=;
Received: from malsyned by uofr.net with esmtpsa id 1gdp1z-0000tU-Qo;
	Sun, 30 Dec 2018 23:18:23 -0500
Received: from pool-96-230-124-99.bstnma.fios.verizon.net
	(pool-96-230-124-99.bstnma.fios.verizon.net [96.230.124.99]) by
	ssl.uofr.net
	(Horde Framework) with HTTPS; Sun, 30 Dec 2018 23:18:23 -0500
Date: Sun, 30 Dec 2018 23:18:23 -0500
Message-ID: <20181230231823.Horde.BLmvvPWE0fSki610W4kXJNE@ssl.uofr.net>
From: "Dennis Lambe Jr." <malsyned@malsyned.net>
References: <20180408195931.16701jbt40zlibqb@ssl.uofr.net>
	<20180409115317.54022sqdbsktmzxp@ssl.uofr.net>
	<CA+8g5KH74bqt-76yDz_qeLEWJyp75pFiUZ2Oim55K1PxCDT86w@mail.gmail.com>
	<20181229164859.Horde.JFiyHKdTe0V3lV77agJaa8n@ssl.uofr.net>
	<CA+8g5KGxYq9AJ2PyruktsZVun02-pfpdhRLppufyRXUJkxZ7=A@mail.gmail.com>
	<20181229174538.Horde.u9tqR9cMfBzhM9xg6B1q0Jh@ssl.uofr.net>
	<CA+8g5KEF8SB+g52W3gWCTSCSLgOA0c7zq121i=OORMYJ+YhOpA@mail.gmail.com>
In-Reply-To: <CA+8g5KEF8SB+g52W3gWCTSCSLgOA0c7zq121i=OORMYJ+YhOpA@mail.gmail.com>
User-Agent: Horde Application Framework 5
Content-Type: text/plain; charset=utf-8; format=flowed; DelSp=Yes
MIME-Version: 1.0
Content-Disposition: inline
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-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.43
Subject: [bug-diffutils] bug#31105: bug#31105: bug#31105: [PATCH] Restart
 and reset ANSI escapes on each line for compatibility with less -R
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: <http://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, 31 Dec 2018 04:19:09 -0000


Quoting Jim Meyering <jim@meyering.net>:

> Here's the result. Please review carefully and let me know if you
> would like to change anything. I won't push until after I've heard
> from you.

Looks great to me -- thanks!

--Dennis





From MAILER-DAEMON Mon Dec 31 01:26:07 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1gdr1b-0006Z6-Nc
	for mharc-bug-diffutils@gnu.org; Mon, 31 Dec 2018 01:26:07 -0500
Received: from eggs.gnu.org ([208.118.235.92]:57673)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gdr1Z-0006XX-SX
	for bug-diffutils@gnu.org; Mon, 31 Dec 2018 01:26:06 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gdr1W-0005u6-NG
	for bug-diffutils@gnu.org; Mon, 31 Dec 2018 01:26:05 -0500
Received: from debbugsout.gnu.org ([209.51.188.43]:60796)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1gdr1W-0005tn-Jc
	for bug-diffutils@gnu.org; Mon, 31 Dec 2018 01:26:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1gdr1W-0006oY-Dk
	for bug-diffutils@gnu.org; Mon, 31 Dec 2018 01:26:02 -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: Mon, 31 Dec 2018 06:26:02 +0000
Resent-Message-ID: <handler.31105.D31105.154623755626168.done@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: cc-closed 31105
X-GNU-PR-Package: diffutils
X-GNU-PR-Keywords: patch
To: "Dennis Lambe Jr." <malsyned@malsyned.net>
Cc: 31105-done@debbugs.gnu.org
Mail-Followup-To: 31105@debbugs.gnu.org, jim@meyering.net,
	malsyned@malsyned.net
Received: via spool by 31105-done@debbugs.gnu.org id=D31105.154623755626168
	(code D ref 31105); Mon, 31 Dec 2018 06:26:02 +0000
Received: (at 31105-done) by debbugs.gnu.org; 31 Dec 2018 06:25:56 +0000
Received: from localhost ([127.0.0.1]:42792 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
	id 1gdr1P-0006o0-Qy
	for submit@debbugs.gnu.org; Mon, 31 Dec 2018 01:25:55 -0500
Received: from mail-wr1-f65.google.com ([209.85.221.65]:42703)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <meyering@gmail.com>) id 1gdr1O-0006no-4A
	for 31105-done@debbugs.gnu.org; Mon, 31 Dec 2018 01:25:54 -0500
Received: by mail-wr1-f65.google.com with SMTP id q18so25755292wrx.9
	for <31105-done@debbugs.gnu.org>; Sun, 30 Dec 2018 22:25:54 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20161025;
	h=x-gm-message-state:mime-version:references:in-reply-to:from:date
	:message-id:subject:to:cc;
	bh=IVRhQH4szjTccUuPokS6smUkF8zGnNNu/G46ftH7BjY=;
	b=pk+4iGkJnD4bcLL9JkCpWrd7KipAfOvhwMR9J/Y04l4Bop/elOEOUXWbHHGyK1gwgA
	VLmj8WNSN6zW3VDCxAzlgiSe1Lcn1agELLgSN0A4EC2co8eplvY4UuRHhvMAeEIVDKvV
	5HngpI5mwBm7BmVZRR3Pd3hBT5WRtSiTjJcfV2w0nhI46qayR88T01Guy0j0r/lcyl1U
	TMOPXMzsHYRcdlZItljEiIo7z6WKvMyxz01xJGYSP6l6n8QttO53HKjqISjvQxn3mQak
	wayj66/gFa0b2OjLcMr5/vXyGTk3DdU7K7wk579HlDLY9gUg/V0Nq9dS9Lz9VOPrJ9rf
	U9tQ==
X-Gm-Message-State: AJcUukeAq4sHSTaMulZRES9WL1S7ySZ5wYoFctqrL/M/03DG7A36c+nb
	clzVdDRITVACxyoY1DxD/rTDLgLxa6Nm/0M7nPheFw==
X-Google-Smtp-Source: ALg8bN7sroLnZKl+ZwfWQcM07kuNqW4sFsu/1gwpyd7dqd5u6UPW1siFd9kxQ8YI58PaNWDuHmxiRNssgOrvktuxwhA=
X-Received: by 2002:adf:83e7:: with SMTP id 94mr32562669wre.278.1546237548348; 
	Sun, 30 Dec 2018 22:25:48 -0800 (PST)
MIME-Version: 1.0
References: <20180408195931.16701jbt40zlibqb@ssl.uofr.net>
	<20180409115317.54022sqdbsktmzxp@ssl.uofr.net>
	<CA+8g5KH74bqt-76yDz_qeLEWJyp75pFiUZ2Oim55K1PxCDT86w@mail.gmail.com>
	<20181229164859.Horde.JFiyHKdTe0V3lV77agJaa8n@ssl.uofr.net>
	<CA+8g5KGxYq9AJ2PyruktsZVun02-pfpdhRLppufyRXUJkxZ7=A@mail.gmail.com>
	<20181229174538.Horde.u9tqR9cMfBzhM9xg6B1q0Jh@ssl.uofr.net>
	<CA+8g5KEF8SB+g52W3gWCTSCSLgOA0c7zq121i=OORMYJ+YhOpA@mail.gmail.com>
	<20181230231823.Horde.BLmvvPWE0fSki610W4kXJNE@ssl.uofr.net>
In-Reply-To: <20181230231823.Horde.BLmvvPWE0fSki610W4kXJNE@ssl.uofr.net>
From: Jim Meyering <jim@meyering.net>
Date: Sun, 30 Dec 2018 22:25:35 -0800
Message-ID: <CA+8g5KEOUt8GqdzRCM2-mQ-7nk2YngmJE4pNJ7TPbrOJZXW=xg@mail.gmail.com>
Content-Type: text/plain; charset="UTF-8"
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-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
	[fuzzy]
X-Received-From: 209.51.188.43
Subject: [bug-diffutils] bug#31105: bug#31105: bug#31105: [PATCH] Restart
 and reset ANSI escapes on each line for compatibility with less -R
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: <http://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, 31 Dec 2018 06:26:06 -0000

On Sun, Dec 30, 2018 at 8:18 PM Dennis Lambe Jr. <malsyned@malsyned.net> wrote:
> Quoting Jim Meyering <jim@meyering.net>:
> > Here's the result. Please review carefully and let me know if you
> > would like to change anything. I won't push until after I've heard
> > from you.
>
> Looks great to me -- thanks!

Thanks. With that, I've pushed it and am marking this as "done".




