From d104c6f1c9d0aa7a946f21140b44a84229a0956b Mon Sep 17 00:00:00 2001
From: Masanori Ogino <mogino@acm.org>
Date: Fri, 8 Dec 2023 13:31:21 +0900
Subject: [PATCH] Unify Const.h, sj_const.h, and sj_const2.h

Signed-off-by: Masanori Ogino <mogino@acm.org>
---
 Const.h                |  82 ----------
 Makefile.depend        | 344 ++++++++++++++++++++---------------------
 Struct.h               |   4 +-
 alloc.c                |   2 +-
 char.c                 |  12 +-
 chrtbl.c               |   2 +-
 cmpstr.c               |   2 +-
 sj_const2.h => const.h | 181 +++++++++++++++++++---
 fzkyomi.c              |   2 +-
 global2.c              |  16 +-
 hzstrlen.c             |   2 +-
 istrcmp.c              |   2 +-
 knjcvt.c               |   2 +-
 level1.c               |   2 +-
 main.c                 |   3 +-
 makedict.c             |   2 +-
 readline.c             |   2 +-
 selsuuji.c             |  10 +-
 setup.c                |   3 +-
 sj3lib.c               |   3 +-
 sj3stat.c              |   2 +-
 sj_const.h             | 198 ------------------------
 sj_kcnv.h              |   3 +-
 sj_struct2.h           |   2 +-
 skipkstr.c             |  11 +-
 string2.c              |  11 +-
 suujitbl.c             |  11 +-
 termtbl.c              |  10 +-
 28 files changed, 362 insertions(+), 564 deletions(-)
 delete mode 100644 Const.h
 rename sj_const2.h => const.h (54%)
 delete mode 100644 sj_const.h

diff --git a/Const.h b/Const.h
deleted file mode 100644
index 0444cf7..0000000
--- a/Const.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * SPDX-License-Identifier: MIT-open-group
- *
- * Copyright (c) 1991-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.
- */
-
-#ifndef SJ3_CONST_H_
-#define SJ3_CONST_H_
-
-#include "Paths.h"
-
-#define	HostNameLen		128			
-#define	UserNameLen		128
-#define	ProgNameLen		128
-#define	PathNameLen		1024			
-#define	PassWordLen		16
-
-#define	YomiBufSize		1024
-#define	KanjiBufSize		2048
-
-#define	MinIdxLen		512
-#define	MinSegLen		512
-#define	MinSegNum		1
-#define	MinStyNum		512
-#define	MaxStyNum		0x7fff
-#define	MinClStep		1
-#define	MaxClStep		256
-#define	MinClLen		512
-#define	MaxClLen		0x7fff
-
-#define	DebugOutFile		ErrorOutFile
-#define	DebugLevel		0
-#define	ForkFlag		1
-#define	MaxClientNum		512
-#define	LogOutFile		ErrorOutFile
-#define	PortName		"sj3"
-#define	PortNumber		3086
-#define	DirectryMode		0755
-#define	DictFileMode		0644
-#define	MODE_MASK		0777
-
-#define	DefIdxLen		2048
-#define	DefSegLen		2048
-#define	DefSegNum		256
-#define	DefStyNum		2048
-#define	DefClStep		1
-#define	DefClLen		2048
-
-#define	NotLocked		-1
-
-#define	ERROR			-1
-
-#ifndef	FALSE
-#	define	TRUE		-1
-#	define	FALSE		(!TRUE)
-#endif
-
-#endif /* SJ3_Const_H_ */
diff --git a/Makefile.depend b/Makefile.depend
index cef324e..d494ff0 100644
--- a/Makefile.depend
+++ b/Makefile.depend
@@ -1,63 +1,58 @@
 adddic.o: adddic.c sj_euc.h sj_sysvdef.h sj_kcnv.h sj_typedef.h \
-  sj_rename.h sj_const.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
-  kanakan.h
+  sj_rename.h sj_var.h sj_dict.h sj_study.h sj_table.h sj_func.h \
+  sj_struct.h Struct.h const.h Paths.h sj_global.h sj_define.h kanakan.h
 addelcmn.o: addelcmn.c sj_euc.h sj_sysvdef.h sj_kcnv.h sj_typedef.h \
-  sj_rename.h sj_const.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
+  sj_rename.h sj_var.h sj_dict.h sj_study.h sj_table.h sj_func.h \
+  sj_struct.h Struct.h const.h Paths.h sj_global.h sj_define.h \
   sj_hinsi.h sj_yomi.h kanakan.h
-alloc.o: alloc.c sj_rename.h sj_typedef.h sj_const.h sj_euc.h \
-  sj_sysvdef.h sj_var.h sj_struct.h kanakan.h Struct.h sj_dict.h Const.h \
-  Paths.h
-char.o: char.c sj_euc.h sj_sysvdef.h sj_const2.h
+alloc.o: alloc.c sj_rename.h sj_typedef.h const.h Paths.h sj_euc.h \
+  sj_sysvdef.h sj_var.h sj_struct.h kanakan.h Struct.h sj_dict.h
+char.o: char.c sj_euc.h sj_sysvdef.h const.h Paths.h
 charsize.o: charsize.c sj_euc.h sj_sysvdef.h sj_rename.h sj_typedef.h \
-  sj_dict.h kanakan.h sj_struct.h Struct.h sj_const.h sj_var.h Const.h \
-  Paths.h
-chrtbl.o: chrtbl.c sj_const.h sj_euc.h sj_sysvdef.h sj_rename.h \
+  sj_dict.h kanakan.h sj_struct.h Struct.h const.h Paths.h sj_var.h
+chrtbl.o: chrtbl.c const.h Paths.h sj_euc.h sj_sysvdef.h sj_rename.h \
   sj_typedef.h
-cl2knj.o: cl2knj.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h sj_euc.h \
-  sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h sj_func.h \
-  sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h kanakan.h
-clstudy.o: clstudy.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h \
-  sj_euc.h sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
-  kanakan.h
-cmpstr.o: cmpstr.c sj_rename.h sj_const.h sj_euc.h sj_sysvdef.h \
+cl2knj.o: cl2knj.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h sj_dict.h \
+  sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h Paths.h \
+  sj_euc.h sj_sysvdef.h sj_global.h sj_define.h kanakan.h
+clstudy.o: clstudy.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
+  sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
+  Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_define.h kanakan.h
+cmpstr.o: cmpstr.c sj_rename.h const.h Paths.h sj_euc.h sj_sysvdef.h \
   sj_typedef.h
