From owner-svn-src-projects@FreeBSD.ORG Wed Sep 19 20:52:43 2012 Return-Path: Delivered-To: svn-src-projects@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A41951065679; Wed, 19 Sep 2012 20:52:43 +0000 (UTC) (envelope-from brooks@lor.one-eyed-alien.net) Received: from lor.one-eyed-alien.net (lor.one-eyed-alien.net [69.66.77.232]) by mx1.freebsd.org (Postfix) with ESMTP id 6E1E18FC0A; Wed, 19 Sep 2012 20:52:42 +0000 (UTC) Received: from lor.one-eyed-alien.net (localhost [127.0.0.1]) by lor.one-eyed-alien.net (8.14.5/8.14.5) with ESMTP id q8JKqgoY004898; Wed, 19 Sep 2012 15:52:42 -0500 (CDT) (envelope-from brooks@lor.one-eyed-alien.net) Received: (from brooks@localhost) by lor.one-eyed-alien.net (8.14.5/8.14.5/Submit) id q8JKqgtE004897; Wed, 19 Sep 2012 15:52:42 -0500 (CDT) (envelope-from brooks) Date: Wed, 19 Sep 2012 15:52:42 -0500 From: Brooks Davis To: Jilles Tjoelker Message-ID: <20120919205242.GD3067@lor.one-eyed-alien.net> References: <201209182028.q8IKS1lK056820@svn.freebsd.org> <20120919194254.GA75105@stack.nl> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="qtZFehHsKgwS5rPz" Content-Disposition: inline In-Reply-To: <20120919194254.GA75105@stack.nl> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-projects@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r240675 - in projects/mtree: include lib/libc/gen X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Sep 2012 20:52:43 -0000 --qtZFehHsKgwS5rPz Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Sep 19, 2012 at 09:42:54PM +0200, Jilles Tjoelker wrote: > On Tue, Sep 18, 2012 at 08:28:01PM +0000, Brooks Davis wrote: > > Author: brooks > > Date: Tue Sep 18 20:28:01 2012 > > New Revision: 240675 > > URL: http://svn.freebsd.org/changeset/base/240675 >=20 > > Log: > > Implement VIS_GLOB support including compatibilty symbols required by > > overlapping flags between FreeBSD and NetBSD. >=20 > > Add a compatibility symbol for unvis() due to NetBSD's allocation of > > a flag value for UNVIS_END rather than just using 1. >=20 > > Add symbol version entries for new vis and unvis functions. >=20 > > [snip] > > Modified: projects/mtree/include/vis.h > > =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=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- projects/mtree/include/vis.h Tue Sep 18 20:20:29 2012 (r240674) > > +++ projects/mtree/include/vis.h Tue Sep 18 20:28:01 2012 (r240675) > > @@ -62,6 +62,7 @@ > > #define VIS_HTTP1866 0x200 /* http-style &#num; or &string; */ > > #define VIS_NOESCAPE 0x400 /* don't decode `\' */ > > #define _VIS_END 0x800 /* for unvis */ > > +#define VIS_GLOB 0x1000 /* encode glob(3) magics */ > > =20 > > /* > > * unvis return codes > >=20 > > [snip] >=20 > Is it really necessary to be binary compatible with NetBSD in the VIS_* > constants or is it possible to keep our values for the VIS_* constants > we already have? >=20 > While symbol versioning works, it leaves additional code around forever, > which would not be necessary if compatibility had been kept. For the vis(3) functions we could instead alter all the flags to retain compatibility to avoid the (very trivial) wrapper. Unfortunately, I think we should adopt their UNVIS_END change since it is obviously more correct and that does require a version change. There is probably an argument for splitting the difference. I argued with my self a fair bit before decided to go the versioned route since that would reduce diffs to the upstream, but it could go ether way. -- Brooks --qtZFehHsKgwS5rPz Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iD8DBQFQWjCZXY6L6fI4GtQRAi18AJ9xS1ztQMSGeXESvoOnW0lb8O9hUgCeOBrk 4yfHXW63hetQY6S9XakFMV8= =xMTf -----END PGP SIGNATURE----- --qtZFehHsKgwS5rPz--