From 04e65f3f5e9c09721ccf78b739f202182e6a4659 Mon Sep 17 00:00:00 2001 From: Nishi Date: Thu, 2 Jul 2026 13:31:52 +0900 Subject: [PATCH] Fix IME --- include/sj4common/Const.h | 1 - include/sj4common/sj4cmd.h | 1 - include/sj4common/sj4err.h | 1 - include/sj4common/sj_const.h | 1 - include/sj4common/sj_euc.h | 1 - include/sj4common/sj_hinsi.h | 1 - include/sj4core/Dict.h | 1 - include/sj4core/Struct.h | 1 - include/sj4core/sj4lowlib.h | 1 - include/sj4core/sj_connect.h | 1 - include/sj4core/sj_const.h | 1 - include/sj4core/sj_dict.h | 1 - include/sj4core/sj_global.h | 1 - include/sj4core/sj_kcnv.h | 1 - include/sj4core/sj_left.h | 1 - include/sj4core/sj_prty.h | 1 - include/sj4core/sj_rename.h | 1 - include/sj4core/sj_right.h | 1 - include/sj4core/sj_struct.h | 1 - include/sj4core/sj_study.h | 1 - include/sj4core/sj_suuji.h | 1 - include/sj4core/sj_table.h | 1 - include/sj4core/sj_typedef.h | 1 - include/sj4core/sj_var.h | 1 - include/sj4core/sj_yomi.h | 1 - include/sj4rkcv/kana.h | 1 - include/sj4rkcv/kctype.h | 1 - include/sj4rkcv/key.h | 1 - include/sj4rkcv/rk.h | 1 - include/sj4rkcv/wchar16.h | 1 - lib/sj4common/sj_string.c | 1 - lib/sj4core/adddic.c | 1 - lib/sj4core/addelcmn.c | 1 - lib/sj4core/alloc.c | 1 - lib/sj4core/charsize.c | 1 - lib/sj4core/chrtbl.c | 1 - lib/sj4core/cl2knj.c | 1 - lib/sj4core/clstudy.c | 1 - lib/sj4core/cmpstr.c | 1 - lib/sj4core/conjunc.c | 1 - lib/sj4core/connect.c | 1 - lib/sj4core/cvtclknj.c | 1 - lib/sj4core/cvtdict.c | 1 - lib/sj4core/cvtkanji.c | 1 - lib/sj4core/deldic.c | 1 - lib/sj4core/dict.c | 1 - lib/sj4core/functbl.c | 1 - lib/sj4core/fuzoku.c | 1 - lib/sj4core/fzkyomi.c | 1 - lib/sj4core/getkanji.c | 1 - lib/sj4core/getrank.c | 1 - lib/sj4core/global.c | 1 - lib/sj4core/hzstrlen.c | 1 - lib/sj4core/init.c | 1 - lib/sj4core/istrcmp.c | 1 - lib/sj4core/memory.c | 1 - lib/sj4core/mk2claus.c | 1 - lib/sj4core/mkbunset.c | 1 - lib/sj4core/mkjiritu.c | 1 - lib/sj4core/mkkouho.c | 1 - lib/sj4core/mknumber.c | 1 - lib/sj4core/mvmemd.c | 1 - lib/sj4core/mvmemi.c | 1 - lib/sj4core/peepdic.c | 1 - lib/sj4core/ph2knj.c | 1 - lib/sj4core/ph_khtbl.c | 1 - lib/sj4core/priority.c | 1 - lib/sj4core/prtytbl.c | 1 - lib/sj4core/s2ctbl.c | 1 - lib/sj4core/sdepend.c | 1 - lib/sj4core/selclrec.c | 1 - lib/sj4core/selsuuji.c | 1 - lib/sj4core/setconj.c | 1 - lib/sj4core/setjrec.c | 1 - lib/sj4core/setkouho.c | 1 - lib/sj4core/setubi.c | 1 - lib/sj4core/sj2code.c | 1 - lib/sj4core/skiphblk.c | 1 - lib/sj4core/skipkstr.c | 1 - lib/sj4core/srchdict.c | 1 - lib/sj4core/srchhead.c | 1 - lib/sj4core/srchidx.c | 1 - lib/sj4core/srchnum.c | 1 - lib/sj4core/sstrcmp.c | 1 - lib/sj4core/sstrlen.c | 1 - lib/sj4core/sstrncmp.c | 1 - lib/sj4core/stbtbl.c | 1 - lib/sj4core/stttbl.c | 1 - lib/sj4core/study.c | 1 - lib/sj4core/suujitbl.c | 1 - lib/sj4core/terminat.c | 1 - lib/sj4core/termtbl.c | 1 - lib/sj4core/wakachi.c | 1 - lib/sj4ime/ime.c | 12 ++++++++---- lib/sj4rkcv/rk_conv.c | 1 - lib/sj4rkcv/sj4_rkcv.c | 1 - lib/sj4rkcv/wc16_str.c | 1 - src/sj4mkdic/char.c | 1 - src/sj4mkdic/cnvhinsi.c | 1 - src/sj4mkdic/file.c | 1 - src/sj4mkdic/global.c | 1 - src/sj4mkdic/hindo.c | 1 - src/sj4mkdic/knjcvt.c | 1 - src/sj4mkdic/makedict.c | 1 - src/sj4mkdic/makelist.c | 1 - src/sj4mkdic/makeseg.c | 1 - src/sj4mkdic/memory.c | 1 - src/sj4mkdic/offset.c | 1 - src/sj4mkdic/readline.c | 1 - src/sj4mkdic/sj4_dict_const.h | 1 - src/sj4mkdic/sj4_dict_struct.h | 1 - src/sj4mkdic/string.c | 1 - 112 files changed, 8 insertions(+), 115 deletions(-) diff --git a/include/sj4common/Const.h b/include/sj4common/Const.h index cd47569..6718a3c 100644 --- a/include/sj4common/Const.h +++ b/include/sj4common/Const.h @@ -27,7 +27,6 @@ * */ - #ifndef CONST_H #define CONST_H diff --git a/include/sj4common/sj4cmd.h b/include/sj4common/sj4cmd.h index 9ed741b..abc69d9 100644 --- a/include/sj4common/sj4cmd.h +++ b/include/sj4common/sj4cmd.h @@ -27,7 +27,6 @@ * */ - #define SJ4SERV_VERSION_NO 2 #define SJ4_CONNECT 1 diff --git a/include/sj4common/sj4err.h b/include/sj4common/sj4err.h index b06286c..8cbce90 100644 --- a/include/sj4common/sj4err.h +++ b/include/sj4common/sj4err.h @@ -27,7 +27,6 @@ * */ - #define SJ4_InternalError -1 #define SJ4_NormalEnd 0 diff --git a/include/sj4common/sj_const.h b/include/sj4common/sj_const.h index 912d1e4..d57d100 100644 --- a/include/sj4common/sj_const.h +++ b/include/sj4common/sj_const.h @@ -27,7 +27,6 @@ * */ - #ifndef _SJ_CONST #define _SJ_CONST diff --git a/include/sj4common/sj_euc.h b/include/sj4common/sj_euc.h index c61593d..82d1d5b 100644 --- a/include/sj4common/sj_euc.h +++ b/include/sj4common/sj_euc.h @@ -27,7 +27,6 @@ * */ - #ifndef _SJ_EUC #define _SJ_EUC diff --git a/include/sj4common/sj_hinsi.h b/include/sj4common/sj_hinsi.h index a2e1130..0aed3b6 100644 --- a/include/sj4common/sj_hinsi.h +++ b/include/sj4common/sj_hinsi.h @@ -27,7 +27,6 @@ * */ - #ifndef _SJ_HINSHI #define _SJ_HINSHI diff --git a/include/sj4core/Dict.h b/include/sj4core/Dict.h index 84eec89..34c9fad 100644 --- a/include/sj4core/Dict.h +++ b/include/sj4core/Dict.h @@ -27,7 +27,6 @@ * */ - #define VERSIONPOS 0 #define PASSWDPOS 16 diff --git a/include/sj4core/Struct.h b/include/sj4core/Struct.h index 81299ce..12958df 100644 --- a/include/sj4core/Struct.h +++ b/include/sj4core/Struct.h @@ -27,7 +27,6 @@ * */ - #ifndef STRUCT_H #define STRUCT_H diff --git a/include/sj4core/sj4lowlib.h b/include/sj4core/sj4lowlib.h index a493f12..ae86074 100644 --- a/include/sj4core/sj4lowlib.h +++ b/include/sj4core/sj4lowlib.h @@ -27,7 +27,6 @@ * */ - #ifndef SJ4LOWLIB_H #define SJ4LOWLIB_H diff --git a/include/sj4core/sj_connect.h b/include/sj4core/sj_connect.h index 139f3ee..910aeb0 100644 --- a/include/sj4core/sj_connect.h +++ b/include/sj4core/sj_connect.h @@ -27,7 +27,6 @@ * */ - #ifndef _SJ_CONNECT #define _SJ_CONNECT diff --git a/include/sj4core/sj_const.h b/include/sj4core/sj_const.h index 912d1e4..d57d100 100644 --- a/include/sj4core/sj_const.h +++ b/include/sj4core/sj_const.h @@ -27,7 +27,6 @@ * */ - #ifndef _SJ_CONST #define _SJ_CONST diff --git a/include/sj4core/sj_dict.h b/include/sj4core/sj_dict.h index 7370f03..9bf8b03 100644 --- a/include/sj4core/sj_dict.h +++ b/include/sj4core/sj_dict.h @@ -27,7 +27,6 @@ * */ - #ifndef _SJ_DICT #define _SJ_DICT diff --git a/include/sj4core/sj_global.h b/include/sj4core/sj_global.h index 962987c..3e99779 100644 --- a/include/sj4core/sj_global.h +++ b/include/sj4core/sj_global.h @@ -27,7 +27,6 @@ * */ - #ifndef SJ_GLOBAL_H #define SJ_GLOBAL_H diff --git a/include/sj4core/sj_kcnv.h b/include/sj4core/sj_kcnv.h index d4a539b..f3716ca 100644 --- a/include/sj4core/sj_kcnv.h +++ b/include/sj4core/sj_kcnv.h @@ -27,7 +27,6 @@ * */ - #include #include "sj_typedef.h" #include "sj_rename.h" diff --git a/include/sj4core/sj_left.h b/include/sj4core/sj_left.h index 0a2c6cb..96b2966 100644 --- a/include/sj4core/sj_left.h +++ b/include/sj4core/sj_left.h @@ -27,7 +27,6 @@ * */ - #ifndef _SJ_LEFT #define _SJ_LEFT diff --git a/include/sj4core/sj_prty.h b/include/sj4core/sj_prty.h index 757fed1..2b19f08 100644 --- a/include/sj4core/sj_prty.h +++ b/include/sj4core/sj_prty.h @@ -27,7 +27,6 @@ * */ - #ifndef _SJ_PRIORITY #define _SJ_PRIORITY diff --git a/include/sj4core/sj_rename.h b/include/sj4core/sj_rename.h index 0ecc09b..7694b5f 100644 --- a/include/sj4core/sj_rename.h +++ b/include/sj4core/sj_rename.h @@ -27,7 +27,6 @@ * */ - #ifndef _SJ_RENAME #define _SJ_RENAME diff --git a/include/sj4core/sj_right.h b/include/sj4core/sj_right.h index 8030d01..b89e6ff 100644 --- a/include/sj4core/sj_right.h +++ b/include/sj4core/sj_right.h @@ -27,7 +27,6 @@ * */ - #ifndef _SJ_RIGHT #define _SJ_RIGHT diff --git a/include/sj4core/sj_struct.h b/include/sj4core/sj_struct.h index e1fe036..d2176ee 100644 --- a/include/sj4core/sj_struct.h +++ b/include/sj4core/sj_struct.h @@ -27,7 +27,6 @@ * */ - #ifndef _SJ_STRUCT #define _SJ_STRUCT diff --git a/include/sj4core/sj_study.h b/include/sj4core/sj_study.h index fc37bed..d321474 100644 --- a/include/sj4core/sj_study.h +++ b/include/sj4core/sj_study.h @@ -27,7 +27,6 @@ * */ - #ifndef _SJ_STUDY #define _SJ_STUDY diff --git a/include/sj4core/sj_suuji.h b/include/sj4core/sj_suuji.h index 3aabc31..b927814 100644 --- a/include/sj4core/sj_suuji.h +++ b/include/sj4core/sj_suuji.h @@ -27,7 +27,6 @@ * */ - #ifndef _SJ_SUUJI #define _SJ_SUUJI diff --git a/include/sj4core/sj_table.h b/include/sj4core/sj_table.h index 345493c..ece52d1 100644 --- a/include/sj4core/sj_table.h +++ b/include/sj4core/sj_table.h @@ -27,7 +27,6 @@ * */ - #ifndef _SJ_TABLE #define _SJ_TABLE diff --git a/include/sj4core/sj_typedef.h b/include/sj4core/sj_typedef.h index 60372d9..dac2428 100644 --- a/include/sj4core/sj_typedef.h +++ b/include/sj4core/sj_typedef.h @@ -27,7 +27,6 @@ * */ - #ifndef _SJ_TYPEDEF #define _SJ_TYPEDEF diff --git a/include/sj4core/sj_var.h b/include/sj4core/sj_var.h index 08851f5..381d444 100644 --- a/include/sj4core/sj_var.h +++ b/include/sj4core/sj_var.h @@ -27,7 +27,6 @@ * */ - #ifndef _SJ_VAR #define _SJ_VAR diff --git a/include/sj4core/sj_yomi.h b/include/sj4core/sj_yomi.h index 850a2c1..04d8845 100644 --- a/include/sj4core/sj_yomi.h +++ b/include/sj4core/sj_yomi.h @@ -27,7 +27,6 @@ * */ - #ifndef _SJ_YOMICODE #define _SJ_YOMICODE diff --git a/include/sj4rkcv/kana.h b/include/sj4rkcv/kana.h index ed50787..97939b1 100644 --- a/include/sj4rkcv/kana.h +++ b/include/sj4rkcv/kana.h @@ -27,7 +27,6 @@ * */ - #define ZKATA1 0xa5 #define ZHIRA1 0xa4 #define ZKATAF2 0xa1 diff --git a/include/sj4rkcv/kctype.h b/include/sj4rkcv/kctype.h index 12f2f89..587a4f0 100644 --- a/include/sj4rkcv/kctype.h +++ b/include/sj4rkcv/kctype.h @@ -27,7 +27,6 @@ * */ - #if !defined(__sony_news) || (defined(__sony_news) && !defined(SVR4)) #ifndef __KCTYPE #define __KCTYPE diff --git a/include/sj4rkcv/key.h b/include/sj4rkcv/key.h index 159dad1..1812804 100644 --- a/include/sj4rkcv/key.h +++ b/include/sj4rkcv/key.h @@ -27,7 +27,6 @@ * */ - #define KEY_NORMAL 0 #define KEY_CONV 1 #define KEY_HENKAN 2 diff --git a/include/sj4rkcv/rk.h b/include/sj4rkcv/rk.h index d1e4453..80663a1 100644 --- a/include/sj4rkcv/rk.h +++ b/include/sj4rkcv/rk.h @@ -27,7 +27,6 @@ * */ - #ifndef RK_H #define RK_H diff --git a/include/sj4rkcv/wchar16.h b/include/sj4rkcv/wchar16.h index 03455d4..a91ff98 100644 --- a/include/sj4rkcv/wchar16.h +++ b/include/sj4rkcv/wchar16.h @@ -27,7 +27,6 @@ * */ - #ifndef _WCHARH #define _WCHARH diff --git a/lib/sj4common/sj_string.c b/lib/sj4common/sj_string.c index 344bbce..14dd44c 100644 --- a/lib/sj4common/sj_string.c +++ b/lib/sj4common/sj_string.c @@ -27,7 +27,6 @@ * */ - #include #include #include diff --git a/lib/sj4core/adddic.c b/lib/sj4core/adddic.c index fea9c9c..e883a47 100644 --- a/lib/sj4core/adddic.c +++ b/lib/sj4core/adddic.c @@ -27,7 +27,6 @@ * */ - #include #include diff --git a/lib/sj4core/addelcmn.c b/lib/sj4core/addelcmn.c index 5ab836e..6b16422 100644 --- a/lib/sj4core/addelcmn.c +++ b/lib/sj4core/addelcmn.c @@ -27,7 +27,6 @@ * */ - #include "sj_euc.h" #include "sj_kcnv.h" #include "sj_hinsi.h" diff --git a/lib/sj4core/alloc.c b/lib/sj4core/alloc.c index 68c9fba..9af1f56 100644 --- a/lib/sj4core/alloc.c +++ b/lib/sj4core/alloc.c @@ -27,7 +27,6 @@ * */ - #include #include #include "sj_rename.h" diff --git a/lib/sj4core/charsize.c b/lib/sj4core/charsize.c index f34c5af..07d8d06 100644 --- a/lib/sj4core/charsize.c +++ b/lib/sj4core/charsize.c @@ -27,7 +27,6 @@ * */ - #include "sj_euc.h" #include "sj_rename.h" #include "sj_typedef.h" diff --git a/lib/sj4core/chrtbl.c b/lib/sj4core/chrtbl.c index 0f0c0ca..e3abb0e 100644 --- a/lib/sj4core/chrtbl.c +++ b/lib/sj4core/chrtbl.c @@ -27,7 +27,6 @@ * */ - #include "sj_const.h" #include "sj_rename.h" #include "sj_typedef.h" diff --git a/lib/sj4core/cl2knj.c b/lib/sj4core/cl2knj.c index f903e61..4710e52 100644 --- a/lib/sj4core/cl2knj.c +++ b/lib/sj4core/cl2knj.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "sj_kanakan.h" diff --git a/lib/sj4core/clstudy.c b/lib/sj4core/clstudy.c index 322133b..9a69357 100644 --- a/lib/sj4core/clstudy.c +++ b/lib/sj4core/clstudy.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "sj_kanakan.h" diff --git a/lib/sj4core/cmpstr.c b/lib/sj4core/cmpstr.c index d0686d3..8264bfe 100644 --- a/lib/sj4core/cmpstr.c +++ b/lib/sj4core/cmpstr.c @@ -27,7 +27,6 @@ * */ - #include "sj_rename.h" #include "sj_const.h" #include "sj_typedef.h" diff --git a/lib/sj4core/conjunc.c b/lib/sj4core/conjunc.c index 6c063cf..7c29603 100644 --- a/lib/sj4core/conjunc.c +++ b/lib/sj4core/conjunc.c @@ -27,7 +27,6 @@ * */ - #include "sj_rename.h" #include "sj_typedef.h" #include "sj_yomi.h" diff --git a/lib/sj4core/connect.c b/lib/sj4core/connect.c index 9e6ee7c..e74447f 100644 --- a/lib/sj4core/connect.c +++ b/lib/sj4core/connect.c @@ -27,7 +27,6 @@ * */ - #include "sj_rename.h" #include "sj_typedef.h" #include "sj_connect.h" diff --git a/lib/sj4core/cvtclknj.c b/lib/sj4core/cvtclknj.c index 01848d2..7f63686 100644 --- a/lib/sj4core/cvtclknj.c +++ b/lib/sj4core/cvtclknj.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "sj_kanakan.h" diff --git a/lib/sj4core/cvtdict.c b/lib/sj4core/cvtdict.c index 31253ea..867b7ab 100644 --- a/lib/sj4core/cvtdict.c +++ b/lib/sj4core/cvtdict.c @@ -27,7 +27,6 @@ * */ - #include "sj_euc.h" #include "sj_kcnv.h" diff --git a/lib/sj4core/cvtkanji.c b/lib/sj4core/cvtkanji.c index 7e128a4..0755286 100644 --- a/lib/sj4core/cvtkanji.c +++ b/lib/sj4core/cvtkanji.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "sj_kanakan.h" diff --git a/lib/sj4core/deldic.c b/lib/sj4core/deldic.c index eab17ca..b71ef70 100644 --- a/lib/sj4core/deldic.c +++ b/lib/sj4core/deldic.c @@ -27,7 +27,6 @@ * */ - #include #include "sj_kcnv.h" diff --git a/lib/sj4core/dict.c b/lib/sj4core/dict.c index c1eaa2c..f727333 100644 --- a/lib/sj4core/dict.c +++ b/lib/sj4core/dict.c @@ -27,7 +27,6 @@ * */ - #include "sj_euc.h" #include "sj_kcnv.h" diff --git a/lib/sj4core/functbl.c b/lib/sj4core/functbl.c index bdf0cf4..f588281 100644 --- a/lib/sj4core/functbl.c +++ b/lib/sj4core/functbl.c @@ -27,7 +27,6 @@ * */ - #include "sj_rename.h" #include "sj_typedef.h" diff --git a/lib/sj4core/fuzoku.c b/lib/sj4core/fuzoku.c index 07e1121..aca755f 100644 --- a/lib/sj4core/fuzoku.c +++ b/lib/sj4core/fuzoku.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "sj_hinsi.h" #include "sj_right.h" diff --git a/lib/sj4core/fzkyomi.c b/lib/sj4core/fzkyomi.c index 2700ea8..e980c6f 100644 --- a/lib/sj4core/fzkyomi.c +++ b/lib/sj4core/fzkyomi.c @@ -27,7 +27,6 @@ * */ - #include "sj_const.h" #include "sj_rename.h" #include "sj_typedef.h" diff --git a/lib/sj4core/getkanji.c b/lib/sj4core/getkanji.c index d026eae..acbe6cd 100644 --- a/lib/sj4core/getkanji.c +++ b/lib/sj4core/getkanji.c @@ -27,7 +27,6 @@ * */ - #include "sj_euc.h" #include "sj_kcnv.h" diff --git a/lib/sj4core/getrank.c b/lib/sj4core/getrank.c index 6b3455c..0f4cc3d 100644 --- a/lib/sj4core/getrank.c +++ b/lib/sj4core/getrank.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "sj_kanakan.h" diff --git a/lib/sj4core/global.c b/lib/sj4core/global.c index 50d39a3..928b250 100644 --- a/lib/sj4core/global.c +++ b/lib/sj4core/global.c @@ -27,7 +27,6 @@ * */ - #include #include #include "sj_rename.h" diff --git a/lib/sj4core/hzstrlen.c b/lib/sj4core/hzstrlen.c index 6d20a7d..8a2289b 100644 --- a/lib/sj4core/hzstrlen.c +++ b/lib/sj4core/hzstrlen.c @@ -27,7 +27,6 @@ * */ - #include "sj_euc.h" #include "sj_rename.h" #include "sj_typedef.h" diff --git a/lib/sj4core/init.c b/lib/sj4core/init.c index e1af22e..93cdb11 100644 --- a/lib/sj4core/init.c +++ b/lib/sj4core/init.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "sj_kanakan.h" diff --git a/lib/sj4core/istrcmp.c b/lib/sj4core/istrcmp.c index 3d2d7fb..2429f1a 100644 --- a/lib/sj4core/istrcmp.c +++ b/lib/sj4core/istrcmp.c @@ -27,7 +27,6 @@ * */ - #include "sj_rename.h" #include "sj_typedef.h" #include "sj_const.h" diff --git a/lib/sj4core/memory.c b/lib/sj4core/memory.c index 96416b9..b312bc9 100644 --- a/lib/sj4core/memory.c +++ b/lib/sj4core/memory.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "sj_kanakan.h" diff --git a/lib/sj4core/mk2claus.c b/lib/sj4core/mk2claus.c index cc69841..6e3cf9d 100644 --- a/lib/sj4core/mk2claus.c +++ b/lib/sj4core/mk2claus.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "sj_right.h" diff --git a/lib/sj4core/mkbunset.c b/lib/sj4core/mkbunset.c index f10286c..c86daa7 100644 --- a/lib/sj4core/mkbunset.c +++ b/lib/sj4core/mkbunset.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "sj_hinsi.h" diff --git a/lib/sj4core/mkjiritu.c b/lib/sj4core/mkjiritu.c index 1fd2eaa..8bc3639 100644 --- a/lib/sj4core/mkjiritu.c +++ b/lib/sj4core/mkjiritu.c @@ -27,7 +27,6 @@ * */ - #include #include "sj_kcnv.h" diff --git a/lib/sj4core/mkkouho.c b/lib/sj4core/mkkouho.c index c0b803a..4820edc 100644 --- a/lib/sj4core/mkkouho.c +++ b/lib/sj4core/mkkouho.c @@ -27,7 +27,6 @@ * */ - #include "sj_euc.h" #include "sj_kcnv.h" #include "sj_hinsi.h" diff --git a/lib/sj4core/mknumber.c b/lib/sj4core/mknumber.c index e77eac4..68ef67a 100644 --- a/lib/sj4core/mknumber.c +++ b/lib/sj4core/mknumber.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "sj_yomi.h" #include "sj_suuji.h" diff --git a/lib/sj4core/mvmemd.c b/lib/sj4core/mvmemd.c index 28e53d7..172196e 100644 --- a/lib/sj4core/mvmemd.c +++ b/lib/sj4core/mvmemd.c @@ -27,7 +27,6 @@ * */ - #include "sj_rename.h" #include "sj_typedef.h" diff --git a/lib/sj4core/mvmemi.c b/lib/sj4core/mvmemi.c index 18de47c..f6a6205 100644 --- a/lib/sj4core/mvmemi.c +++ b/lib/sj4core/mvmemi.c @@ -27,7 +27,6 @@ * */ - #include "sj_rename.h" #include "sj_typedef.h" diff --git a/lib/sj4core/peepdic.c b/lib/sj4core/peepdic.c index 915f64d..bdd6d84 100644 --- a/lib/sj4core/peepdic.c +++ b/lib/sj4core/peepdic.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "sj_yomi.h" diff --git a/lib/sj4core/ph2knj.c b/lib/sj4core/ph2knj.c index 112f49e..b738165 100644 --- a/lib/sj4core/ph2knj.c +++ b/lib/sj4core/ph2knj.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "sj_yomi.h" diff --git a/lib/sj4core/ph_khtbl.c b/lib/sj4core/ph_khtbl.c index da9b52f..0986c87 100644 --- a/lib/sj4core/ph_khtbl.c +++ b/lib/sj4core/ph_khtbl.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "sj_kanakan.h" diff --git a/lib/sj4core/priority.c b/lib/sj4core/priority.c index 5414396..b55fe4d 100644 --- a/lib/sj4core/priority.c +++ b/lib/sj4core/priority.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "sj_hinsi.h" #include "sj_right.h" diff --git a/lib/sj4core/prtytbl.c b/lib/sj4core/prtytbl.c index 1e3b262..b750312 100644 --- a/lib/sj4core/prtytbl.c +++ b/lib/sj4core/prtytbl.c @@ -27,7 +27,6 @@ * */ - #include "sj_rename.h" #include "sj_typedef.h" diff --git a/lib/sj4core/s2ctbl.c b/lib/sj4core/s2ctbl.c index 4970726..c057917 100644 --- a/lib/sj4core/s2ctbl.c +++ b/lib/sj4core/s2ctbl.c @@ -27,7 +27,6 @@ * */ - #include "sj_rename.h" #include "sj_typedef.h" #include "sj_yomi.h" diff --git a/lib/sj4core/sdepend.c b/lib/sj4core/sdepend.c index 7b435c8..4c99f11 100644 --- a/lib/sj4core/sdepend.c +++ b/lib/sj4core/sdepend.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "Dict.h" #include "sj4err.h" diff --git a/lib/sj4core/selclrec.c b/lib/sj4core/selclrec.c index 816303b..ecbb2a5 100644 --- a/lib/sj4core/selclrec.c +++ b/lib/sj4core/selclrec.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "sj_kanakan.h" diff --git a/lib/sj4core/selsuuji.c b/lib/sj4core/selsuuji.c index 1fdc1c9..ae6f0a8 100644 --- a/lib/sj4core/selsuuji.c +++ b/lib/sj4core/selsuuji.c @@ -27,7 +27,6 @@ * */ - #include "sj_rename.h" #include "sj_typedef.h" #include "sj_const.h" diff --git a/lib/sj4core/setconj.c b/lib/sj4core/setconj.c index a3f3e02..b4ec00a 100644 --- a/lib/sj4core/setconj.c +++ b/lib/sj4core/setconj.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "sj_right.h" #include "sj_hinsi.h" diff --git a/lib/sj4core/setjrec.c b/lib/sj4core/setjrec.c index edc1cb0..7efd144 100644 --- a/lib/sj4core/setjrec.c +++ b/lib/sj4core/setjrec.c @@ -27,7 +27,6 @@ * */ - #include "sj_euc.h" #include "sj_kcnv.h" #include "sj_hinsi.h" diff --git a/lib/sj4core/setkouho.c b/lib/sj4core/setkouho.c index 0327b04..4fff339 100644 --- a/lib/sj4core/setkouho.c +++ b/lib/sj4core/setkouho.c @@ -27,7 +27,6 @@ * */ - #include "sj_euc.h" #include "sj_kcnv.h" #include "sj_hinsi.h" diff --git a/lib/sj4core/setubi.c b/lib/sj4core/setubi.c index f088dbc..fc11eab 100644 --- a/lib/sj4core/setubi.c +++ b/lib/sj4core/setubi.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "sj_hinsi.h" diff --git a/lib/sj4core/sj2code.c b/lib/sj4core/sj2code.c index c2aeb4f..d25c1af 100644 --- a/lib/sj4core/sj2code.c +++ b/lib/sj4core/sj2code.c @@ -27,7 +27,6 @@ * */ - #include "sj_euc.h" #include "sj_kcnv.h" #include "sj_yomi.h" diff --git a/lib/sj4core/skiphblk.c b/lib/sj4core/skiphblk.c index b2a1058..fecc87d 100644 --- a/lib/sj4core/skiphblk.c +++ b/lib/sj4core/skiphblk.c @@ -27,7 +27,6 @@ * */ - #include "sj_rename.h" #include "sj_typedef.h" #include "sj_dict.h" diff --git a/lib/sj4core/skipkstr.c b/lib/sj4core/skipkstr.c index 2bf4a9e..0fd8468 100644 --- a/lib/sj4core/skipkstr.c +++ b/lib/sj4core/skipkstr.c @@ -27,7 +27,6 @@ * */ - #include "sj_euc.h" #include "sj_rename.h" #include "sj_typedef.h" diff --git a/lib/sj4core/srchdict.c b/lib/sj4core/srchdict.c index 33bc161..db3c8fa 100644 --- a/lib/sj4core/srchdict.c +++ b/lib/sj4core/srchdict.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "sj_kanakan.h" diff --git a/lib/sj4core/srchhead.c b/lib/sj4core/srchhead.c index 4c0ae3d..3c0867f 100644 --- a/lib/sj4core/srchhead.c +++ b/lib/sj4core/srchhead.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "sj_yomi.h" diff --git a/lib/sj4core/srchidx.c b/lib/sj4core/srchidx.c index 9bcc845..3e79c13 100644 --- a/lib/sj4core/srchidx.c +++ b/lib/sj4core/srchidx.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "sj_kanakan.h" diff --git a/lib/sj4core/srchnum.c b/lib/sj4core/srchnum.c index ccc72de..8260769 100644 --- a/lib/sj4core/srchnum.c +++ b/lib/sj4core/srchnum.c @@ -27,7 +27,6 @@ * */ - #include #include "sj_kcnv.h" #include "sj_yomi.h" diff --git a/lib/sj4core/sstrcmp.c b/lib/sj4core/sstrcmp.c index 11c17fe..1e96b4a 100644 --- a/lib/sj4core/sstrcmp.c +++ b/lib/sj4core/sstrcmp.c @@ -27,7 +27,6 @@ * */ - #include "sj_rename.h" #include "sj_typedef.h" diff --git a/lib/sj4core/sstrlen.c b/lib/sj4core/sstrlen.c index ff05701..5cc3d55 100644 --- a/lib/sj4core/sstrlen.c +++ b/lib/sj4core/sstrlen.c @@ -27,7 +27,6 @@ * */ - #include "sj_rename.h" #include "sj_typedef.h" diff --git a/lib/sj4core/sstrncmp.c b/lib/sj4core/sstrncmp.c index 5982350..ae2aa77 100644 --- a/lib/sj4core/sstrncmp.c +++ b/lib/sj4core/sstrncmp.c @@ -27,7 +27,6 @@ * */ - #include "sj_rename.h" #include "sj_typedef.h" #include "sj_const.h" diff --git a/lib/sj4core/stbtbl.c b/lib/sj4core/stbtbl.c index c694727..a110c59 100644 --- a/lib/sj4core/stbtbl.c +++ b/lib/sj4core/stbtbl.c @@ -27,7 +27,6 @@ * */ - #include "sj_rename.h" #include "sj_typedef.h" #include "sj_yomi.h" diff --git a/lib/sj4core/stttbl.c b/lib/sj4core/stttbl.c index 3406d58..0009d1a 100644 --- a/lib/sj4core/stttbl.c +++ b/lib/sj4core/stttbl.c @@ -27,7 +27,6 @@ * */ - #include "sj_rename.h" #include "sj_typedef.h" diff --git a/lib/sj4core/study.c b/lib/sj4core/study.c index 8f95d86..6347b17 100644 --- a/lib/sj4core/study.c +++ b/lib/sj4core/study.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "sj_kanakan.h" diff --git a/lib/sj4core/suujitbl.c b/lib/sj4core/suujitbl.c index 13a1972..af434ae 100644 --- a/lib/sj4core/suujitbl.c +++ b/lib/sj4core/suujitbl.c @@ -27,7 +27,6 @@ * */ - #include "sj_const.h" #include "sj_rename.h" #include "sj_typedef.h" diff --git a/lib/sj4core/terminat.c b/lib/sj4core/terminat.c index d2f130c..e6d07c9 100644 --- a/lib/sj4core/terminat.c +++ b/lib/sj4core/terminat.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "sj_right.h" diff --git a/lib/sj4core/termtbl.c b/lib/sj4core/termtbl.c index 0333c06..88695e1 100644 --- a/lib/sj4core/termtbl.c +++ b/lib/sj4core/termtbl.c @@ -27,7 +27,6 @@ * */ - #include "sj_rename.h" #include "sj_typedef.h" #include "sj_const.h" diff --git a/lib/sj4core/wakachi.c b/lib/sj4core/wakachi.c index 42ae298..4449033 100644 --- a/lib/sj4core/wakachi.c +++ b/lib/sj4core/wakachi.c @@ -27,7 +27,6 @@ * */ - #include "sj_kcnv.h" #include "sj_right.h" #include "sj_hinsi.h" diff --git a/lib/sj4ime/ime.c b/lib/sj4ime/ime.c index 1d91161..066b5f8 100644 --- a/lib/sj4ime/ime.c +++ b/lib/sj4ime/ime.c @@ -16,7 +16,7 @@ struct sj4ime { Sj4Kouho kouho; unsigned int last; - u_char romabuf[SJ4BUFSZ]; + u_char romabuf[7]; u_char kanabuf[SJ4BUFSZ]; u_char convbuf[SJ4BUFSZ]; }; @@ -139,7 +139,7 @@ void sj4_ime_key(Sj4Ime* ime, int key) { key = toupper(key); - if(ime->romabuf[strlen(ime->romabuf) - 1] == 'N' && !(key == 'A' || key == 'I' || key == 'U' || key == 'E' || key == 'O' || key == 'N')) { + if(ime->romabuf[strlen(ime->romabuf) - 1] == 'N' && !(key == 'A' || key == 'I' || key == 'U' || key == 'E' || key == 'O' || key == 'Y' || key == 'N')) { ime->romabuf[strlen(ime->romabuf) + 1] = 0; ime->romabuf[strlen(ime->romabuf)] = 'N'; } @@ -158,9 +158,9 @@ void sj4_ime_key(Sj4Ime* ime, int key) { n = strlen(kanatbl[i].roma) - strlen(kanatbl[i].roma2); - memmove(ime->romabuf - (n < 0 ? n : 0), ime->romabuf + (n > 0 ? n : 0), SJ4BUFSZ - n); + memmove(ime->romabuf - (n < 0 ? n : 0), ime->romabuf + (n > 0 ? n : 0), sizeof(ime->romabuf) - n); if(n > 0) { - for(j = SJ4BUFSZ - n; j < SJ4BUFSZ; j++) ime->romabuf[j] = 0; + for(j = sizeof(ime->romabuf) - n; j < sizeof(ime->romabuf); j++) ime->romabuf[j] = 0; } else { for(j = 0; j < -n; j++) ime->romabuf[j] = 0; } @@ -172,6 +172,10 @@ void sj4_ime_key(Sj4Ime* ime, int key) { goto reduce; } } + + if(strlen(ime->romabuf) >= 4) { + ime->romabuf[0] = 0; + } } } diff --git a/lib/sj4rkcv/rk_conv.c b/lib/sj4rkcv/rk_conv.c index 868c191..d565261 100644 --- a/lib/sj4rkcv/rk_conv.c +++ b/lib/sj4rkcv/rk_conv.c @@ -27,7 +27,6 @@ * */ - #ifndef lint static char rcsid[] = "$Header: /export/work/contrib/sj4/sj4rkcv/RCS/rk_conv.c,v 1.14 1994/06/03 07:42:16 notanaka Exp $"; #endif diff --git a/lib/sj4rkcv/sj4_rkcv.c b/lib/sj4rkcv/sj4_rkcv.c index 69a51a5..27c133a 100644 --- a/lib/sj4rkcv/sj4_rkcv.c +++ b/lib/sj4rkcv/sj4_rkcv.c @@ -27,7 +27,6 @@ * */ - #include #include diff --git a/lib/sj4rkcv/wc16_str.c b/lib/sj4rkcv/wc16_str.c index 8f8520f..7e62d74 100644 --- a/lib/sj4rkcv/wc16_str.c +++ b/lib/sj4rkcv/wc16_str.c @@ -27,7 +27,6 @@ * */ - #include #include #include "wchar16.h" diff --git a/src/sj4mkdic/char.c b/src/sj4mkdic/char.c index 40755ba..8157071 100644 --- a/src/sj4mkdic/char.c +++ b/src/sj4mkdic/char.c @@ -27,7 +27,6 @@ * */ - #include "sj_euc.h" #include "sj4_dict_const.h" diff --git a/src/sj4mkdic/cnvhinsi.c b/src/sj4mkdic/cnvhinsi.c index 3ddc42f..71d8e95 100644 --- a/src/sj4mkdic/cnvhinsi.c +++ b/src/sj4mkdic/cnvhinsi.c @@ -27,7 +27,6 @@ * */ - #include "sj4mkdic.h" static struct gram_code { diff --git a/src/sj4mkdic/file.c b/src/sj4mkdic/file.c index dc3d3fa..b7e6afc 100644 --- a/src/sj4mkdic/file.c +++ b/src/sj4mkdic/file.c @@ -27,7 +27,6 @@ * */ - #include "sj4mkdic.h" typedef struct filelist { diff --git a/src/sj4mkdic/global.c b/src/sj4mkdic/global.c index 0f12466..1990fe9 100644 --- a/src/sj4mkdic/global.c +++ b/src/sj4mkdic/global.c @@ -27,7 +27,6 @@ * */ - #include "sj4_dict_struct.h" #include "sj4mkdic.h" diff --git a/src/sj4mkdic/hindo.c b/src/sj4mkdic/hindo.c index f32c3b1..b6417e9 100644 --- a/src/sj4mkdic/hindo.c +++ b/src/sj4mkdic/hindo.c @@ -27,7 +27,6 @@ * */ - #include "sj4_dict_const.h" #include "sj4_dict_struct.h" diff --git a/src/sj4mkdic/knjcvt.c b/src/sj4mkdic/knjcvt.c index 0818e58..47d1fa7 100644 --- a/src/sj4mkdic/knjcvt.c +++ b/src/sj4mkdic/knjcvt.c @@ -27,7 +27,6 @@ * */ - #include "sj4_dict_const.h" #include "sj4_dict_struct.h" diff --git a/src/sj4mkdic/makedict.c b/src/sj4mkdic/makedict.c index bfb6734..b7dc33a 100644 --- a/src/sj4mkdic/makedict.c +++ b/src/sj4mkdic/makedict.c @@ -27,7 +27,6 @@ * */ - #include "sj4_dict_const.h" #include "sj4mkdic.h" diff --git a/src/sj4mkdic/makelist.c b/src/sj4mkdic/makelist.c index bd7e905..8f59010 100644 --- a/src/sj4mkdic/makelist.c +++ b/src/sj4mkdic/makelist.c @@ -27,7 +27,6 @@ * */ - #include "sj4_dict_const.h" #include "sj4_dict_struct.h" diff --git a/src/sj4mkdic/makeseg.c b/src/sj4mkdic/makeseg.c index 57689d9..f725cd0 100644 --- a/src/sj4mkdic/makeseg.c +++ b/src/sj4mkdic/makeseg.c @@ -27,7 +27,6 @@ * */ - #include "sj4_dict_struct.h" #include "Dict.h" diff --git a/src/sj4mkdic/memory.c b/src/sj4mkdic/memory.c index 7103ff2..616d7e5 100644 --- a/src/sj4mkdic/memory.c +++ b/src/sj4mkdic/memory.c @@ -27,7 +27,6 @@ * */ - #include "sj4_dict_const.h" #include "sj4mkdic.h" diff --git a/src/sj4mkdic/offset.c b/src/sj4mkdic/offset.c index 45acd11..858a827 100644 --- a/src/sj4mkdic/offset.c +++ b/src/sj4mkdic/offset.c @@ -27,7 +27,6 @@ * */ - #include "sj4_dict_const.h" #include "sj4_dict_struct.h" diff --git a/src/sj4mkdic/readline.c b/src/sj4mkdic/readline.c index fed3a41..fd3cfed 100644 --- a/src/sj4mkdic/readline.c +++ b/src/sj4mkdic/readline.c @@ -27,7 +27,6 @@ * */ - #include "sj_euc.h" #include "sj4_dict_const.h" diff --git a/src/sj4mkdic/sj4_dict_const.h b/src/sj4mkdic/sj4_dict_const.h index a312fdd..41b19df 100644 --- a/src/sj4mkdic/sj4_dict_const.h +++ b/src/sj4mkdic/sj4_dict_const.h @@ -27,7 +27,6 @@ * */ - #ifndef SJ4_DICT_CONST_H #define SJ4_DICT_CONST_H diff --git a/src/sj4mkdic/sj4_dict_struct.h b/src/sj4mkdic/sj4_dict_struct.h index cf9c0ab..2c6cb30 100644 --- a/src/sj4mkdic/sj4_dict_struct.h +++ b/src/sj4mkdic/sj4_dict_struct.h @@ -27,7 +27,6 @@ * */ - #include "sj4_dict_const.h" #ifndef SJ4_DICT_STRUCT_H diff --git a/src/sj4mkdic/string.c b/src/sj4mkdic/string.c index c3c0ec3..a10b3e9 100644 --- a/src/sj4mkdic/string.c +++ b/src/sj4mkdic/string.c @@ -27,7 +27,6 @@ * */ - #include "sj4_dict_const.h" #include "sj4mkdic.h"