svn commit: r314969 - head/usr.bin/localedef
Bryan Drewery
bdrewery at FreeBSD.org
Thu Mar 9 19:04:50 UTC 2017
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
>
> Log:
> localedef(1): Fix mismatch in previous commit.
>
> delete_category is meant to replace fclose() and unlink().
> This broke world.
>
> Found by: kib
> Pointedhat: pfg
>
> Modified:
> head/usr.bin/localedef/localedef.c
>
> Modified: head/usr.bin/localedef/localedef.c
> ==============================================================================
> --- head/usr.bin/localedef/localedef.c Thu Mar 9 17:53:37 2017 (r314968)
> +++ head/usr.bin/localedef/localedef.c Thu Mar 9 18:06:48 2017 (r314969)
> @@ -137,8 +137,6 @@ close_category(FILE *f)
> {
> if (fchmod(fileno(f), 0644) < 0 ||
> fclose(f) != 0) {
> - (void) fclose(f);
> - (void) unlink(category_file());
> errf(strerror(errno));
> delete_category(f);
> }
>
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
...
> /usr/obj/usr/src/share/colldef/af_ZA.ISO8859-1.LC_COLLATE.meta: 26: file '/usr/obj/usr/src/tmp/legacy/usr/bin/localedef' is newer than the target...^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/colldef/af_ZA.ISO8859-1^M
...
> --- all_subdir_share ---^M
> /usr/src/share/colldef/af_ZA.UTF-8.src: 2421: error: Bad file descriptor^M
--
Regards,
Bryan Drewery
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20170309/5107a97a/attachment.sig>
More information about the svn-src-all
mailing list