Author: bapt
Date: Fri Nov 20 23:15:05 2015
New Revision: 291115
URL: https://svnweb.freebsd.org/changeset/base/291115
Log:
Reintegrate colldef(1) and mklocale(1)
While those tools are not needed anymore they are necessary to build FreeBSD 9
and 10. it does not hurt to keep those tools around until both 9 and 10 branch
become EOLed.
Modify colldef(1) to build after the change in the collation header, and
ensure
it does produce the same collation definition it used to generate for 9 and 10
Reported by: Oliver Pinter
Added:
- copied from r290493, head/usr.bin/colldef/
- copied from r290493, head/usr.bin/mklocale/
Directory Properties:
head/usr.bin/colldef/ (props changed)
head/usr.bin/mklocale/ (props changed)
Modified:
head/usr.bin/Makefile
head/usr.bin/colldef/parse.y
Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile Fri Nov 20 22:36:41 2015 (r291114)
+++ head/usr.bin/Makefile Fri Nov 20 23:15:05 2015 (r291115)
@@ -25,6 +25,7 @@ SUBDIR= alias \
cksum \
cmp \
col \
+ colldef \
colrm \
column \
comm \
@@ -96,6 +97,7 @@ SUBDIR= alias \
mkdep \
mkfifo \
mkimg \
+ mklocale \
mktemp \
mkulzma \
mkuzip \
Modified: head/usr.bin/colldef/parse.y
==============================================================================
--- head/usr.bin/colldef/parse.y Sat Nov 7 12:33:30 2015
(r290493)
+++ head/usr.bin/colldef/parse.y Fri Nov 20 23:15:05 2015
(r291115)
@@ -47,6 +47,24 @@ int yylex(void);
static void usage(void);
static void collate_print_tables(void);
+#undef STR_LEN
+#define STR_LEN 10
+#undef TABLE_SIZE
+#define TABLE_SIZE 100
+#undef COLLATE_VERSION
+#define COLLATE_VERSION "1.0\n"
+#undef COLLATE_VERSION_2
+#define COLLATE_VERSION1_2 "1.2\n"
+
+struct __collate_st_char_pri {
+ int prim, sec;
+};
+
+struct __collate_st_chain_pri {
+ u_char str[STR_LEN];
+ int prim, sec;
+};
+
char map_name[FILENAME_MAX] = ".";
char curr_chain[STR_LEN];
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