-cnvhinsi.o: cnvhinsi.c dicttool.h sj_struct2.h sj_const2.h GramTable
+cnvhinsi.o: cnvhinsi.c dicttool.h sj_struct2.h const.h Paths.h sj_euc.h \
+  sj_sysvdef.h GramTable
 code.o: code.c sj_sysvdef.h wchar16.h key.h kctype.h sj2.h rk.h
 codecnv.o: codecnv.c sjctype.h sj_sysvdef.h sjtool.h
 common.o: common.c conversion.h sj2.h wchar16.h key.h sj_sysvdef.h \
   sj3libsj3.h sj3lib.h henkan.h
 compats.o: compats.c config.h
 comuni.o: comuni.c sj_sysvdef.h sj_kcnv.h sj_typedef.h sj_rename.h \
-  sj_const.h sj_euc.h sj_var.h sj_dict.h sj_study.h sj_table.h sj_func.h \
-  sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h
+  sj_var.h sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h \
+  Struct.h const.h Paths.h sj_euc.h sj_global.h sj_define.h
 conjunc.o: conjunc.c sj_rename.h sj_typedef.h sj_yomi.h sj_right.h
 connect.o: connect.c sj_rename.h sj_typedef.h sj_connect.h sj_right.h
 conv.o: conv.c wchar16.h key.h select.h inkey.h common.h conversion.h \
   sj2.h sj_sysvdef.h sj3libsj3.h sj3lib.h henkan.h
-cvtclknj.o: cvtclknj.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h \
-  sj_euc.h sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h
+cvtclknj.o: cvtclknj.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
+  sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
+  Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_define.h
 cvtdict.o: cvtdict.c sj_euc.h sj_sysvdef.h sj_kcnv.h sj_typedef.h \
-  sj_rename.h sj_const.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
+  sj_rename.h sj_var.h sj_dict.h sj_study.h sj_table.h sj_func.h \
+  sj_struct.h Struct.h const.h Paths.h sj_global.h sj_define.h kanakan.h
+cvtkanji.o: cvtkanji.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
+  sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
+  Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_define.h kanakan.h
+deldic.o: deldic.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h sj_dict.h \
+  sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h Paths.h \
+  sj_euc.h sj_sysvdef.h sj_global.h sj_define.h kanakan.h
+depend.o: depend.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h sj_dict.h \
+  sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h Paths.h \
+  sj_euc.h sj_sysvdef.h sj_global.h sj_define.h Dict.h sj3err.h \
   kanakan.h
-cvtkanji.o: cvtkanji.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h \
-  sj_euc.h sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
-  kanakan.h
-deldic.o: deldic.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h sj_euc.h \
-  sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h sj_func.h \
-  sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h kanakan.h
-depend.o: depend.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h sj_euc.h \
-  sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h sj_func.h \
-  sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h Dict.h \
-  sj3err.h kanakan.h
 dict.o: dict.c sj_euc.h sj_sysvdef.h sj_kcnv.h sj_typedef.h sj_rename.h \
-  sj_const.h sj_var.h sj_dict.h sj_study.h sj_table.h sj_func.h \
-  sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h kanakan.h
+  sj_var.h sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h \
+  Struct.h const.h Paths.h sj_global.h sj_define.h kanakan.h
 dictdisp.o: dictdisp.c
 dictmake.o: dictmake.c sj_sysvdef.h sjctype.h sj3lib.h sjtool.h
 display.o: display.c sj_sysvdef.h common.h conversion.h sj2.h wchar16.h \
@@ -66,157 +61,152 @@ douon.o: douon.c common.h conversion.h sj2.h wchar16.h key.h sj_sysvdef.h \
   sj3libsj3.h sj3lib.h henkan.h
 edit.o: edit.c common.h conversion.h sj2.h wchar16.h key.h sj_sysvdef.h \
   sj3libsj3.h sj3lib.h henkan.h
-error.o: error.c sj_typedef.h server.h Struct.h sj_const.h sj_euc.h \
-  sj_sysvdef.h sj_dict.h sj_struct.h sj_var.h Const.h Paths.h
+error.o: error.c sj_typedef.h server.h Struct.h const.h Paths.h sj_euc.h \
+  sj_sysvdef.h sj_dict.h sj_struct.h sj_var.h
 etc.o: etc.c common.h conversion.h sj2.h wchar16.h key.h sj_sysvdef.h \
   sj3libsj3.h sj3lib.h henkan.h
 eucmessage.o: eucmessage.c wchar16.h key.h kctype.h sj3libsj3.h sj3lib.h \
   sj2.h sj_sysvdef.h
-execute.o: execute.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h \
-  sj_euc.h sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
-  sj3cmd.h sj3err.h Dict.h server.h
-file.o: file.c dicttool.h sj_struct2.h sj_const2.h
+execute.o: execute.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
+  sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
+  Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_define.h sj3cmd.h \
+  sj3err.h Dict.h server.h
+file.o: file.c dicttool.h sj_struct2.h const.h Paths.h sj_euc.h \
+  sj_sysvdef.h
 funckey.o: funckey.c wchar16.h key.h sj2.h sj_sysvdef.h Paths.h sj3.h
 functbl.o: functbl.c sj_rename.h sj_func.h sj_typedef.h sj_struct.h \
-  Struct.h sj_const.h sj_euc.h sj_sysvdef.h sj_dict.h sj_var.h Const.h \
-  Paths.h kanakan.h
-fuzoku.o: fuzoku.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h sj_euc.h \
-  sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h sj_func.h \
-  sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
-  sj_hinsi.h sj_right.h sj_yomi.h
-fzkyomi.o: fzkyomi.c sj_const.h sj_euc.h sj_sysvdef.h sj_rename.h \
+  Struct.h const.h Paths.h sj_euc.h sj_sysvdef.h sj_dict.h sj_var.h \
+  kanakan.h
+fuzoku.o: fuzoku.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h sj_dict.h \
+  sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h Paths.h \
+  sj_euc.h sj_sysvdef.h sj_global.h sj_define.h sj_hinsi.h sj_right.h \
+  sj_yomi.h
+fzkyomi.o: fzkyomi.c const.h Paths.h sj_euc.h sj_sysvdef.h sj_rename.h \
   sj_typedef.h sj_yomi.h sj_right.h sj_left.h
 getkanji.o: getkanji.c sj_euc.h sj_sysvdef.h sj_kcnv.h sj_typedef.h \
-  sj_rename.h sj_const.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
-  kanakan.h
-getrank.o: getrank.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h \
-  sj_euc.h sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
-  kanakan.h
-global.o: global.c sj_struct2.h sj_const2.h
-global2.o: global2.c sj_rename.h sj_typedef.h sj_const.h sj_euc.h \
-  sj_sysvdef.h sj_var.h sj_struct.h sj_dict.h Const.h Paths.h Struct.h
+  sj_rename.h sj_var.h sj_dict.h sj_study.h sj_table.h sj_func.h \
+  sj_struct.h Struct.h const.h Paths.h sj_global.h sj_define.h kanakan.h
+getrank.o: getrank.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
+  sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
+  Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_define.h kanakan.h
+global.o: global.c sj_struct2.h const.h Paths.h sj_euc.h sj_sysvdef.h
+global2.o: global2.c Struct.h const.h Paths.h sj_euc.h sj_sysvdef.h \
+  sj_dict.h sj_struct.h sj_typedef.h sj_var.h sj_rename.h
 henkan.o: henkan.c common.h conversion.h sj2.h wchar16.h key.h \
   sj_sysvdef.h sj3libsj3.h sj3lib.h henkan.h kctype.h
