Make the format of LC_CTYPE files architecture independent by

introducing the disk formats for _RuneLocale and friends.

The disk formats do not have (useless) pointers and have 32-bit
quantities instead of rune_t and long.  (htonl(3) only works
with 32-bit quantities, so there's no loss).

Bootstrap mklocale(1) when necessary.  (Bootstrapping from 4.x
would be trivial (verified), but we no longer provide pre-5.3
source upgrades and this is the first commit to actually break
it.)

2 files changed, 63 insertions, 1 deletions

diff --git a/include/Makefile b/include/Makefile
index 2ca0bca..56653b2 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -15,7 +15,8 @@ INCS=	a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \
 	netdb.h nl_types.h nlist.h nss.h nsswitch.h objformat.h paths.h \
 	proc_service.h pthread.h \
 	pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h regexp.h \
-	resolv.h runetype.h search.h setjmp.h sgtty.h signal.h stab.h \
+	resolv.h runefile.h runetype.h search.h setjmp.h sgtty.h \
+	signal.h stab.h \
 	stdbool.h stddef.h stdio.h stdlib.h string.h stringlist.h \
 	strings.h sysexits.h tar.h tgmath.h \
 	time.h timeconv.h timers.h ttyent.h \
diff --git a/include/runefile.h b/include/runefile.h
new file mode 100644
index 0000000..ce1e47e
--- /dev/null
+++ b/include/runefile.h
@@ -0,0 +1,61 @@
+/*-
+ * Copyright (c) 2005 Ruslan Ermilov
+ * All rights reserved.
+ *
+ * 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.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * 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 AUTHOR 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _RUNEFILE_H_
+#define	_RUNEFILE_H_
+
+#include <sys/types.h>
+
+#ifndef _CACHED_RUNES
+#define	_CACHED_RUNES	(1 << 8)
+#endif
+
+typedef struct {
+	int32_t		min;
+	int32_t		max;
+	int32_t		map;
+} _FileRuneEntry;
+
+typedef struct {
+	char		magic[8];
+	char		encoding[32];
+
+	uint32_t	runetype[_CACHED_RUNES];
+	int32_t		maplower[_CACHED_RUNES];
+	int32_t		mapupper[_CACHED_RUNES];
+
+	int32_t		runetype_ext_nranges;
+	int32_t		maplower_ext_nranges;
+	int32_t		mapupper_ext_nranges;
+
+	int32_t		variable_len;
+} _FileRuneLocale;
+
+#define	_FILE_RUNE_MAGIC_1	"RuneMag1"
+
+#endif	/* !_RUNEFILE_H_ */