From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Thu, 27 Oct 2005 00:52:22 +0400 From: "Dmitry V. Levin" To: ALT Devel discussion list Subject: Re: [devel] Re: patch-2.5.9 Message-ID: <20051026205222.GA30440@basalt.office.altlinux.org> Mail-Followup-To: ALT Devel discussion list References: <1129610723.5763.26.camel@localhost.localdomain> <20051018094019.GA15246@basalt.office.altlinux.org> <1129666137.5883.0.camel@localhost.localdomain> <20051025212313.GA20703@basalt.office.altlinux.org> <1130276930.28304.3.camel@localhost.localdomain> <20051025215618.GA21602@basalt.office.altlinux.org> <1130309001.28304.17.camel@localhost.localdomain> <20051026123615.GC9873@basalt.office.altlinux.org> <1130358805.2105.3.camel@localhost.localdomain> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="da4uJneut+ArUgXk" Content-Disposition: inline In-Reply-To: <1130358805.2105.3.camel@localhost.localdomain> X-fingerprint: 9658 398D 181B 1200 8FC5 26B8 F6F8 846B C1E2 3429 X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: ALT Devel discussion list List-Id: ALT Devel discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Oct 2005 20:52:22 -0000 Archived-At: List-Archive: List-Post: --da4uJneut+ArUgXk Content-Type: multipart/mixed; boundary="l76fUT7nc3MelDdI" Content-Disposition: inline --l76fUT7nc3MelDdI Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Oct 27, 2005 at 12:33:25AM +0400, Mikhail Zabaluev wrote: > =F7 =F3=D2=C4, 26/10/2005 =D7 16:36 +0400, Dmitry V. Levin =D0=C9=DB=C5= =D4: > > > =F0=CF-=CD=CF=C5=CD=D5, =D0=C1=D4=DE=C9 =D3 CRLF, =CB=CF=C7=C4=C1 =D7= =C9=D3=C8=CF=C4=CE=D9=C8 =D3=D4=D2=CF=CB=C1=C8 LF, =C4=CF=CC=D6=CE=D9 =C2= =D9=D4=D8 > > > =CE=C5=CC=C5=C7=C1=CC=D8=CE=D9, =D4.=CB =D3=CF=DA=C4=C1=C0=D4 =CE=C5= =CF=C4=CE=CF=DA=CE=C1=DE=CE=CF=D3=D4=D8 =D7 =C4=CF=D0=D5=D3=D4=C9=CD=D9=C8 = =C9=D3=C8=CF=C4=CE=D9=C8 =C6=C1=CA=CC=C1=C8, =C9 > > > =CE=C5=D0=CF=CE=D1=D4=CE=CF, =CB=C1=CB=C9=C5 =CB=CF=CE=C3=D9 =D3=D4= =D2=CF=CB =C4=CF=CC=D6=CE=D9 =C2=D9=D4=D8 =D7 =D2=C5=DA=D5=CC=D8=D4=C1=D4= =C5. > >=20 > > =E9=CE=CF=C7=C4=C1 =D0=CF=CE=D1=D4=CE=CF. >=20 > =E1=CC=C7=CF=D2=C9=D4=CD =D7 =D3=D4=D5=C4=C9=C0. Attached. --=20 ldv --l76fUT7nc3MelDdI Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-2.5.9-cvs-20030702-p_strip_trailing_cr.patch" Content-Transfer-Encoding: quoted-printable 2003-07-02 Paul Eggert * pch.c (intuit_diff_type): If a unified-diff header line contains trailing CR, strip CR from each body line. This corrects a bug introduced in the 2003-05-18 patch. Bug reported by Andreas Gruenbacher. --- pch.c 2003/05/20 14:03:17 1.44 +++ pch.c 2003/07/02 22:19:21 1.45 @@ -1,6 +1,6 @@ /* reading patches */ =20 -/* $Id: pch.c,v 1.44 2003/05/20 14:03:17 eggert Exp $ */ +/* $Id: pch.c,v 1.45 2003/07/02 22:19:21 eggert Exp $ */ =20 /* Copyright (C) 1986, 1987, 1988 Larry Wall =20 @@ -366,10 +366,16 @@ intuit_diff_type (void) if (!stars_last_line && strnEQ(s, "*** ", 4)) name[OLD] =3D fetchname (s+4, strippath, &p_timestamp[OLD]); else if (strnEQ(s, "+++ ", 4)) + { /* Swap with NEW below. */ name[OLD] =3D fetchname (s+4, strippath, &p_timestamp[OLD]); + p_strip_trailing_cr =3D strip_trailing_cr; + } else if (strnEQ(s, "Index:", 6)) + { name[INDEX] =3D fetchname (s+6, strippath, (time_t *) 0); + p_strip_trailing_cr =3D strip_trailing_cr; + } else if (strnEQ(s, "Prereq:", 7)) { for (t =3D s + 7; ISSPACE ((unsigned char) *t); t++) continue; @@ -409,6 +415,7 @@ intuit_diff_type (void) p_timestamp[NEW] =3D timestamp; p_rfc934_nesting =3D (t - s) >> 1; } + p_strip_trailing_cr =3D strip_trailing_cr; } } if ((diff_type =3D=3D NO_DIFF || diff_type =3D=3D ED_DIFF) && --l76fUT7nc3MelDdI-- --da4uJneut+ArUgXk Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFDX+yF9viEa8HiNCkRAk5IAJ9gL2fLot0m9sX5faEltCI9mLhHkACbBxl7 1/1WwMBfwFJzGqJZMp5YqfU= =aj4q -----END PGP SIGNATURE----- --da4uJneut+ArUgXk--