-hindo.o: hindo.c sj_struct.h sj_typedef.h dicttool.h sj_struct2.h \
-  sj_const2.h
+hindo.o: hindo.c sj_struct.h sj_typedef.h dicttool.h sj_struct2.h const.h \
+  Paths.h sj_euc.h sj_sysvdef.h
 hinsi.o: hinsi.c sj_hinsi.h
 hzstrlen.o: hzstrlen.c sj_euc.h sj_sysvdef.h sj_rename.h sj_typedef.h \
-  sj_const.h sj_dict.h kanakan.h sj_struct.h Struct.h sj_var.h Const.h \
-  Paths.h
-init.o: init.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h sj_euc.h \
-  sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h sj_func.h \
-  sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h
-istrcmp.o: istrcmp.c sj_rename.h sj_typedef.h sj_const.h sj_euc.h \
+  const.h Paths.h sj_dict.h kanakan.h sj_struct.h Struct.h sj_var.h
+init.o: init.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h sj_dict.h \
+  sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h Paths.h \
+  sj_euc.h sj_sysvdef.h sj_global.h sj_define.h
+istrcmp.o: istrcmp.c sj_rename.h sj_typedef.h const.h Paths.h sj_euc.h \
   sj_sysvdef.h
 kigou.o: kigou.c common.h conversion.h sj2.h wchar16.h key.h sj_sysvdef.h \
   sj3libsj3.h sj3lib.h henkan.h kctype.h
-knjcvt.o: knjcvt.c sj_const.h sj_euc.h sj_sysvdef.h sj_struct.h \
-  sj_typedef.h dicttool.h sj_struct2.h sj_const2.h
-level1.o: level1.c config.h Const.h Paths.h sj3cmd.h sj3err.h sj3lib.h
+knjcvt.o: knjcvt.c const.h Paths.h sj_euc.h sj_sysvdef.h sj_struct.h \
+  sj_typedef.h dicttool.h sj_struct2.h
+level1.o: level1.c config.h const.h Paths.h sj_euc.h sj_sysvdef.h \
+  sj3cmd.h sj3err.h sj3lib.h
 libif.o: libif.c sj_sysvdef.h wchar16.h key.h kctype.h common.h \
   conversion.h sj2.h sj3libsj3.h sj3lib.h henkan.h
-main.o: main.c config.h sj_sysvdef.h Const.h Paths.h server.h Struct.h \
-  sj_const.h sj_euc.h sj_dict.h sj_struct.h sj_typedef.h sj_var.h
-makedict.o: makedict.c sj_const.h sj_euc.h sj_sysvdef.h dicttool.h \
-  sj_struct2.h sj_const2.h
+main.o: main.c config.h sj_sysvdef.h const.h Paths.h sj_euc.h server.h \
+  Struct.h sj_dict.h sj_struct.h sj_typedef.h sj_var.h
+makedict.o: makedict.c const.h Paths.h sj_euc.h sj_sysvdef.h dicttool.h \
+  sj_struct2.h
 makelist.o: makelist.c sj_struct.h sj_typedef.h dicttool.h sj_struct2.h \
-  sj_const2.h
+  const.h Paths.h sj_euc.h sj_sysvdef.h
 makeseg.o: makeseg.c sj_struct.h sj_typedef.h Dict.h dicttool.h \
-  sj_struct2.h sj_const2.h
-memory.o: memory.c dicttool.h sj_struct2.h sj_const2.h
-memory2.o: memory2.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h \
-  sj_euc.h sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h
-mk2claus.o: mk2claus.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h \
-  sj_euc.h sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
-  sj_right.h
-mkbunset.o: mkbunset.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h \
-  sj_euc.h sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
-  sj_hinsi.h kanakan.h
-mkjiritu.o: mkjiritu.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h \
-  sj_euc.h sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
+  sj_struct2.h const.h Paths.h sj_euc.h sj_sysvdef.h
+memory.o: memory.c dicttool.h sj_struct2.h const.h Paths.h sj_euc.h \
+  sj_sysvdef.h
+memory2.o: memory2.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
+  sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
+  Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_define.h
+mk2claus.o: mk2claus.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
+  sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
+  Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_define.h sj_right.h
+mkbunset.o: mkbunset.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
+  sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
+  Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_define.h sj_hinsi.h \
   kanakan.h
+mkjiritu.o: mkjiritu.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
+  sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
+  Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_define.h kanakan.h
 mkkouho.o: mkkouho.c sj_euc.h sj_sysvdef.h sj_kcnv.h sj_typedef.h \
-  sj_rename.h sj_const.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
+  sj_rename.h sj_var.h sj_dict.h sj_study.h sj_table.h sj_func.h \
+  sj_struct.h Struct.h const.h Paths.h sj_global.h sj_define.h \
   sj_hinsi.h sj_suuji.h kanakan.h
-mknumber.o: mknumber.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h \
-  sj_euc.h sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
-  sj_yomi.h sj_suuji.h kanakan.h
+mknumber.o: mknumber.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
+  sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
+  Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_define.h sj_yomi.h \
+  sj_suuji.h kanakan.h
 mvmemd.o: mvmemd.c sj_rename.h sj_typedef.h
 mvmemi.o: mvmemi.c sj_rename.h sj_typedef.h
 nmttyslot.o: nmttyslot.c sj2.h wchar16.h key.h sj_sysvdef.h
 offset.o: offset.c sj_struct.h sj_typedef.h dicttool.h sj_struct2.h \
-  sj_const2.h
-peepdic.o: peepdic.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h \
-  sj_euc.h sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
-  sj_yomi.h kanakan.h
-ph2knj.o: ph2knj.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h sj_euc.h \
-  sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h sj_func.h \
-  sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h sj_yomi.h \
+  const.h Paths.h sj_euc.h sj_sysvdef.h
+peepdic.o: peepdic.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
+  sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
+  Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_define.h sj_yomi.h \
   kanakan.h
