Add sj4common

CMakeLists.txt

@@ -4,15 +4,22 @@ project(sj4)
 
 option(SJ4_GLOBAL "Use global variables or not" OFF)
 
+file(GLOB_RECURSE SJ4COMMON_SRCS lib/sj4common/**.c)
+add_library(sj4common STATIC ${SJ4COMMON_SRCS})
+target_include_directories(sj4common PUBLIC include/sj4common)
+target_include_directories(sj4common PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+
 file(GLOB_RECURSE SJ4CORE_SRCS lib/sj4core/**.c)
 add_library(sj4core STATIC ${SJ4CORE_SRCS})
 target_include_directories(sj4core PUBLIC include/sj4common include/sj4core)
 target_include_directories(sj4core PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+target_link_libraries(sj4core PUBLIC sj4common)
 
-#file(GLOB_RECURSE SJ4RKCV_SRCS lib/sj4rkcv/**.c)
+file(GLOB_RECURSE SJ4RKCV_SRCS lib/sj4rkcv/**.c)
-#add_library(sj4rkcv STATIC ${SJ4RKCV_SRCS})
+add_library(sj4rkcv STATIC ${SJ4RKCV_SRCS})
-#target_include_directories(sj4rkcv PUBLIC include/sj4common include/sj4rkcv)
+target_include_directories(sj4rkcv PUBLIC include/sj4common include/sj4rkcv)
-#target_include_directories(sj4rkcv PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+target_include_directories(sj4rkcv PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+target_link_libraries(sj4rkcv PUBLIC sj4common)
 
 file(GLOB_RECURSE SJ4MKDIC_SRCS src/sj4mkdic/**.c)
 add_executable(sj4mkdic ${SJ4MKDIC_SRCS})

include/sj4rkcv/rk.h

@@ -38,6 +38,7 @@
 
 #include <sys/types.h>
 #include "wchar16.h"
+#include "sj_string.h"
 
 #define SPACE 0x20
 #define TAB 0x09

include/sj4rkcv/sj4rkcv.h

@@ -118,7 +118,7 @@ int	     sj4_wcs2sjiss16(unsigned char*, wchar16_t*, int);
 int	     sj4_eucs2wcs16(wchar16_t*, unsigned char*, int);
 int	     sj4_sjiss2wcs16(wchar16_t*, unsigned char*, int);
 int	     sj4_mbstowcs16(wchar16_t*, unsigned char*, int);
-int	     sj4_wcstombs16(unsigned char*, unsigned char*, int);
+int	     sj4_wcstombs16(unsigned char*, wchar16_t*, int);
 
 /* XXX */
 extern int current_locale;

lib/sj4common/sj_string.c

@@ -0,0 +1,307 @@
+/*
+ * Copyright (c) 1994  Sony Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL SONY CORPORATION BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of Sony Corporation
+ * shall not be used in advertising or otherwise to promote the sale, use
+ * or other dealings in this Software without prior written authorization
+ * from Sony Corporation.
+ *
+ */
+
+/*
+ * $SonyRCSfile: string.c,v $
+ * $SonyRevision: 1.1 $
+ * $SonyDate: 1994/06/03 08:03:58 $
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <locale.h>
+
+#include "sj_euc.h"
+#include "sj_string.h"
+
+#ifndef TRUE
+#define TRUE (1)
+#define FALSE (0)
+#endif
+
+#define sjis2euc sj4_sjis2euc
+#define euc2sjis sj4_euc2sjis
+
+#define issjis1(c) (((0x81 <= (c)) && ((c) <= 0x9f)) || \
+		    ((0xe0 <= (c)) && ((c) <= 0xfc)))
+#define iseuc(c) ((0xa1 <= (c)) && ((c) <= 0xfe))
+#define iskana(c) ((0xa1 <= (c)) && ((c) <= 0xdf))
+
+int sj4_str_sjistoeuc(unsigned char* out, int outlen, unsigned char* in, unsigned char* sjis_default, int* useflag) {
+	unsigned char *sjis = in, *euc = out;
+	int	       n = 0;
+	unsigned short code, default_code;
+
+	euc[0]	 = '\0';
+	*useflag = 0;
+
+	if(!sjis)
+		return 0;
+
+	while(*sjis && n < outlen) {
+		if(issjis1(*sjis)) {
+			code = sjis2euc((*sjis << 8) | *(sjis + 1));
+			if(n + 2 > outlen)
+				return -1;
+			if(code == 0) {
+				default_code = sjis2euc((sjis_default[0] << 8) | sjis_default[1]);
+				euc[n++]     = default_code >> 8;
+				euc[n++]     = default_code & 0xff;
+				(*useflag)++;
+			} else {
+				euc[n++] = code >> 8;
+				euc[n++] = code & 0xff;
+			}
+			sjis += 2;
+		} else {
+			if(*sjis >= 0xa1 && *sjis <= 0xdf) {
+				if(n + 2 > outlen)
+					return -1;
+				euc[n++] = SS2;
+			}
+			euc[n++] = *sjis;
+			sjis++;
+		}
+	}
+	if(n > outlen)
+		return -1;
+
+	euc[n] = '\0';
+	return n;
+}
+
+int sj4_str_euctosjis(unsigned char* out, int outlen, unsigned char* in, unsigned char* sjis_default, int* useflag) {
+	unsigned char *euc = in, *sjis = out;
+	int	       n = 0;
+	unsigned short code, default_code;
+
+	sjis[0]	 = '\0';
+	*useflag = 0;
+
+	if(!euc)
+		return 0;
+
+	while(*euc && n < outlen) {
+		if(iseuc(*euc)) {
+			code = euc2sjis((*euc << 8) | *(euc + 1));
+			if(n + 2 > outlen)
+				return -1;
+			if(code == 0) {
+				sjis[n++] = sjis_default[0];
+				sjis[n++] = sjis_default[1];
+				(*useflag)++;
+			} else {
+				sjis[n++] = code >> 8;
+				sjis[n++] = code & 0xff;
+			}
+			euc += 2;
+		} else if(*euc == SS3) {
+			if(n + 2 > outlen)
+				return -1;
+			sjis[n++] = sjis_default[0];
+			sjis[n++] = sjis_default[1];
+			euc += 3;
+			(*useflag)++;
+		} else if(*euc == SS2) {
+			sjis[n++] = *(euc + 1);
+			euc += 2;
+		} else {
+			sjis[n++] = *euc;
+			euc++;
+		}
+	}
+	if(n > outlen)
+		return -1;
+
+	sjis[n] = '\0';
+	return n;
+}
+
+int sj4_sjistoeuclen(unsigned char* str, int max) {
+	int len = 0, bytes = 1;
+
+	if(!max)
+		return 0;
+	while((bytes <= max) && *str) {
+		if(issjis1(*str)) {
+			str++;
+			bytes++;
+			if(!*str)
+				break;
+			len += 2;
+		} else if(*str & 0x80) {
+			len += 2;
+		} else {
+			len++;
+		}
+		str++;
+		bytes++;
+	}
+	return len;
+}
+
+#define MASK 0x7f
+#define MSB 0x80
+
+static unsigned char def_char[] = {0x81, 0x40};
+
+int sj4_sjistoeuc(unsigned char* e, int elen, unsigned char* s, int slen) {
+	int dummy;
+
+	return sj4_str_sjistoeuc(e, elen, s, def_char, &dummy);
+}
+
+int sj4_euctosjis(unsigned char* s, int slen, unsigned char* e, int elen) {
+	int dummy;
+
+	return sj4_str_euctosjis(s, slen, e, def_char, &dummy);
+}
+void sj_euc2sjis(unsigned char* s) {
+	s[0] &= MASK;
+	s[1] &= MASK;
+	sj_jis2sjis(s);
+}
+void sj_jis2sjis(unsigned char* s) {
+	int high, low;
+	int nh, nl;
+
+	high = s[0];
+	low  = s[1];
+	nh   = ((high - 0x21) >> 1) + 0x81;
+	if(nh > 0x9f)
+		nh += 0x40;
+	if(high & 1) {
+		nl = low + 0x1f;
+		if(low > 0x5f)
+			nl++;
+	} else
+		nl = low + 0x7e;
+	s[0] = nh;
+	s[1] = nl;
+}
+void sj_sjis2euc(unsigned char* s) {
+	sj_sjis2jis(s);
+	s[0] |= MSB;
+	s[1] |= MSB;
+}
+void sj_sjis2jis(unsigned char* s) {
+	int	       byte1, byte2;
+	unsigned char* sp;
+
+	sp    = s;
+	byte1 = *sp++;
+	byte2 = *sp--;
+
+	if(byte1 <= 0x80 || byte1 >= 0xf0 || (byte1 >= 0xa0 && byte1 <= 0xdf) || byte2 <= 0x3f || byte2 >= 0xfe || byte2 == 0x7f) {
+		byte1 = 0x81;
+		byte2 = 0x40;
+	}
+	byte1 -= (byte1 >= 0xa0) ? 0xc1 : 0x81;
+	if(byte2 >= 0x9f) {
+		*sp++ = (byte1 << 1) + 0x22;
+		*sp   = byte2 - 0x7e;
+	} else {
+		*sp++ = (byte1 << 1) + 0x21;
+		*sp   = byte2 - ((byte2 <= 0x7e) ? 0x1f : 0x20);
+	}
+}
+
+unsigned short
+sj4_jis2sjis(unsigned short code) {
+	unsigned char tmp[3];
+
+	tmp[0] = (code >> 8) & 0xff;
+	tmp[1] = code & 0xff;
+	tmp[2] = '\0';
+
+	sj_jis2sjis((unsigned char*)tmp);
+
+	code = (tmp[0] << 8) + tmp[1];
+
+	return (code);
+}
+
+unsigned short
+sj4_jis2euc(unsigned short code) {
+	unsigned char tmp[3];
+
+	tmp[0] = (code >> 8) & 0xff;
+	tmp[1] = code & 0xff;
+	tmp[2] = '\0';
+
+	code = ((tmp[0] | 0x80) << 8) + (tmp[1] | 0x80);
+
+	return (code);
+}
+
+unsigned short
+sj4_sjis2jis(unsigned short code) {
+	unsigned char tmp[3];
+
+	tmp[0] = (code >> 8) & 0xff;
+	tmp[1] = code & 0xff;
+	tmp[2] = '\0';
+
+	sj_sjis2jis((unsigned char*)tmp);
+
+	code = (tmp[0] << 8) + tmp[1];
+
+	return (code);
+}
+
+unsigned short
+sj4_euc2sjis(unsigned short code) {
+	unsigned char tmp[3];
+
+	tmp[0] = (code >> 8) & 0xff;
+	tmp[1] = code & 0xff;
+	tmp[2] = '\0';
+
+	sj_euc2sjis((unsigned char*)tmp);
+
+	code = (tmp[0] << 8) + tmp[1];
+
+	return (code);
+}
+
+unsigned short
+sj4_sjis2euc(unsigned short code) {
+	unsigned char tmp[3];
+
+	tmp[0] = (code >> 8) & 0xff;
+	tmp[1] = code & 0xff;
+	tmp[2] = '\0';
+
+	sj_sjis2euc((unsigned char*)tmp);
+
+	code = (tmp[0] << 8) + tmp[1];
+
+	return (code);
+}

lib/sj4rkcv/wc16_str.c

@@ -369,7 +369,7 @@ int sj4_mbstowcs16(wchar16_t* ws, unsigned char* mb, int n) {
 		return sj4_sjiss2wcs16(ws, mb, n);
 }
 
-int sj4_wcstombs16(unsigned char* mb, unsigned char* ws, int n) {
+int sj4_wcstombs16(unsigned char* mb, wchar16_t* ws, int n) {
 	if(current_locale == LC_CTYPE_EUC)
 		return sj4_wcs2eucs16(mb, ws, n);
 	else