 @@ -1,14 +1,14 @@
-.\" $NetBSD: mklocale.1,v 1.17 2017/07/03 21:34:20 wiz Exp $
+.\" $NetBSD: mklocale.1,v 1.18 2023/12/28 03:49:35 rin Exp $
 .\" FreeBSD: src/usr.bin/mklocale/mklocale.1,v 1.6 1999/09/20 09:15:21 phantom Exp
 .\"
 .\" Copyright (c) 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" Paul Borman at Krystal Technologies.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 @@ -23,27 +23,27 @@
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mklocale.1	8.2 (Berkeley) 4/18/94
 .\"
-.Dd July 15, 2013
+.Dd December 28, 2023
 .Dt MKLOCALE 1
 .Os
 .Sh NAME
 .Nm mklocale
 .Nd make LC_CTYPE locale files
 .Sh SYNOPSIS
 .Nm mklocale
 .Op Fl d
 .Op Fl t Ar type
+<
 .Ar source
+>
 .Ar language/LC_CTYPE
 @@ -200,27 +200,29 @@ is the lower case representation of
 .It Dv MAPUPPER
 Defines the toupper mappings.
 .Dv RUNE2
 is the upper case representation of
 .Dv RUNE1 .
 .It Dv TODIGIT
 Defines a map from runes to their digit value.
 .Dv RUNE2
 is the integer value represented by
 .Dv RUNE1 .
 For example, the ASCII character
 .Sq 0
 would map to the decimal value 0.
-Only values up to 255 are allowed.
+On
 .Nx ,
 this information is ignored and not put into the binary output file.
 .El
 .Pp
 The following keywords may appear multiple times and have the following
 format for data:
 .Bl -tag -width "RUNE1 THRU RUNEn"
 .It Dv RUNE
 This rune has the property defined by the keyword.
 .It Dv "RUNE1 THRU RUNEn"
 All the runes between and including
 .Dv RUNE1
 and
 .Dv RUNEn
 have the property defined by the keyword.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: yacc.y,v 1.34 2019/10/13 21:12:32 christos Exp $	*/
+/*	$NetBSD: yacc.y,v 1.35 2023/12/28 03:49:35 rin Exp $	*/
 %{
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Paul Borman at Krystal Technologies.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -33,27 +33,27 @@
  * SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)yacc.y	8.1 (Berkeley) 6/6/93";
 static char rcsid[] = "$FreeBSD$";
 #else
-__RCSID("$NetBSD: yacc.y,v 1.34 2019/10/13 21:12:32 christos Exp $");
+__RCSID("$NetBSD: yacc.y,v 1.35 2023/12/28 03:49:35 rin Exp $");
 #endif
 #endif /* not lint */
 #include <sys/types.h>
 #include <netinet/in.h>	/* Needed by <arpa/inet.h> on NetBSD 1.5. */
 #include <arpa/inet.h>	/* Needed for htonl on POSIX systems. */
 #include <err.h>
 #include <locale.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 @@ -72,27 +72,29 @@ rune_map	types = { { 0, }, };
 _FileRuneLocale new_locale = { { 0, }, };
 size_t rl_variable_len = (size_t)0;
 void *rl_variable = NULL;
 __nbrune_t	charsetbits = (__nbrune_t)0x00000000;
 #if 0
 __nbrune_t	charsetmask = (__nbrune_t)0x0000007f;
 #endif
 __nbrune_t	charsetmask = (__nbrune_t)0xffffffff;
 void set_map(rune_map *, rune_list *, u_int32_t);
 #if 0
 void set_digitmap(rune_map *, rune_list *);
 #endif
 void add_map(rune_map *, rune_list *, u_int32_t);
 __dead void	usage(void);
 int		yyerror(const char *s);
 void		*xmalloc(unsigned int sz);
 u_int32_t	*xlalloc(unsigned int sz);
 u_int32_t	*xrelalloc(u_int32_t *old, unsigned int sz);
 void		dump_tables(void);
 int		yyparse(void);
 extern int	yylex(void);
 /* mklocaledb.c */
 extern void mklocaledb(const char *, FILE *, FILE *);
 @@ -177,28 +179,39 @@ entry	:	ENCODING STRING
 		  	/*Latin1: 96A*/
 			charsetbits = 0x80;
 			charsetmask = 0x0000007f;