-ph_khtbl.o: ph_khtbl.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h \
-  sj_euc.h sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
-  kanakan.h
-priority.o: priority.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h \
-  sj_euc.h sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
-  sj_hinsi.h sj_right.h sj_prty.h
+ph2knj.o: ph2knj.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h sj_dict.h \
+  sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h Paths.h \
+  sj_euc.h sj_sysvdef.h sj_global.h sj_define.h sj_yomi.h kanakan.h
+ph_khtbl.o: ph_khtbl.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
+  sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
+  Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_define.h kanakan.h
+priority.o: priority.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
+  sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
+  Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_define.h sj_hinsi.h \
+  sj_right.h sj_prty.h
 prtytbl.o: prtytbl.c sj_rename.h sj_typedef.h
-readline.o: readline.c sj_euc.h sj_sysvdef.h sj_const.h sj_macro.h \
-  dicttool.h sj_struct2.h sj_const2.h
+readline.o: readline.c sj_euc.h sj_sysvdef.h const.h Paths.h sj_macro.h \
+  dicttool.h sj_struct2.h
 rk_conv.o: rk_conv.c sj_sysvdef.h wchar16.h key.h kctype.h rk.h
 romaji.o: romaji.c common.h conversion.h sj2.h wchar16.h key.h \
   sj_sysvdef.h sj3libsj3.h sj3lib.h henkan.h rk.h
 s2ctbl.o: s2ctbl.c sj_rename.h sj_typedef.h sj_yomi.h
 screen.o: screen.c common.h conversion.h sj2.h wchar16.h key.h \
   sj_sysvdef.h sj3libsj3.h sj3lib.h henkan.h
-selclrec.o: selclrec.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h \
-  sj_euc.h sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h
-selsuuji.o: selsuuji.c sj_rename.h sj_typedef.h sj_const.h sj_euc.h \
+selclrec.o: selclrec.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
+  sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
+  Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_define.h
+selsuuji.o: selsuuji.c sj_rename.h sj_typedef.h const.h Paths.h sj_euc.h \
   sj_sysvdef.h sj_suuji.h
-setconj.o: setconj.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h \
-  sj_euc.h sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
-  sj_right.h sj_hinsi.h sj_yomi.h kanakan.h
+setconj.o: setconj.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
+  sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
+  Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_define.h sj_right.h \
+  sj_hinsi.h sj_yomi.h kanakan.h
 setjrec.o: setjrec.c sj_euc.h sj_sysvdef.h sj_kcnv.h sj_typedef.h \
-  sj_rename.h sj_const.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
+  sj_rename.h sj_var.h sj_dict.h sj_study.h sj_table.h sj_func.h \
+  sj_struct.h Struct.h const.h Paths.h sj_global.h sj_define.h \
   sj_hinsi.h kanakan.h
 setkouho.o: setkouho.c sj_euc.h sj_sysvdef.h sj_kcnv.h sj_typedef.h \
-  sj_rename.h sj_const.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
+  sj_rename.h sj_var.h sj_dict.h sj_study.h sj_table.h sj_func.h \
+  sj_struct.h Struct.h const.h Paths.h sj_global.h sj_define.h \
   sj_hinsi.h kanakan.h
-setubi.o: setubi.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h sj_euc.h \
-  sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h sj_func.h \
-  sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
-  sj_hinsi.h kanakan.h
-setup.o: setup.c sj_sysvdef.h sj_typedef.h sj_const.h sj_euc.h sj_var.h \
-  sj_dict.h sj_struct.h sj_rename.h Const.h Paths.h Struct.h sj_global.h \
-  kanakan.h server.h
+setubi.o: setubi.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h sj_dict.h \
+  sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h Paths.h \
+  sj_euc.h sj_sysvdef.h sj_global.h sj_define.h sj_hinsi.h kanakan.h
+setup.o: setup.c sj_sysvdef.h sj_typedef.h sj_var.h sj_dict.h sj_struct.h \
+  sj_rename.h const.h Paths.h sj_euc.h Struct.h sj_global.h kanakan.h \
+  server.h
 sj2code.o: sj2code.c sj_euc.h sj_sysvdef.h sj_kcnv.h sj_typedef.h \
-  sj_rename.h sj_const.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
-  sj_yomi.h
+  sj_rename.h sj_var.h sj_dict.h sj_study.h sj_table.h sj_func.h \
+  sj_struct.h Struct.h const.h Paths.h sj_global.h sj_define.h sj_yomi.h
 sj3.o: sj3.c sj_sysvdef.h wchar16.h key.h select.h common.h conversion.h \
   sj2.h sj3libsj3.h sj3lib.h henkan.h sj3.h
 sj3_rkcv.o: sj3_rkcv.c wchar16.h key.h sj2.h sj_sysvdef.h kana.h rk.h \
   kctype.h
 sj3dic.o: sj3dic.c sj_sysvdef.h sjtool.h sj3lib.h sj3dic.h
 sj3err.o: sj3err.c sj3err.h
-sj3lib.o: sj3lib.c config.h Const.h Paths.h sj3err.h sj_const.h sj_euc.h \
-  sj_sysvdef.h sj_hinsi.h sj3lib.h
-sj3stat.o: sj3stat.c Const.h Paths.h sj3err.h sj3lib.h
+sj3lib.o: sj3lib.c config.h const.h Paths.h sj_euc.h sj_sysvdef.h \
+  sj3err.h sj_hinsi.h sj3lib.h
+sj3stat.o: sj3stat.c const.h Paths.h sj_euc.h sj_sysvdef.h sj3err.h \
+  sj3lib.h
 sj3ver.o: sj3ver.c sj2.h wchar16.h key.h sj_sysvdef.h
 sjgetchar.o: sjgetchar.c sj_sysvdef.h wchar16.h key.h kctype.h sj2.h \
   select.h
@@ -225,49 +215,45 @@ sjrc2.o: sjrc2.c wchar16.h key.h kctype.h common.h conversion.h sj2.h \
   sj_sysvdef.h sj3libsj3.h sj3lib.h henkan.h Paths.h
 skiphblk.o: skiphblk.c sj_rename.h sj_typedef.h sj_dict.h
 skipkstr.o: skipkstr.c sj_euc.h sj_sysvdef.h sj_rename.h sj_typedef.h \
-  sj_const.h sj_dict.h sj_table.h sj_func.h sj_struct.h Struct.h \
-  sj_var.h Const.h Paths.h kanakan.h
-srchdict.o: srchdict.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h \
-  sj_euc.h sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
-  kanakan.h
-srchhead.o: srchhead.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h \
-  sj_euc.h sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
-  sj_yomi.h
-srchidx.o: srchidx.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h \
-  sj_euc.h sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
-  kanakan.h
-srchnum.o: srchnum.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h \
-  sj_euc.h sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
-  sj_yomi.h sj_hinsi.h sj_suuji.h kanakan.h
+  const.h Paths.h sj_dict.h sj_table.h sj_func.h sj_struct.h Struct.h \
+  sj_var.h kanakan.h
+srchdict.o: srchdict.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
+  sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
+  Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_define.h kanakan.h
+srchhead.o: srchhead.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
+  sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
+  Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_define.h sj_yomi.h
+srchidx.o: srchidx.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
+  sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
+  Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_define.h kanakan.h
+srchnum.o: srchnum.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
+  sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
+  Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_define.h sj_yomi.h \
+  sj_hinsi.h sj_suuji.h kanakan.h
 stat_conv.o: stat_conv.c common.h conversion.h sj2.h wchar16.h key.h \
   sj_sysvdef.h sj3libsj3.h sj3lib.h henkan.h rk.h
 stbtbl.o: stbtbl.c sj_rename.h sj_typedef.h sj_yomi.h sj_hinsi.h
 string.o: string.c config.h sj_euc.h sj_sysvdef.h sj3lib.h
