Date: Thu, 9 Mar 2017 11:04:13 -0800 From: Bryan Drewery <bdrewery@FreeBSD.org> To: "Pedro F. Giffuni" <pfg@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314969 - head/usr.bin/localedef Message-ID: <f2a5e650-04a5-0fdc-0568-860aeb5372ff@FreeBSD.org> In-Reply-To: <201703091806.v29I6mNx080192@repo.freebsd.org> References: <201703091806.v29I6mNx080192@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --VefH2WBLjkdpxhHV540JrsBDJMcSC4W4u Content-Type: multipart/mixed; boundary="NJ0plAwijJ0iInFVkPFKr6rlE8I74CfQc"; protected-headers="v1" From: Bryan Drewery <bdrewery@FreeBSD.org> To: "Pedro F. Giffuni" <pfg@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <f2a5e650-04a5-0fdc-0568-860aeb5372ff@FreeBSD.org> Subject: Re: svn commit: r314969 - head/usr.bin/localedef References: <201703091806.v29I6mNx080192@repo.freebsd.org> In-Reply-To: <201703091806.v29I6mNx080192@repo.freebsd.org> --NJ0plAwijJ0iInFVkPFKr6rlE8I74CfQc Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 3/9/2017 10:06 AM, Pedro F. Giffuni wrote: > Author: pfg > Date: Thu Mar 9 18:06:48 2017 > New Revision: 314969 > URL: https://svnweb.freebsd.org/changeset/base/314969 >=20 > Log: > localedef(1): Fix mismatch in previous commit. > =20 > delete_category is meant to replace fclose() and unlink(). > This broke world. > =20 > Found by: kib > Pointedhat: pfg >=20 > Modified: > head/usr.bin/localedef/localedef.c >=20 > Modified: head/usr.bin/localedef/localedef.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=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/usr.bin/localedef/localedef.c Thu Mar 9 17:53:37 2017 (r31496= 8) > +++ head/usr.bin/localedef/localedef.c Thu Mar 9 18:06:48 2017 (r31496= 9) > @@ -137,8 +137,6 @@ close_category(FILE *f) > { > if (fchmod(fileno(f), 0644) < 0 || > fclose(f) !=3D 0) { > - (void) fclose(f); > - (void) unlink(category_file()); > errf(strerror(errno)); > delete_category(f); > } >=20 It still seems broken on r314971. The output looks different since it is WITH_META_MODE, but the point is that it rebuilt localedef and still hit the problem. > --- _bootstrap-tools-usr.bin/localedef ---^M > Building /usr/obj/usr/src/tmp/usr/src/usr.bin/localedef/localedef.full^= M =2E.. > /usr/obj/usr/src/share/colldef/af_ZA.ISO8859-1.LC_COLLATE.meta: 26: fil= e '/usr/obj/usr/src/tmp/legacy/usr/bin/localedef' is newer than the targe= t...^M > Building /usr/obj/usr/src/share/colldef/af_ZA.ISO8859-1.LC_COLLATE^M > --- af_ZA.ISO8859-1.LC_COLLATE ---^M > --- all_subdir_tests ---^M > Skipping meta for beforedepend: .PHONY^M > Skipping meta for afterdepend: .PHONY^M > Skipping meta for objwarn: .PHONY^M > Skipping meta for depend: .PHONY^M > --- all_subdir_share ---^M > localedef -D -U -i /usr/src/share/colldef/af_ZA.UTF-8.src -f /usr/src/= tools/tools/locale/etc/final-maps/map.ISO8859-1 /usr/obj/usr/src/share/c= olldef/af_ZA.ISO8859-1^M =2E.. > --- all_subdir_share ---^M > /usr/src/share/colldef/af_ZA.UTF-8.src: 2421: error: Bad file descripto= r^M --=20 Regards, Bryan Drewery --NJ0plAwijJ0iInFVkPFKr6rlE8I74CfQc-- --VefH2WBLjkdpxhHV540JrsBDJMcSC4W4u Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJYwactAAoJEDXXcbtuRpfPHzYH/15aI3XlxyZwWRdq07dasFNQ 8ZeZB2Dt/0kvJzUwYhB4+9jDCJWBpI6Sh7sjDPY0FCBYBg87U6cFZDT01yqjF1h9 nr6oDjJBA7DJYqENUIQeijOvh74bC3a71tAbUD258Gh6jyYrd0dhKtR1NY92vmnB EtLKPtMuNseP211v8iL3WHLbVMGcykGK2AUXdcMZg0oAUkraXB0UpMk5OqEi1gFM jzt6ZjTx35kfajCa1ViZZ4whyt6HOccJFO4aqFyOz3aOP0v3LnV3hgmTmDANnXKo e+ZA2xJeecAefdrzxGoWpliHHb2uaNwzZY5bcDyyRYG8o8ImV+gDY8lJ9gYxAsc= =97fT -----END PGP SIGNATURE----- --VefH2WBLjkdpxhHV540JrsBDJMcSC4W4u--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?f2a5e650-04a5-0fdc-0568-860aeb5372ff>