pyrite-dev/sj4
12
2
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix warning and Win32 in general

Browse source
This commit is contained in:
Nishi 2026-06-25 13:50:40 +09:00
commit 5e3b8b3b12
7 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/sj4mkdic/char.c
View file

@ -142,10 +142,16 @@ int codesize(u_char code) {
euc[strlen(euc)] = (c); \
}
#ifdef _WIN32
#define TO sj4_to_sjis
#else
#define TO sj4_to_utf8
#endif
void output_knj(FILE* fp, u_char* p, int l) {
u_char euc[64];
#ifdef UTF8
u_char ucs[64];
u_char to[64];
#endif
euc[0] = 0;
@ -203,9 +209,9 @@ void output_knj(FILE* fp, u_char* p, int l) {
}
#ifdef UTF8
ucs[sj4_to_utf8(ucs, euc, strlen(euc))] = 0;
to[TO(to, euc, strlen(euc))] = 0;
fputs(ucs, fp);
fputs(to, fp);
#else
fputs(euc, fp);
#endif
@ -289,7 +295,7 @@ void output_yomi(FILE* fp, u_char* p) {
char buf[5];
#ifdef UTF8
u_char euc[2];
u_char ucs[64];
u_char to[64];
#endif
while(*p) {
@ -299,9 +305,9 @@ void output_yomi(FILE* fp, u_char* p) {
euc[0] = (i >> 8) & 0xff;
euc[1] = i & 0xff;
ucs[sj4_to_utf8(ucs, euc, 2)] = 0;
to[TO(to, euc, 2)] = 0;
fputs(ucs, fp);
fputs(to, fp);
#else
fputc((i >> 8) & 0xff, fp);
fputc(i & 0xff, fp);

11
src/sj4test/main.c
View file

@ -2,11 +2,16 @@
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <locale.h>
#ifdef _WIN32
#define CHARSET SJ4SJIS
#else
#define CHARSET SJ4UTF8
#endif
int main(int argc, char** argv) {
char c[8 * 1024];
Sj4Lib* ctx = sj4_open(SJ4UTF8, "sj4main.dic");
Sj4Lib* ctx = sj4_open(CHARSET, "sj4main.dic");
char b;
if(ctx == NULL) {
@ -16,8 +21,6 @@ int main(int argc, char** argv) {
c[0] = 0;
setlocale(LC_ALL, "");
while(fread(&b, 1, sizeof(b), stdin)) {
int n, i;
Sj4Kouho kouho;