-string2.o: string2.c sj_const.h sj_euc.h sj_sysvdef.h dicttool.h \
-  sj_struct2.h sj_const2.h
+string2.o: string2.c const.h Paths.h sj_euc.h sj_sysvdef.h dicttool.h \
+  sj_struct2.h
 stttbl.o: stttbl.c sj_rename.h sj_typedef.h
-study.o: study.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h sj_euc.h \
-  sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h sj_func.h \
-  sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h kanakan.h
-suujitbl.o: suujitbl.c sj_const.h sj_euc.h sj_sysvdef.h sj_rename.h \
+study.o: study.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h sj_dict.h \
+  sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h Paths.h \
+  sj_euc.h sj_sysvdef.h sj_global.h sj_define.h kanakan.h
+suujitbl.o: suujitbl.c const.h Paths.h sj_euc.h sj_sysvdef.h sj_rename.h \
   sj_typedef.h sj_yomi.h sj_suuji.h
 term.o: term.c sj2.h wchar16.h key.h sj_sysvdef.h
-terminat.o: terminat.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h \
-  sj_euc.h sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
-  sj_right.h
-termtbl.o: termtbl.c sj_rename.h sj_typedef.h sj_const.h sj_euc.h \
+terminat.o: terminat.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
+  sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
+  Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_define.h sj_right.h
+termtbl.o: termtbl.c sj_rename.h sj_typedef.h const.h Paths.h sj_euc.h \
   sj_sysvdef.h sj_prty.h
 tests.o: tests.c
 toroku.o: toroku.c common.h conversion.h sj2.h wchar16.h key.h \
   sj_sysvdef.h sj3libsj3.h sj3lib.h henkan.h
 version2.o: version2.c sj2.h wchar16.h key.h sj_sysvdef.h
-wakachi.o: wakachi.c sj_kcnv.h sj_typedef.h sj_rename.h sj_const.h \
-  sj_euc.h sj_sysvdef.h sj_var.h sj_dict.h sj_study.h sj_table.h \
-  sj_func.h sj_struct.h Struct.h Const.h Paths.h sj_global.h sj_define.h \
-  sj_right.h sj_hinsi.h kanakan.h
+wakachi.o: wakachi.c sj_kcnv.h sj_typedef.h sj_rename.h sj_var.h \
+  sj_dict.h sj_study.h sj_table.h sj_func.h sj_struct.h Struct.h const.h \
+  Paths.h sj_euc.h sj_sysvdef.h sj_global.h sj_define.h sj_right.h \
+  sj_hinsi.h kanakan.h
 wc16_str.o: wc16_str.c sj_sysvdef.h sj_euc.h wchar16.h key.h
diff --git a/Struct.h b/Struct.h
index 70b609c..2b27ec1 100644
--- a/Struct.h
+++ b/Struct.h
@@ -34,11 +34,11 @@
 #include <sys/select.h>
 #include <sys/types.h>
 #include <stdio.h>
-#include "sj_const.h"
+
+#include "const.h"
 #include "sj_dict.h"
 #include "sj_struct.h"
 #include "sj_var.h"