+		  }
+		}
 	|	INVALID RUNE
 		{ new_locale.frl_invalid_rune = htonl((u_int32_t)$2); }
 	|	LIST list
 		{ set_map(&types, $2, $1); }
 	|	MAPLOWER map
 		{ set_map(&maplower, $2, 0); }
 	|	MAPUPPER map
 		{ set_map(&mapupper, $2, 0); }
-	|	DIGITMAP map
+/*
-		{ set_digitmap(&types, $2); }
+ * XXX PR lib/57798
  * set_digitmap() was implemented with an assumption that
  * all characters are mapped to numerical values <= 255.
  * This is no longer true for Unicode, and results in, e.g.,
  * wrong return values of wcwidth(3) for U+5146 or U+16B60.
+ *
  *	|	DIGITMAP map
  *		{ set_digitmap(&types, $2); }
+ *
  */
 	|	DIGITMAP mapignore
 		{ }
+	;
 list	:	RUNE
+		{
 		    $$ = (rune_list *)malloc(sizeof(rune_list));
 		    $$->min = ($1 & charsetmask) | charsetbits;
 		    $$->max = ($1 & charsetmask) | charsetbits;
 		    $$->next = 0;
+		}
 	|	RUNE THRU RUNE
+		{
 		    $$ = (rune_list *)malloc(sizeof(rune_list));
 		    $$->min = ($1 & charsetmask) | charsetbits;
 @@ -244,26 +257,32 @@ map	:	LBRK RUNE RUNE RBRK
 		    $$->max = ($4 & charsetmask) | charsetbits;
 		    $$->map = $6;
 		    $$->next = 0;
+		}
 	|	map LBRK RUNE THRU RUNE ':' RUNE RBRK
+		{
 		    $$ = (rune_list *)malloc(sizeof(rune_list));
 		    $$->min = ($3 & charsetmask) | charsetbits;
 		    $$->max = ($5 & charsetmask) | charsetbits;
 		    $$->map = $7;
 		    $$->next = $1;
+		}
+	;
 mapignore :	LBRK RUNE RUNE RBRK { }
 	|	map LBRK RUNE RUNE RBRK { }
 	|	LBRK RUNE THRU RUNE ':' RUNE RBRK { }
 	|	map LBRK RUNE THRU RUNE ':' RUNE RBRK { }
+	;
 %%
 int debug = 0;
 FILE *ofile;
 int
 main(int ac, char *av[])
+{
     int x;
     const char *locale_type;
     extern char *optarg;
     extern int optind;
 @@ -372,45 +391,47 @@ xrelalloc(u_int32_t *old, unsigned int s
 void
 set_map(rune_map *map, rune_list *list, u_int32_t flag)
+{
     list->map &= charsetmask;
     list->map |= charsetbits;
     while (list) {
 	rune_list *nlist = list->next;
 	add_map(map, list, flag);
 	list = nlist;
+    }
+}
 #if 0
 void
 set_digitmap(rune_map *map, rune_list *list)
+{
     __nbrune_t i;
     while (list) {
 	rune_list *nlist = list->next;
 	for (i = list->min; i <= list->max; ++i) {
 	    if (list->map + (i - list->min)) {
 		rune_list *tmp = (rune_list *)xmalloc(sizeof(rune_list));
 		tmp->min = i;
 		tmp->max = i;
 		add_map(map, tmp, list->map + (i - list->min));
+	    }
+	}
 	free(list);
 	list = nlist;
+    }
+}
 #endif
 void
 add_map(rune_map *map, rune_list *list, u_int32_t flag)
+{
     __nbrune_t i;
     rune_list *lr = 0;
     rune_list *r;
     __nbrune_t run;
     while (list->min < _CTYPE_CACHE_SIZE && list->min <= list->max) {
 	if (flag)
 	    map->map[list->min++] |= flag;
 	else