Submitted by: Sin'ichiro MIYATANI / Phase One, Inc <siu@phaseone.co.jp>

Basic support for the Shift JIS encoding of japanese.
(and one tiny typo fixed in a comment)

4 files changed, 118 insertions, 2 deletions

diff --git a/lib/libc/locale/Makefile.inc b/lib/libc/locale/Makefile.inc
index 57ffdcc59378..03673e76114a 100644
--- a/lib/libc/locale/Makefile.inc
+++ b/lib/libc/locale/Makefile.inc
@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-#	$Id$
+#	$Id: Makefile.inc,v 1.8 1997/05/03 03:50:00 jb Exp $
 
 # locale sources
 .PATH: ${.CURDIR}/../libc/${MACHINE}/locale ${.CURDIR}/../libc/locale
@@ -7,7 +7,7 @@
 SRCS+=	ansi.c ctype.c euc.c frune.c isctype.c lconv.c localeconv.c \
 	mbrune.c none.c rune.c setlocale.c table.c utf2.c setrunelocale.c \
 	runetype.c tolower.c toupper.c nomacros.c collate.c setinvalidrune.c \
-	collcmp.c
+	collcmp.c mskanji.c
 
 # Only build man pages with libc.
 .if ${LIB} == "c"
diff --git a/lib/libc/locale/isctype.c b/lib/libc/locale/isctype.c
index 55cfdf0dfe9a..87489982dfea 100644
--- a/lib/libc/locale/isctype.c
+++ b/lib/libc/locale/isctype.c
@@ -172,3 +172,11 @@ toupper(c)
 {
         return (__toupper(c));
 }
+
+#undef digittoint
+int
+digittoint(c)
+	int c;
+{
+	return (__maskrune((c), 0xFF));
+}
diff --git a/lib/libc/locale/mskanji.c b/lib/libc/locale/mskanji.c
new file mode 100644
index 000000000000..fbdb8ea537cb
--- /dev/null
+++ b/lib/libc/locale/mskanji.c
@@ -0,0 +1,105 @@
+/*
+ *    ja_JP.SJIS locale table for BSD4.4/rune
+ *    version 1.0
+ *    (C) Sin'ichiro MIYATANI / Phase One, Inc
+ *    May 12, 1995
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by Phase One, Inc.
+ * 4. The name of Phase One, Inc. may be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 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.  
+ */  
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)mskanji.c	1.0 (Phase One) 5/5/95";
+#endif /* LIBC_SCCS and not lint */
+
+#include <sys/types.h>
+
+#include <errno.h>
+#include <rune.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+rune_t	_MSKanji_sgetrune __P((const char *, size_t, char const **));
+int	_MSKanji_sputrune __P((rune_t, char *, size_t, char **));
+
+int
+_MSKanji_init(rl)
+	_RuneLocale *rl;
+{
+	rl->sgetrune = _MSKanji_sgetrune;
+	rl->sputrune = _MSKanji_sputrune;
+
+	_CurrentRuneLocale = rl;
+	__mb_cur_max = 2;
+	return (0);
+}
+
+rune_t
+_MSKanji_sgetrune(string, n, result)
+	const char *string;
+	size_t n;
+	char const **result;
+{
+	rune_t rune = 0;
+
+	if (n < 1 ) {
+		rune = _INVALID_RUNE;
+	} else {
+		rune = *( string++ ) & 0xff;
+		if ( ( rune > 0x80 && rune < 0xa0 )
+		|| ( rune >= 0xe0 && rune < 0xfa ) ) {
+			if ( n < 2 ) {
+				rune = (rune_t)_INVALID_RUNE;
+				--string;
+			} else {
+				rune = ( rune << 8 ) | ( *( string++ ) & 0xff );
+			}
+		}
+	}
+	if (result) *result = string;
+	return rune;
+}
+
+int
+_MSKanji_sputrune(c, string, n, result)
+	rune_t c;
+	char *string, **result;
+	size_t n;
+{
+	int	len, i;
+
+	len = ( c > 0x100 ) ? 2 : 1;
+	if ( n < len ) {
+		if ( result ) *result = (char *) 0;
+	} else {
+		if ( result ) *result = string + len;
+		for ( i = len; i-- > 0; ) {
+			*( string++ ) = c >> ( i << 3 );
+		}
+	}
+	return len;
+}
diff --git a/lib/libc/locale/setrunelocale.c b/lib/libc/locale/setrunelocale.c
index d44f8e223f6c..627261ba919f 100644
--- a/lib/libc/locale/setrunelocale.c
+++ b/lib/libc/locale/setrunelocale.c
@@ -49,6 +49,7 @@ extern int		_UTF2_init __P((_RuneLocale *));
 extern int		_EUC_init __P((_RuneLocale *));
 extern int              _xpg4_setrunelocale __P((char *));
 #endif
+extern int		_MSKanji_init __P((_RuneLocale *));
 extern _RuneLocale      *_Read_RuneMagi __P((FILE *));
 
 #ifdef XPG4
@@ -124,6 +125,8 @@ _xpg4_setrunelocale(encoding)
 	} else if (!strcmp(rl->encoding, "EUC")) {
 		return(_EUC_init(rl));
 #endif
+	} else if (!strcmp(rl->encoding, "MSKanji")) {
+		return(_MSKanji_init(rl));
 	} else
 		return(EINVAL);
 }