Date: Sat, 13 Feb 2021 01:42:23 -0500 From: Jung-uk Kim <jkim@FreeBSD.org> To: Mark Johnston <markj@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r362333 - in head: contrib/flex contrib/flex/src usr.bin/lex usr.bin/lex/lib Message-ID: <0a0ac901-c1d2-54d7-d585-2856ae4fe6ea@FreeBSD.org> In-Reply-To: <YCbeabF%2BBSrpQep0@raichu> References: <202006181809.05II9G8p054025@repo.freebsd.org> <YCbeabF%2BBSrpQep0@raichu>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --rO8sMfinX2yxVlpQHj6O53yYEJYoqiXxU Content-Type: multipart/mixed; boundary="gcR0VLLRQ6Xng2BPSLXSVdA4bAoIlUWwz"; protected-headers="v1" From: Jung-uk Kim <jkim@FreeBSD.org> To: Mark Johnston <markj@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <0a0ac901-c1d2-54d7-d585-2856ae4fe6ea@FreeBSD.org> Subject: Re: svn commit: r362333 - in head: contrib/flex contrib/flex/src usr.bin/lex usr.bin/lex/lib References: <202006181809.05II9G8p054025@repo.freebsd.org> <YCbeabF+BSrpQep0@raichu> In-Reply-To: <YCbeabF+BSrpQep0@raichu> --gcR0VLLRQ6Xng2BPSLXSVdA4bAoIlUWwz Content-Type: multipart/mixed; boundary="------------E339EDF0812F96CD3F2582EB" Content-Language: en-US This is a multi-part message in MIME format. --------------E339EDF0812F96CD3F2582EB Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 21. 2. 12., Mark Johnston wrote: > On Thu, Jun 18, 2020 at 06:09:16PM +0000, Jung-uk Kim wrote: >> Author: jkim >> Date: Thu Jun 18 18:09:16 2020 >> New Revision: 362333 >> URL: https://svnweb.freebsd.org/changeset/base/362333 >> >> Log: >> MFV: r362286 >> =20 >> Merge flex 2.6.4. >=20 > This seems to have introduced a regression: input() now returns 0 > instead of EOF to indicate that the end of input was reached. This has= > been reported in a few places: >=20 > https://github.com/westes/flex/issues/448 > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D911415 >=20 > It breaks the scanner used by libdtrace, and as a result dtrace is > unable to resolve some probe argument types: > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D253440 >=20 > I have a small patch to libdtrace which works around this. The upstrea= m > commit that introduced the change is fairly old at this point, and > upstream seems somewhat unresponsive, so I'm not sure it'll get > reverted. Some other scanners in the tree look like they'd be affected= , > like crypto/heimdal/lib/asn1/lex.l or > sys/contrib/dev/acpica/compiler/aslsupport.l, so I'm wondering if we > should revert this particular change for 13.0. Certainly we should fix= > the DTrace bug one way or another for 13.0. I think it does not make much sense and we should revert the upstream change. Does the attached patch work for you? Jung-uk Kim --------------E339EDF0812F96CD3F2582EB Content-Type: text/x-patch; charset=UTF-8; name="flex.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="flex.diff" diff --git a/contrib/flex/src/flex.skl b/contrib/flex/src/flex.skl index 242645f53245..b0f1b2ad297c 100644 --- a/contrib/flex/src/flex.skl +++ b/contrib/flex/src/flex.skl @@ -1863,7 +1863,7 @@ m4_ifdef( [[M4_YY_USE_LINENO]], case EOB_ACT_END_OF_FILE: { if ( yywrap( M4_YY_CALL_ONLY_ARG ) ) - return 0; + return EOF; =20 if ( ! YY_G(yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; --------------E339EDF0812F96CD3F2582EB-- --gcR0VLLRQ6Xng2BPSLXSVdA4bAoIlUWwz-- --rO8sMfinX2yxVlpQHj6O53yYEJYoqiXxU Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsB5BAABCAAjFiEEl1bqgKaRyqfWXu/CfJ+WJvzb8UYFAmAndM8FAwAAAAAACgkQfJ+WJvzb8Uab Lgf/Q0Dgl1iZ1RTUkoK4wPXmpkzZg54f1QgWg5wgNkRJGCUK3iY//y7ZWeaE1JvSB7aUVNn/i+t2 Ys3yUS50dD6cnC5/c/wfuJNLX81Nl3NF3V/ErU0OsGzc4/v83hlMo3GjlHP56gL1FY4iou+DKhCh fz+mhg9lYsEQEtb25mfoXkWTXXoXJIqziLnQDk336e99o5W5CDDDyQ97bcO3Qz45bkgOUW7qzox8 Yoaz76xztgwZRdABpkGS4V2u9R0ytPqWyccYyYTV2K5gRYXyG82Kb7sEGwD1bcztRFPx7oMj+3ru qLtK+tj6jekKEoCoF4byodzpJGcSbcZ0ANb0ZSWMqA== =dnZq -----END PGP SIGNATURE----- --rO8sMfinX2yxVlpQHj6O53yYEJYoqiXxU--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?0a0ac901-c1d2-54d7-d585-2856ae4fe6ea>