- Support for multibyte charsets in LIBICONV.

- CD9660_ICONV, NTFS_ICONV and MSDOSFS_ICONV kernel options
(with corresponding modules).
- kiconv(3) for loadable charset conversion tables support.

Submitted by:	Ryuichiro Imura <imura@ryu16.org>

8 files changed, 33 insertions, 3 deletions

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 914b737..fe84da9 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -25,6 +25,7 @@ SUBDIR=	accf_data \
 	bridge \
 	cam \
 	cd9660 \
+	cd9660_iconv \
 	coda \
 	coda5 \
 	${_crypto} \
@@ -85,12 +86,14 @@ SUBDIR=	accf_data \
 	mlx \
 	mpt \
 	msdosfs \
+	msdosfs_iconv \
 	my \
 	nfsclient \
 	nfsserver \
 	nge \
 	nmdm \
 	ntfs \
+	ntfs_iconv \
 	nullfs \
 	patm \
 	pcn \
diff --git a/sys/modules/cd9660/Makefile b/sys/modules/cd9660/Makefile
index 769ac7e..6dffbc9 100644
--- a/sys/modules/cd9660/Makefile
+++ b/sys/modules/cd9660/Makefile
@@ -6,6 +6,6 @@ KMOD=	cd9660
 SRCS=	vnode_if.h \
 	cd9660_bmap.c cd9660_lookup.c cd9660_node.c cd9660_rrip.c \
 	cd9660_util.c cd9660_vfsops.c cd9660_vnops.c
-EXPORT_SYMS=	cd9660_wchar2char
+EXPORT_SYMS=	cd9660_iconv
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/cd9660_iconv/Makefile b/sys/modules/cd9660_iconv/Makefile
new file mode 100644
index 0000000..49104d3
--- /dev/null
+++ b/sys/modules/cd9660_iconv/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../isofs/cd9660
+KMOD=	cd9660_iconv
+SRCS=	cd9660_iconv.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/libiconv/Makefile b/sys/modules/libiconv/Makefile
index ea157a4..6646064 100644
--- a/sys/modules/libiconv/Makefile
+++ b/sys/modules/libiconv/Makefile
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../libkern ${.CURDIR}/../../sys
 
 KMOD=	libiconv
-SRCS=	iconv.c iconv_xlat.c
+SRCS=	iconv.c iconv_xlat.c iconv_xlat16.c
 SRCS+=	iconv.h 
 SRCS+=	iconv_converter_if.c iconv_converter_if.h
 MFILES=	libkern/iconv_converter_if.m
@@ -11,7 +11,11 @@ MFILES=	libkern/iconv_converter_if.m
 EXPORT_SYMS=	iconv_open	\
 		iconv_close	\
 		iconv_conv	\
+		iconv_conv_case	\
+		iconv_convchr	\
+		iconv_convchr_case	\
 		iconv_convstr	\
-		iconv_convmem
+		iconv_convmem	\
+		iconv_vfs_refcount
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/msdosfs/Makefile b/sys/modules/msdosfs/Makefile
index 59b4090..ef8989f 100644
--- a/sys/modules/msdosfs/Makefile
+++ b/sys/modules/msdosfs/Makefile
@@ -6,5 +6,6 @@ KMOD=	msdosfs
 SRCS=	vnode_if.h \
 	msdosfs_conv.c msdosfs_denode.c msdosfs_fat.c msdosfs_lookup.c \
 	msdosfs_vfsops.c msdosfs_vnops.c
+EXPORT_SYMS=	msdosfs_iconv
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/msdosfs_iconv/Makefile b/sys/modules/msdosfs_iconv/Makefile
new file mode 100644
index 0000000..8d2e41d
--- /dev/null
+++ b/sys/modules/msdosfs_iconv/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../fs/msdosfs
+KMOD=	msdosfs_iconv
+SRCS=	msdosfs_iconv.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/ntfs/Makefile b/sys/modules/ntfs/Makefile
index 48837b7..367af98 100644
--- a/sys/modules/ntfs/Makefile
+++ b/sys/modules/ntfs/Makefile
@@ -6,5 +6,6 @@ KMOD=	ntfs
 SRCS=	vnode_if.h \
 	ntfs_vfsops.c ntfs_vnops.c ntfs_subr.c ntfs_ihash.c \
 	ntfs_compr.c
+EXPORT_SYMS=	ntfs_iconv
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ntfs_iconv/Makefile b/sys/modules/ntfs_iconv/Makefile
new file mode 100644
index 0000000..33e6d42
--- /dev/null
+++ b/sys/modules/ntfs_iconv/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../fs/ntfs
+KMOD=	ntfs_iconv
+SRCS=	ntfs_iconv.c
+
+.include <bsd.kmod.mk>