-#include "Const.h"
 
 typedef struct global {
 	JREC		*Jmaxjptr;
diff --git a/alloc.c b/alloc.c
index 79adabe..34cc4cf 100644
--- a/alloc.c
+++ b/alloc.c
@@ -41,7 +41,7 @@
 #include <sys/types.h>
 #include "sj_rename.h"
 #include "sj_typedef.h"
-#include "sj_const.h"
+#include "const.h"
 #include "sj_var.h"
 #include "sj_struct.h"
 #include "kanakan.h"
diff --git a/char.c b/char.c
index 49dfbef..804c754 100644
--- a/char.c
+++ b/char.c
@@ -27,19 +27,13 @@
  *
  */
 
-/*
- * $SonyRCSfile: char.c,v $  
- * $SonyRevision: 1.1 $ 
- * $SonyDate: 1994/06/03 08:00:32 $
- *
- * $Id$
- */
 
+#include <sys/types.h>
 
 #include <stdio.h>
-#include <sys/types.h>
+
 #include "sj_euc.h"
-#include "sj_const2.h"
+#include "const.h"
 
 
 int
diff --git a/chrtbl.c b/chrtbl.c
index 99d7b0a..761bd14 100644
--- a/chrtbl.c
+++ b/chrtbl.c
@@ -36,7 +36,7 @@
 
 
 
-#include "sj_const.h"
+#include "const.h"
 #include "sj_rename.h"
 #include "sj_typedef.h"
 
diff --git a/cmpstr.c b/cmpstr.c
index 03f1b33..923bc75 100644
--- a/cmpstr.c
+++ b/cmpstr.c
@@ -38,7 +38,7 @@
 
 
 #include "sj_rename.h"
-#include "sj_const.h"
+#include "const.h"
 #include "sj_typedef.h"
 
 Int	cmpstr(src, dst)
diff --git a/sj_const2.h b/const.h
similarity index 54%
rename from sj_const2.h
rename to const.h
index 6462459..e8124ed 100644
--- a/sj_const2.h
+++ b/const.h
@@ -1,6 +1,8 @@
-/*
+/*-
+ * SPDX-License-Identifier: MIT-open-group
+ *
  * Copyright (c) 1991-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
@@ -8,10 +10,10 @@
  * 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.
@@ -19,26 +21,173 @@
  * 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: sj_const.h,v $  
- * $SonyRevision: 1.1 $ 
- * $SonyDate: 1994/06/03 08:00:24 $
- */
+#ifndef SJ3_CONST_H_
+#define SJ3_CONST_H_
 
+#include "Paths.h"
+#include "sj_euc.h"
 
+#define	HostNameLen		128			
+#define	UserNameLen		128
+#define	ProgNameLen		128
+#define	PathNameLen		1024			
+#define	PassWordLen		16
 
+#define	YomiBufSize		1024
+#define	KanjiBufSize		2048
 
+#define	MinIdxLen		512
+#define	MinSegLen		512
+#define	MinSegNum		1
+#define	MinStyNum		512
+#define	MaxStyNum		0x7fff
+#define	MinClStep		1
+#define	MaxClStep		256
+#define	MinClLen		512
+#define	MaxClLen		0x7fff
 
-#ifndef	_CONST_
-#define	_CONST_
+#define	DebugOutFile		ErrorOutFile
+#define	DebugLevel		0
+#define	ForkFlag		1
+#define	MaxClientNum		512
+#define	LogOutFile		ErrorOutFile
+#define	PortName		"sj3"
+#define	PortNumber		3086
+#define	DirectryMode		0755
+#define	DictFileMode		0644
+#define	MODE_MASK		0777
+
+#define	DefIdxLen		2048
+#define	DefSegLen		2048
+#define	DefSegNum		256
+#define	DefStyNum		2048
+#define	DefClStep		1
+#define	DefClLen		2048
+
+#define	NotLocked		-1
+
+#define	ERROR			-1
+
+#ifndef	FALSE
+#	define	TRUE		-1
+#	define	FALSE		(!TRUE)
+#endif
+
+#define	MATCH		0	
+#define	OVER		1	
+#define	PARTLY		2	
+#define	CONT		3	
+#define	UNDER		4	
+
+#define	AD_Done		0x0000	
+#define	AD_NotUserDict	0x0001	
+#define	AD_BadYomi	0x0002	
+#define	AD_BadKanji	0x0004	
+#define	AD_BadHinsi	0x0008	
+
+#define	AD_ArExist	0x0010	
+#define	AD_OvflwDouBlk	0x0020	
+#define	AD_OvflwDouNum	0x0040	
+#define	AD_OvflwUsrDic	0x0080	
+#define	AD_OvflwIndex	0x0100	
+
+#define	AD_NoMidasi	0x0010	
+#define	AD_NoHinsi	0x0020	
+#define	AD_NoKanji	0x0040	
+
+#define	C_WAKACHI	0x00		
+#define	C_MINASI	0x01		
+#define	C_BUNSETU	0x02		
+#define	C_DICT		0x03		
+#define	C_N_ARABIA	0x04		
+#define	C_N_ARACMA	0x05		
+#define	C_N_KAZU	0x06		
+#define	C_N_SUUJI	0x07		
+#define	C_N_NANSUU	0x08		
+#define	C_N_KANKURA	0x09		
+#define	C_N_ARAKURA	0x0a		
+#define	C_N_KAZULONG	0x0b		
+#define	C_N_KAZULCMA	0x0c		
+#define	C_N_SUUJILONG	0x0d		
+
+#define	JFLAG_N10	(1 << 15)	
+#define	JFLAG_N_1	(1 << 14)	
+#define	JFLAG_NS1	(1 << 13)	
+#define	JFLAG_N01	(1 << 12)	
+#define	JFLAG_N23	(1 << 11)	
+#define	JFLAG_NK2	(1 << 10)	
+#define	JFLAG_NK4	(1 << 9)	
+#define	JFLAG_NN0	(1 << 8)	
+#define	JFLAG_NSN	(1 << 7)	
+#define	JFLAG_KA	(1 << 0)	
+
+#define	DO_CLSTUDY	0x01	
+#define	DO_IKKATU	0x02	
+
+#define	K_DOUSHI	1	
+#define	K_YOUGEN	2	
+#define	K_TAIGEN	3	
+#define	K_FUKUSI	4	
+#define	K_RENTAISI	5	
+#define	K_SONOTA	6	
+
+#define EUC_a1          (Uchar)0xa1
+#define EUC_a2          (Uchar)0xa2
+#define EUC_a3          (Uchar)0xa3
+#define EUC_a4          (Uchar)0xa4
+#define EUC_a5          (Uchar)0xa5
+
+#define EUC_START       (Uchar)0xa1
+#define EUC_END         (Uchar)0xfe
+#define EUC_END_KIGOU   (Uchar)0xae
+#define EUC_0           (Uchar)0xb0
+#define EUC_END_0       (Uchar)0xb9
+#define EUC_A           (Uchar)0xc1
+#define EUC_END_A       (Uchar)0xda
+#define EUC_a           (Uchar)0xe1
+#define EUC_END_a       (Uchar)0xfa
+#define EUC_END_HIRA    (Uchar)0xf3
+#define EUC_VU          (Uchar)0xf4
+#define EUC_XKA         (Uchar)0xf5
+#define EUC_XKE         (Uchar)0xf6
+
+#define	isknj1(c)	(((c) == SS2) || (((c) & 0x80) && ((c) != SS3)))
+
+#define	SHU		0x01		
+#define	T_KANOU		0x80		
+#define	T_SHUUJO	0x40		
+
+#define	DICTOP  	0x01	
+#define	FZKTOP		0x02	
+#define	DEPEND		0x04	
+#define	NUMBER		0x08	
+#define	FZK_KGU  	0x10	
+#define	TAI_KGU		0x20	
+#define	BEFORNUM	0x40	
+#define	MIDNUM		0x80	
+#define	NOTNRM		0xFE	
+
+#define	CNJEND		0xff	
+#define	TYOUONFLG	0x80	
+
+#define	MAXFREC		32	
+#define	MAXFLVL		10	
+#define	FZKEND		0xff	
+
+#define	SETTOU_O	1	
+#define	SETTOU_GO	2	
+#define	SETTOU_DAI	3	
+#define	SETTOU_KIGOU	4	
+
+#define	NumKetaLength	16		
+#define	NumWordBuf	((NumKetaLength+3)/4)	
 
 #define	MainSegmentLength	2048 	
 #define	MainIndexLength		2048		
@@ -74,7 +223,6 @@
 #define KanjiModeMask           0xf0
 #define	AtrMsKanjiOfs		0xc0c0	
 
-
 #define	MaxHindoNumber		2000	
 #define	MaxOffsetNumber		1000	
 
@@ -97,9 +245,6 @@
 
 #define	HinsiTankan	cnvhinsi("\303\261\264\301")
 
-#define	FALSE			0
-#define	TRUE			(!FALSE)
-
 #define	DIVLIST		1
 #define	ASSYUKUREC	2
 #define	STRING		3
@@ -109,4 +254,4 @@
 #define	HINSIREC	7
 #define	DOUONREC	8
 
-#endif
+#endif /* SJ3_CONST_H_ */
diff --git a/fzkyomi.c b/fzkyomi.c
index ada1c6b..42d632b 100644
--- a/fzkyomi.c
+++ b/fzkyomi.c
@@ -35,7 +35,7 @@
 
 
 
-#include "sj_const.h"
+#include "const.h"
 #include "sj_rename.h"
 #include "sj_typedef.h"
 #include "sj_yomi.h"
diff --git a/global2.c b/global2.c
index b50827e..094f49f 100644
--- a/global2.c
+++ b/global2.c
@@ -34,17 +34,17 @@
  */
 
 
+#include <sys/types.h>
 
 #include <stdio.h>
-#include <sys/types.h>
-#include "sj_rename.h"
-#include "sj_typedef.h"
-#include "sj_const.h"
-#include "sj_var.h"
-#include "sj_struct.h"
-#include "sj_dict.h"
-#include "Const.h"
+
 #include "Struct.h"
+#include "const.h"
+#include "sj_dict.h"
+#include "sj_rename.h"
+#include "sj_struct.h"
+#include "sj_typedef.h"
+#include "sj_var.h"
 
 Global  *global_work_base;
 
diff --git a/hzstrlen.c b/hzstrlen.c
index ef67d9b..ff732cb 100644
--- a/hzstrlen.c
+++ b/hzstrlen.c
@@ -39,7 +39,7 @@
 #include "sj_euc.h"
 #include "sj_rename.h"
 #include "sj_typedef.h"
-#include "sj_const.h"
+#include "const.h"
 #include "sj_dict.h"
 #include "kanakan.h"
 
diff --git a/istrcmp.c b/istrcmp.c
index 880a678..dd79811 100644
--- a/istrcmp.c
+++ b/istrcmp.c
@@ -37,7 +37,7 @@
 
 #include "sj_rename.h"
 #include "sj_typedef.h"
-#include "sj_const.h"
+#include "const.h"
 
 Int	istrcmp(yomip, idxp, ylen, ilen)
 Reg1	Uchar	*yomip;
diff --git a/knjcvt.c b/knjcvt.c
index f637db8..1cefe96 100644
--- a/knjcvt.c
+++ b/knjcvt.c
@@ -41,7 +41,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#include "sj_const.h"
+#include "const.h"
 #include "sj_struct.h"
 #include "dicttool.h"
 
diff --git a/level1.c b/level1.c
index f4d5f42..5ac2427 100644
--- a/level1.c
+++ b/level1.c
@@ -42,7 +42,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "Const.h"
+#include "const.h"
 #include "sj3cmd.h"
 #include "sj3err.h"
 
diff --git a/main.c b/main.c
index 439786d..acf670b 100644
--- a/main.c
+++ b/main.c
@@ -43,7 +43,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "Const.h"
+#include "const.h"
 #include "server.h"
 
 extern int	 fork_flag;
@@ -158,7 +158,6 @@ leave_tty(void)
 			ioctl(tmp, TIOCNOTTY, 0);
 			close(tmp);
 		}
