Functioning sj4lib

src/sj4mkdic/string.c

@@ -177,7 +177,7 @@ int string_cmp(u_char* p1, int l1, u_char* p2, int l2) {
 }
 
 void utf8_print(char* out, int c) {
-	int i = 0, j, k;
+	int i = 0, j = 0, k;
 
 	if(c >= 0x10000) {
 		out[i++] = ((c >> (6 * 3)) & 7) | 0xf0;

src/sj4test/main.c

@@ -2,6 +2,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <locale.h>
 
 int main(int argc, char** argv) {
 	char	c[8 * 1024];
@@ -15,7 +16,9 @@ int main(int argc, char** argv) {
 
 	c[0] = 0;
 
-	while(fread(&b, 1, 1, stdin) == 1) {
+	setlocale(LC_ALL, "");
+
+	while(fread(&b, 1, sizeof(b), stdin)) {
 		int	 n, i;
 		Sj4Kouho kouho;
 
@@ -31,7 +34,7 @@ int main(int argc, char** argv) {
 
 		i = 0;
 		while((strlen(c) - i) > 0 && (n = sj4_getkan(ctx, c + i, strlen(c + i), &kouho))) {
-			printf("> %s\n", kouho.buffer);
+			printf("> %s\n", kouho.buffer.sjis);
 
 			i += n;
 		}