From owner-freebsd-current@FreeBSD.ORG Wed Feb 20 18:25:29 2008 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BE37B16A402; Wed, 20 Feb 2008 18:25:29 +0000 (UTC) (envelope-from kensmith@cse.Buffalo.EDU) Received: from phoebe.cse.buffalo.edu (phoebe.cse.buffalo.edu [128.205.32.89]) by mx1.freebsd.org (Postfix) with ESMTP id 41A4613C442; Wed, 20 Feb 2008 18:25:28 +0000 (UTC) (envelope-from kensmith@cse.Buffalo.EDU) Received: from [128.205.32.76] (bauer.cse.buffalo.edu [128.205.32.76]) (authenticated bits=0) by phoebe.cse.buffalo.edu (8.14.1/8.13.7) with ESMTP id m1KIP0Lq075577 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 20 Feb 2008 13:25:00 -0500 (EST) (envelope-from kensmith@cse.buffalo.edu) From: Ken Smith To: Mark Peek In-Reply-To: <47BC63BC.4080003@FreeBSD.org> References: <47BB4E5D.7010505@citrin.ru> <7F7C8315-AB96-425E-B942-0DB55BFDBCF3@FreeBSD.org> <47BC2AAB.5090605@citrin.ru> <47BC63BC.4080003@FreeBSD.org> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-6fEk2p1qMiSAHeVbY0EQ" Organization: U. Buffalo CSE Department Date: Wed, 20 Feb 2008 13:25:00 -0500 Message-Id: <1203531900.99240.16.camel@bauer.cse.buffalo.edu> Mime-Version: 1.0 X-Mailer: Evolution 2.12.1 FreeBSD GNOME Team Port X-DCC-Buffalo.EDU-Metrics: phoebe.cse.buffalo.edu 1335; Body=0 Fuz1=0 Fuz2=0 X-Spam-Status: No, score=1.8 required=5.0 tests=MIME_QP_LONG_LINE autolearn=no version=3.2.3 X-Spam-Level: * X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on phoebe.cse.buffalo.edu Cc: Rui Paulo , freebsd-current@FreeBSD.org, re@FreeBSD.org, Anton Yuzhaninov Subject: Re: tcsh in current-8.0 coredump X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2008 18:25:29 -0000 --=-6fEk2p1qMiSAHeVbY0EQ Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Wed, 2008-02-20 at 09:30 -0800, Mark Peek wrote: > On 2/20/08 8:05 AM, Rui Paulo wrote: > >=20 > > On Feb 20, 2008, at 1:27 PM, Anton Yuzhaninov wrote: > >=20 > >> On 20.02.2008 4:56, Rui Paulo wrote: > >>> On Feb 19, 2008, at 9:47 PM, Anton Yuzhaninov wrote: > >>>> Problem was described here: > >>>> http://docs.freebsd.org/cgi/mid.cgi?131632274.20070319100945 > >>>> http://mx.gw.com/pipermail/tcsh-bugs/2007-March/000481.html > >>>> > >>>> This was fixed for RELENG_7: > >>>> > >>>> http://www.freebsd.org/cgi/cvsweb.cgi/src/contrib/tcsh/sh.lex.c > >>>> Revision 1.1.1.8 (vendor branch): download - view: text, markup,=20 > >>>> annotated - select for diffs > >>>> Tue Apr 3 15:51:53 2007 UTC (10 months, 2 weeks ago) by mp > >>>> Branches: ZOULAS, MAIN > >>>> CVS tags: tcsh_6_15p1, RELENG_7_BP, RELENG_7_0_BP, RELENG_7_0, RELEN= G_7 > >>>> Diff to: previous 1.1.1.7: preferred, colored > >>>> Changes since revision 1.1.1.7: +2 -1 lines > >>>> > >>>> Import vendor patch to fix postcmd regression in tcsh-6.15.00. > >>>> ------- > >>>> > >>>> But this bug was not fixed in HEAD. > >>>> > >>> Are you sure? I seem to recall this was fixed even before RELENG_7=20 > >>> was tagged. > >> > >> $ cvs up > >> $ cvs diff -r HEAD -r RELENG_7 contrib/tcsh/sh.lex.c > >> Index: contrib/tcsh/sh.lex.c > >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > >> RCS file: /home/ncvs/src/contrib/tcsh/sh.lex.c,v > >> retrieving revision 1.1.1.9 > >> retrieving revision 1.1.1.8 > >> diff -u -r1.1.1.9 -r1.1.1.8 > >> --- contrib/tcsh/sh.lex.c 15 Oct 2007 16:54:07 -0000 1.1.1.= 9 > >> +++ contrib/tcsh/sh.lex.c 3 Apr 2007 15:51:53 -0000 1.1.1.= 8 > >> @@ -851,7 +851,8 @@ > >> return (en); > >> } > >> slhs.len =3D 0; > >> - Strbuf_append(&slhs, lhsb.s); > >> + if (lhsb.s !=3D NULL && lhsb.len !=3D 0) > >> + Strbuf_append(&slhs, lhsb.s); > >> Strbuf_terminate(&slhs); > >> if (exclc) > >> en =3D dosub(sc, en, global); > >> > >> As you can see from cvs diff, null pointer check present in RELENG_7.=20 > >> but absent in HEAD > >=20 > > Oh, you are right. This was never MFC'ed, but the log says: > >=20 > > revision 1.1.1.9 > > date: 2007/10/15 16:54:07; author: mp; state: Exp; lines: +1 -2 > > Import two vendor fixes from tcsh-6.15.01 for MFC to 7.0. The fixes are= : > > - Fix pty detection for autologout setting > > - kill `foo` got stuck because sigchld was disabled too soon > >=20 > > Requested by: re > >=20 > > Maybe we should MFC this now. >=20 > That's really odd. I thought RELENG_7 didn't branch until 10/10/2007 but = the=20 > postcmd fix was imported on 4/3/2007. In other words, I thought it was al= ready=20 > in RELENG_7. But CVS still thinks the two are different. I can MFC it whe= never=20 > re@ approves it given we're at 7.0-RC2. >=20 > Mark I *think* the original message above has it correct and you (Mark and Rui) have it reversed. Mark, I think when re@ requested this you might have done the commit straight to RELENG_7 and didn't do HEAD. So as things stand right now this is what's in RELENG_7 and RELENG_7_0: slhs.len =3D 0; if (lhsb.s !=3D NULL && lhsb.len !=3D 0) Strbuf_append(&slhs, lhsb.s); Strbuf_terminate(&slhs); (which I believe is what you want) but this is what's in HEAD: slhs.len =3D 0; Strbuf_append(&slhs, lhsb.s); Strbuf_terminate(&slhs); If I'm wrong about that let me know. Otherwise you don't need approval for what needs to be done from re@, just commit the fix to HEAD whenever you want. --=20 Ken Smith - From there to here, from here to | kensmith@cse.buffalo.edu there, funny things are everywhere. | - Theodore Geisel | --=-6fEk2p1qMiSAHeVbY0EQ Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (FreeBSD) iD8DBQBHvHB0/G14VSmup/YRAreuAJ4y84j+DgGbxgjyfE1EG9jdgxnc/QCeJEPU ouYqrcG2JLMoNotJro63Src= =gEpb -----END PGP SIGNATURE----- --=-6fEk2p1qMiSAHeVbY0EQ--