-#endif
 	}
 }
 
diff --git a/makedict.c b/makedict.c
index 26d3fe4..88dfdd6 100644
--- a/makedict.c
+++ b/makedict.c
@@ -45,7 +45,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/param.h>
-#include "sj_const.h"
+#include "const.h"
 #include "dicttool.h"
 
 FILE	*infp = NULL;
diff --git a/readline.c b/readline.c
index 847d3ce..e01df50 100644
--- a/readline.c
+++ b/readline.c
@@ -39,7 +39,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "sj_euc.h"
-#include "sj_const.h"
+#include "const.h"
 #include "sj_macro.h"
 #include "dicttool.h"
 
diff --git a/selsuuji.c b/selsuuji.c
index 2921485..17b1ccc 100644
--- a/selsuuji.c
+++ b/selsuuji.c
@@ -27,17 +27,9 @@
  *
  */
 
-/*
- * $SonyRCSfile: selsuuji.c,v $  
- * $SonyRevision: 1.1 $ 
- * $SonyDate: 1994/06/03 08:02:15 $
- */
-
-
-
 #include "sj_rename.h"
 #include "sj_typedef.h"
-#include "sj_const.h"
+#include "const.h"
 #include "sj_suuji.h"
 
 static	Ushort	selsjAR[] = {
diff --git a/setup.c b/setup.c
index e09ea13..4ba866a 100644
--- a/setup.c
+++ b/setup.c
@@ -49,12 +49,11 @@
 #include <sys/param.h>
 #include <unistd.h>
 #include "sj_typedef.h"
-#include "sj_const.h"
 #include "sj_var.h"
 #include "sj_dict.h"
 #include "sj_struct.h"
 #include "sj_rename.h"
-#include "Const.h"
+#include "const.h"
 #include "Struct.h"
 #include "sj_global.h"
 #include "kanakan.h"
diff --git a/sj3lib.c b/sj3lib.c
index afb860f..5341b0f 100644
--- a/sj3lib.c
+++ b/sj3lib.c
@@ -41,9 +41,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "Const.h"
+#include "const.h"
 #include "sj3err.h"
-#include "sj_const.h"
 #include "sj_hinsi.h"
 
 #include "sj3lib.h"
diff --git a/sj3stat.c b/sj3stat.c
index 9204695..02a5138 100644
--- a/sj3stat.c
+++ b/sj3stat.c
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "Const.h"
+#include "const.h"
 #include "sj3err.h"
 #include "sj3lib.h"
 
diff --git a/sj_const.h b/sj_const.h
deleted file mode 100644
index 942d903..0000000
--- a/sj_const.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright (c) 1991-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: sj_const.h,v $  
- * $SonyRevision: 1.1 $ 
- * $SonyDate: 1994/06/03 08:01:01 $
- *
- * $Id$
- */
-
-
-
-#ifndef	_SJ_CONST_H_
-#define	_SJ_CONST_H_	1
-
-#include "sj_euc.h"
-
-
-#define	MATCH		0	
-#define	OVER		1	
-#define	PARTLY		2	
-#define	CONT		3	
-#define	UNDER		4	
-
-
-#ifndef FALSE
-#define	FALSE		0
-#define	TRUE		-1
-#endif /* FALSE */
-
-
-
-#define	AD_Done		0x0000	
-#define	AD_NotUserDict	0x0001	
-#define	AD_BadYomi	0x0002	
-#define	AD_BadKanji	0x0004	
-#define	AD_BadHinsi	0x0008	
-
-#define	AD_ArExist	0x0010	
-#define	AD_OvflwDouBlk	0x0020	
-#define	AD_OvflwDouNum	0x0040	
-#define	AD_OvflwUsrDic	0x0080	
-#define	AD_OvflwIndex	0x0100	
-
-#define	AD_NoMidasi	0x0010	
-#define	AD_NoHinsi	0x0020	
-#define	AD_NoKanji	0x0040	
-
-
-
-
-#define	C_WAKACHI	0x00		
-#define	C_MINASI	0x01		
-#define	C_BUNSETU	0x02		
-#define	C_DICT		0x03		
-#define	C_N_ARABIA	0x04		
-#define	C_N_ARACMA	0x05		
-#define	C_N_KAZU	0x06		
-#define	C_N_SUUJI	0x07		
-#define	C_N_NANSUU	0x08		
-#define	C_N_KANKURA	0x09		
-#define	C_N_ARAKURA	0x0a		
-#define	C_N_KAZULONG	0x0b		
-#define	C_N_KAZULCMA	0x0c		
-#define	C_N_SUUJILONG	0x0d		
-
-
-
-
-#define	JFLAG_N10	(1 << 15)	
-#define	JFLAG_N_1	(1 << 14)	
-#define	JFLAG_NS1	(1 << 13)	
-#define	JFLAG_N01	(1 << 12)	
-#define	JFLAG_N23	(1 << 11)	
-#define	JFLAG_NK2	(1 << 10)	
-#define	JFLAG_NK4	(1 << 9)	
-#define	JFLAG_NN0	(1 << 8)	
-#define	JFLAG_NSN	(1 << 7)	
-#define	JFLAG_KA	(1 << 0)	
-
-
-
-#define	DO_CLSTUDY	0x01	
-#define	DO_IKKATU	0x02	
-
-
-
-
-#define	K_DOUSHI	1	
-#define	K_YOUGEN	2	
-#define	K_TAIGEN	3	
-#define	K_FUKUSI	4	
-#define	K_RENTAISI	5	
-#define	K_SONOTA	6	
-
-
-
-
-
-
-#define EUC_a1          (Uchar)0xa1
-#define EUC_a2          (Uchar)0xa2
-#define EUC_a3          (Uchar)0xa3
-#define EUC_a4          (Uchar)0xa4
-#define EUC_a5          (Uchar)0xa5
-
-
-#define EUC_START       (Uchar)0xa1
-#define EUC_END         (Uchar)0xfe
-#define EUC_END_KIGOU   (Uchar)0xae
-#define EUC_0           (Uchar)0xb0
-#define EUC_END_0       (Uchar)0xb9
-#define EUC_A           (Uchar)0xc1
-#define EUC_END_A       (Uchar)0xda
-#define EUC_a           (Uchar)0xe1
-#define EUC_END_a       (Uchar)0xfa
-#define EUC_END_HIRA    (Uchar)0xf3
-#define EUC_VU          (Uchar)0xf4
-#define EUC_XKA         (Uchar)0xf5
-#define EUC_XKE         (Uchar)0xf6
-
-
-#define	isknj1(c)	(((c) == SS2) || (((c) & 0x80) && ((c) != SS3)))
-
-
-
-
-#define	SHU		0x01		
-#define	T_KANOU		0x80		
-#define	T_SHUUJO	0x40		
-
-
-
-#define	DICTOP  	0x01	
-#define	FZKTOP		0x02	
-#define	DEPEND		0x04	
-#define	NUMBER		0x08	
-#define	FZK_KGU  	0x10	
-#define	TAI_KGU		0x20	
-#define	BEFORNUM	0x40	
-#define	MIDNUM		0x80	
-#define	NOTNRM		0xFE	
-
-
-
-
-#define	CNJEND		0xff	
-#define	TYOUONFLG	0x80	
-
-
-
-
-#define	MAXFREC		32	
-#define	MAXFLVL		10	
-#define	FZKEND		0xff	
-
-
-
-#define	SETTOU_O	1	
-#define	SETTOU_GO	2	
-#define	SETTOU_DAI	3	
-#define	SETTOU_KIGOU	4	
-
-
-
-
-#define	NumKetaLength	16		
-#define	NumWordBuf	((NumKetaLength+3)/4)	
-
-
-#endif	/* _SJ_CONST_H_ */
diff --git a/sj_kcnv.h b/sj_kcnv.h
index 848407d..0036850 100644
--- a/sj_kcnv.h
+++ b/sj_kcnv.h
@@ -41,13 +41,12 @@
 #include <sys/param.h>
 #include "sj_typedef.h"
 #include "sj_rename.h"
-#include "sj_const.h"
 #include "sj_var.h"
 #include "sj_dict.h"
 #include "sj_study.h"
 #include "sj_table.h"
 #include "sj_struct.h"
-#include "Const.h"
+#include "const.h"
 #include "Struct.h"
 #include "sj_global.h"
 #include "sj_define.h"
diff --git a/sj_struct2.h b/sj_struct2.h
index a21a564..2d83c59 100644
--- a/sj_struct2.h
+++ b/sj_struct2.h
@@ -36,7 +36,7 @@
 
 
 
-#include "sj_const2.h"
+#include "const.h"
 
 #ifndef	_STRUCT_
 #define	_STRUCT_
diff --git a/skipkstr.c b/skipkstr.c
index 0d63dc3..a210036 100644
--- a/skipkstr.c
+++ b/skipkstr.c
@@ -27,19 +27,10 @@
  *
  */
 
-/*
- * $SonyRCSfile: skipkstr.c,v $  
- * $SonyRevision: 1.1 $ 
- * $SonyDate: 1994/06/03 08:02:25 $
- *
- * $Id$
- */
-
-
 #include "sj_euc.h"
 #include "sj_rename.h"
 #include "sj_typedef.h"
-#include "sj_const.h"
+#include "const.h"
 #include "sj_dict.h"
 #include "sj_table.h"
 #include "kanakan.h"
diff --git a/string2.c b/string2.c
index c0c6f95..0871bfb 100644
--- a/string2.c
+++ b/string2.c
@@ -27,18 +27,9 @@
  *
  */
 
-/*
- * $SonyRCSfile: string.c,v $  
- * $SonyRevision: 1.1 $ 
- * $SonyDate: 1994/06/03 08:00:45 $
- *
- * $id$
- */
-
-
 #include <stdio.h>
 #include <sys/types.h>
-#include "sj_const.h"
+#include "const.h"
 #include "dicttool.h"
 
 
diff --git a/suujitbl.c b/suujitbl.c
index ff42b40..bf95b4c 100644
--- a/suujitbl.c
+++ b/suujitbl.c
@@ -27,16 +27,7 @@
  *
  */
 
-/*
- * $SonyRCSfile: suujitbl.c,v $  
- * $SonyRevision: 1.1 $ 
- * $SonyDate: 1994/06/03 08:02:39 $
- */
-
-
-
-
-#include "sj_const.h"
+#include "const.h"
 #include "sj_rename.h"
 #include "sj_typedef.h"
 #include "sj_yomi.h"
diff --git a/termtbl.c b/termtbl.c
index c11f7b5..979bcdd 100644
--- a/termtbl.c
+++ b/termtbl.c
@@ -27,17 +27,9 @@
  *
  */
 
-/*
- * $SonyRCSfile: termtbl.c,v $  
- * $SonyRevision: 1.1 $ 
- * $SonyDate: 1994/06/03 08:02:42 $
- */
-
-
-
 #include "sj_rename.h"
 #include "sj_typedef.h"
-#include "sj_const.h"
+#include "const.h"
 #include "sj_prty.h"