patch-Wnn-conv-cvt_read.c

Index: Wnn/conv/cvt_read.c
===================================================================
RCS file: /home/cvs/private/hrs/freewnn/Wnn/conv/cvt_read.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -p -r1.1.1.1 -r1.2
--- Wnn/conv/cvt_read.c	20 Dec 2008 07:13:30 -0000	1.1.1.1
+++ Wnn/conv/cvt_read.c	20 Dec 2008 15:22:37 -0000	1.2
@@ -67,8 +67,8 @@
 /*
 #define NOFILE_NOT_ABORT
 */
- /* �����define���Ƥ����ȡ��Ѵ�ɽ��open�Ǥ��ʤ����˥��顼��λ������
-    ñ���Ѵ��ؿ��������ؿ��ˤʤ롣 */
+/* �����define���Ƥ����ȡ��Ѵ�ɽ��open�Ǥ��ʤ����˥��顼��λ������
+   ñ���Ѵ��ؿ��������ؿ��ˤʤ롣 */
 
 #define is_digit(x) (isascii(x) && isdigit(x))
 #define is_xdigit(x) (isascii(x) && isxdigit(x))
@@ -82,14 +82,13 @@
 
 #define ESCCHR  '\033'
 
- /*     convert_key ���Ѵ�ɽ�Υե�����̾�Υǥե���Ȥ򥻥åȡ�
-    �Ѵ�ɽ��̾������Ū�˻��ꤵ�줿�顢���줬�����ѿ����ͤˤʤ롣 */
+/*     convert_key ���Ѵ�ɽ�Υե�����̾�Υǥե���Ȥ򥻥åȡ�
+       �Ѵ�ɽ��̾������Ū�˻��ꤵ�줿�顢���줬�����ѿ����ͤˤʤ롣 */
 static char *convert_filename;
 static char default_cvt_fn[128];
 
 static FILE *convert_hyo;
 
-
  /** ���顼��å�������ɽ�� */
 #define errdsp1(mes, conv_fnm)                                          \
         fprintf(stderr, "%s: %s.\r\n%s = %s\r\n\n",                     \
@@ -132,11 +131,10 @@ static FILE *convert_hyo;
 
  /** ������c���ܤ˸�������ǰ��� */
 static void
-printcode (f, c)
-     FILE *f;
-     int c;
+printcode(FILE *f,
+	  int c)
 {
-  fprintf (f, (' ' <= c && c < '\177') ? "'%c'" : ((c & ~0xff) ? "0x%X" : "'\\%03o'"), c);
+	fprintf(f, (' ' <= c && c < '\177') ? "'%c'" : ((c & ~0xff) ? "0x%X" : "'\\%03o'"), c);
 }
 
 /*
@@ -145,58 +143,58 @@ char    **pterp;
 {�ѻ�}
 */
 
- /**    8��10��16�ʥ������ѤΥ���饯����ºݤΥ����ɤ�ľ�������ϤΥ����å���
-        ���ʤ������Ϥϱѿ����Ȳ��ꤷ�Ƥ���ˡ�*/
+/**    8��10��16�ʥ������ѤΥ���饯����ºݤΥ����ɤ�ľ�������ϤΥ����å���
+       ���ʤ������Ϥϱѿ����Ȳ��ꤷ�Ƥ���ˡ�*/
 static int
-charvalue (c)
-     char c;
+charvalue (char c)
 {
-  if (isupper (c))
-    return (c - 'A' + 10);
-  if (islower (c))
-    return (c - 'a' + 10);
-  return (c - '0');
-}
+	if (isupper(c))
+		return (c - 'A' + 10);
 
+	if (islower(c))
+		return (c - 'a' + 10);
+
+	return (c - '0');
+}
 
 #ifdef TERMCAP
 char *cvttbl_entry[] = {
-  "k0", "k1", "k2", "k3", "k4", "k5", "k6", "k7", "k8", "k9",
+	"k0", "k1", "k2", "k3", "k4", "k5", "k6", "k7", "k8", "k9",
 #ifdef SUPPORT_TWODIGIT_FUNCTIONS
-  "k;",
-  "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "FA",
-  "FB", "FC", "FD", "FE", "FF", "FG", "FH", "FI", "FJ", "FK",
-  "FL", "FM", "FN", "FO", "FP", "FQ", "FR", "FS", "FT", "FU",
-  "FV", "FW", "FX", "FY", "FZ", "Fa", "Fb", "Fc", "Fd", "Fe",
-  "Ff", "Fg", "Fh", "Fi", "Fj", "Fk", "Fl", "Fm", "Fn", "Fo",
-  "Fp", "Fq", "Fr",
+	"k;",
+	"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "FA",
+	"FB", "FC", "FD", "FE", "FF", "FG", "FH", "FI", "FJ", "FK",
+	"FL", "FM", "FN", "FO", "FP", "FQ", "FR", "FS", "FT", "FU",
+	"FV", "FW", "FX", "FY", "FZ", "Fa", "Fb", "Fc", "Fd", "Fe",
+	"Ff", "Fg", "Fh", "Fi", "Fj", "Fk", "Fl", "Fm", "Fn", "Fo",
+	"Fp", "Fq", "Fr",
 #endif                          /* SUPPORT_TWODIGIT_FUNCTIONS */
-  "ku", "kr", "kl", "kd", "kh",
-  "up", "ri", "le", "do", "ho",
-  "kb",
-  "!del",                       /* ���� */
+	"ku", "kr", "kl", "kd", "kh",
+	"up", "ri", "le", "do", "ho",
+	"kb",
+	"!del",                       /* ���� */
 };
 #endif /* TERMCAP */
 #ifdef TERMINFO
 char *cvttbl_entry[] = {
-  "kf0", "kf1", "kf2", "kf3", "kf4", "kf5", "kf6", "kf7",
-  "kf8", "kf9", "kf10",
+	"kf0", "kf1", "kf2", "kf3", "kf4", "kf5", "kf6", "kf7",
+	"kf8", "kf9", "kf10",
 #ifdef SUPPORT_TWODIGIT_FUNCTIONS
-  "kf11", "kf12", "kf13", "kf14", "kf15", "kf16", "kf17",
-  "kf18", "kf19", "kf20", "kf21", "kf22", "kf23", "kf24",
-  "kf25", "kf26", "kf27", "kf28", "kf29", "kf30", "kf31",
+	"kf11", "kf12", "kf13", "kf14", "kf15", "kf16", "kf17",
+	"kf18", "kf19", "kf20", "kf21", "kf22", "kf23", "kf24",
+	"kf25", "kf26", "kf27", "kf28", "kf29", "kf30", "kf31",
 #ifndef uniosu
-  "kf32", "kf33", "kf34", "kf35", "kf36", "kf37", "kf38",
-  "kf39", "kf40", "kf41", "kf42", "kf43", "kf44", "kf45",
-  "kf46", "kf47", "kf48", "kf49", "kf50", "kf51", "kf52",
-  "kf53", "kf54", "kf55", "kf56", "kf57", "kf58", "kf59",
-  "kf60", "kf61", "kf62", "kf63",
+	"kf32", "kf33", "kf34", "kf35", "kf36", "kf37", "kf38",
+	"kf39", "kf40", "kf41", "kf42", "kf43", "kf44", "kf45",
+	"kf46", "kf47", "kf48", "kf49", "kf50", "kf51", "kf52",
+	"kf53", "kf54", "kf55", "kf56", "kf57", "kf58", "kf59",
+	"kf60", "kf61", "kf62", "kf63",
 #endif
 #endif                          /* SUPPORT_TWODIGIT_FUNCTIONS */
-  "kcuu1", "kcuf1", "kcub1", "kcud1", "khome",
-  "kbs", "ktbc", "kclr", "kctab", "kdch1", "kdl1",
-  "krmir", "kel", "ked", "kich1", "kil1",
-  "kll", "knp", "kpp", "kind", "kri", "khts",
+	"kcuu1", "kcuf1", "kcub1", "kcud1", "khome",
+	"kbs", "ktbc", "kclr", "kctab", "kdch1", "kdl1",
+	"krmir", "kel", "ked", "kich1", "kil1",
+	"kll", "knp", "kpp", "kind", "kri", "khts",
 };
 #endif /* TERMINFO */
 
@@ -208,494 +206,496 @@ char tdataarea[AREASIZE];       /* �ǡ��
 
 struct CONVCODE tbl[CVTTBLSIZ];
 int cnv_tbl_cnt;                /* convert table count */
- /* �����ϸ��� convert_key.c���static�ѿ����ä� */
+/* �����ϸ��� convert_key.c���static�ѿ����ä� */
 
- /** ����С���ɽ�Υ���ȥ���ʬ��Ȥ롣����������Ĺ��Ķ������0���֤� */
+/** ����С���ɽ�Υ���ȥ���ʬ��Ȥ롣����������Ĺ��Ķ������0���֤� */
 static int
-get_entrynm (buf)
-     char *buf;
+get_entrynm(char *buf)
 {
-  int i, c;
+	int i, c;
 
-  for (i = 0; i <= ENTRY_LEN; i++)
-    {
-      c = getc (convert_hyo);
-      if (is_eofsp (c))
-        {
-          ungetc (c, convert_hyo);
-          *buf = '\0';
-          return (1);
-        }
-      else
-        *buf++ = c;
-    }
-  return (0);
+	for (i = 0; i <= ENTRY_LEN; i++) {
+		c = getc(convert_hyo);
+
+		if (is_eofsp(c)) {
+			ungetc(c, convert_hyo);
+			*buf = '\0';
+			return (1);
+		} else
+			*buf++ = c;
+	}
+
+	return (0);
 }
 
  /** ����ʲ���ʸ��������ˤ�ȤФ��Ƽ���ʸ�����֤� */
 static int
-blank_ign_getc (f)
-     FILE *f;
+blank_ign_getc(FILE *f)
 {
-  int c;
+	int c;
+
+	while (c = getc(f),
+	       is_space(c) && c != '\n');
 
-  while (c = getc (f), is_space (c) && c != '\n');
-  return (c);
+	return (c);
 }
 
- /** ����������EOF�ˤޤ����Ф������δ֤������ʸ�������ä�����0���֤���*/
+/** ����������EOF�ˤޤ����Ф������δ֤������ʸ�������ä�����0���֤���*/
 static int
-linepass (f)
-     FILE *f;
+linepass(FILE *f)
 {
-  int c, flg = 0;
+	int c, flg = 0;
 
-  while (c = getc (f), !is_eofnl (c))
-    flg = (flg || !is_space (c));
-  return (flg);
+	while (c = getc(f), !is_eofnl(c))
+		flg = (flg || !is_space(c));
+
+	return (flg);
 }
 
- /** ����ȥ����륳���ɷ����Υ�����ɽ����ʸ��ʬ��Ȥ롣���顼����������͡�0*/
+/** ����ȥ����륳���ɷ����Υ�����ɽ����ʸ��ʬ��Ȥ롣���顼����������͡�0*/
 static int
-get_ctrl (cptr)
-     int *cptr;
+get_ctrl(int *cptr)
 {
-  int c;
+	int c;
+
+	if (!(' ' <= (c = getc(convert_hyo))
+	      && c < '\177'))
+		return (1);
+
+	*cptr = (c == '?' ? '\177' : c & 0x1f);
 
-  if (!(' ' <= (c = getc (convert_hyo)) && c < '\177'))
-    return (1);
-  *cptr = (c == '?' ? '\177' : c & 0x1f);
-  return (0);
+	return (0);
 }
 
  /** �Хå�����å�������Υ�����ɽ����ʸ��ʬ��Ȥ롣���顼���������0���֤�*/
 static int
-get_bcksla (cptr)
-     int *cptr;
+get_bcksla(int *cptr)
 {
-  int c, code = 0, digflg = 0;
+	int c, code = 0, digflg = 0;
 
-  switch (c = getc (convert_hyo))
-    {
-    case 'n':
-      *cptr = '\n';
-      return (0);
-    case 't':
-      *cptr = '\t';
-      return (0);
-    case 'b':
-      *cptr = '\b';
-      return (0);
-    case 'r':
-      *cptr = '\r';
-      return (0);
-    case 'f':
-      *cptr = '\f';
-      return (0);
-    case 'e':
-    case 'E':
-      *cptr = ESCCHR;
-      return (0);
-    case 'o':
-      while (c = getc (convert_hyo), is_octal (c))
-        {
-          code <<= 3;
-          code += charvalue (c);
-          digflg = 1;
-        }
-      ungetc (c, convert_hyo);
-      *cptr = code;
-      return (digflg == 0);
-    case 'd':
-      while (c = getc (convert_hyo), is_digit (c))
-        {
-          code *= 10;
-          code += charvalue (c);
-          digflg = 1;
-        }
-      ungetc (c, convert_hyo);
-      *cptr = code;
-      return (digflg == 0);
-    case 'x':
-      while (c = getc (convert_hyo), is_xdigit (c))
-        {
-          code <<= 4;
-          code += charvalue (c);
-          digflg = 1;
-        }
-      ungetc (c, convert_hyo);
-      *cptr = code;
-      return (digflg == 0);
-    default:
-      if (is_octal (c))
-        {
-          code = charvalue (c);
-          while (c = getc (convert_hyo), is_octal (c))
-            {
-              code <<= 3;
-              code += charvalue (c);
-            }
-          ungetc (c, convert_hyo);
-          *cptr = code;
-          return (0);
-        }
-      else
-        {
-          *cptr = c;
-          return (0);
-        }
-    }
+	switch (c = getc(convert_hyo)) {
+	case 'n':
+		*cptr = '\n';
+		return (0);
+	case 't':
+		*cptr = '\t';
+		return (0);
+	case 'b':
+		*cptr = '\b';
+		return (0);
+	case 'r':
+		*cptr = '\r';
+		return (0);
+	case 'f':
+		*cptr = '\f';
+		return (0);
+	case 'e':
+	case 'E':
+		*cptr = ESCCHR;
+		return (0);
+	case 'o':
+		while (c = getc(convert_hyo), is_octal(c)) {
+			code <<= 3;
+			code += charvalue(c);
+			digflg = 1;
+		}
+		ungetc(c, convert_hyo);
+		*cptr = code;
+		return (digflg == 0);
+	case 'd':
+		while (c = getc(convert_hyo), is_digit(c)) {
+			code *= 10;
+			code += charvalue(c);
+			digflg = 1;
+		}
+
+		ungetc(c, convert_hyo);
+		*cptr = code;
+		return (digflg == 0);
+	case 'x':
+		while (c = getc(convert_hyo), is_xdigit(c)) {
+			code <<= 4;
+			code += charvalue(c);
+			digflg = 1;
+		}
+		ungetc(c, convert_hyo);
+		*cptr = code;
+		return (digflg == 0);
+	default:
+		if (is_octal(c)) {
+			code = charvalue(c);
+			while (c = getc(convert_hyo), is_octal(c)) {
+				code <<= 3;
+				code += charvalue(c);
+			}
+			ungetc(c, convert_hyo);
+			*cptr = code;
+			return (0);
+		} else {
+			*cptr = c;
+			return (0);
+		}
+	}
 }
 
- /**    ������ɽ����Ȥäơ�cptr�λؤ���ˤ��Υ����ɤ�����롣
-        ʸˡ���顼ȯ��������0���֤���*/
+/**    ������ɽ����Ȥäơ�cptr�λؤ���ˤ��Υ����ɤ�����롣
+       ʸˡ���顼ȯ��������0���֤���*/
 static int
-get_code (cptr)
-     int *cptr;
+get_code(int *cptr)
 {
-  int c;
+	int c;
 
-  switch (c = getc (convert_hyo))
-    {
-    case '\\':
-      return (get_bcksla (cptr));
-    case '^':
-      return (get_ctrl (cptr));
-    default:
-      *cptr = c;
-      return (0);
-    }
+	switch (c = getc(convert_hyo)) {
+	case '\\':
+		return (get_bcksla(cptr));
+	case '^':
+		return (get_ctrl(cptr));
+	default:
+		*cptr = c;
+		return (0);
+	}
 }
 
 #ifdef TERMCAP
- /**    tgetstr��Ʊ���δؿ���â��������ȥ�̾��!del�ס�DEL�������Ѵ��򤹤뤿��
-        ����Ū���ɲä��Ƥ��륨��ȥ�ˤ��Ф��Ƥϡ���ʸ����"\177"���֤���*/
+/**    tgetstr��Ʊ���δؿ���â��������ȥ�̾��!del�ס�DEL�������Ѵ��򤹤뤿��
+       ����Ū���ɲä��Ƥ��륨��ȥ�ˤ��Ф��Ƥϡ���ʸ����"\177"���֤���*/
 static char *
-my_tgetstr (name, ptr)
-     char *name, **ptr;
+my_tgetstr(char *name,
+	   char **ptr)
 {
-  extern char *tgetstr ();
-  static char *del = "\177";
+	extern char *tgetstr ();
+	static char *del = "\177";
 
-  if (strcmp (name, "!del") == 0)
-    return (del);
-  return (tgetstr (name, ptr));
+	if (strcmp(name, "!del") == 0)
+		return (del);
+
+	return (tgetstr(name, ptr));
 }
 #endif
 
 #ifdef TERMINFO
- /**    pp1�λؤ��Ƥ��륨�ꥢ��p2�����Ƥ����줿�塢pp1�Υݥ��󥿤�ʤ�Ƥ���*/
+/**    pp1�λؤ��Ƥ��륨�ꥢ��p2�����Ƥ����줿�塢pp1�Υݥ��󥿤�ʤ�Ƥ���*/
 static char *
-stradd (pp1, p2)
-     char **pp1, *p2;
+stradd(char **pp1, char *p2)
 {
-  if (p2 != NULL)
-    {
-      strcpy (*pp1, p2);
-      (*pp1) += strlen (p2 = *pp1) + 1;
-    }
-  return (p2);
+	if (p2 != NULL) {
+		strcpy(*pp1, p2);
+		(*pp1) += strlen(p2 = *pp1) + 1;
+	}
+
+	return (p2);
 }
 #endif
 
  /** termcap/info�����ɤ�������Υǡ��������ѥ��ꥢ�˥��ԡ���*/
 static void
-convert_getstrs (flg)
-     int flg;                   /* verbose�⡼�ɤǵ��������Υե饰�ʺ��νꤽ���������������
-                                   ��ĥ�����뤫�⤷��ʤ��Τǡ�1��0��Ϳ���Ʋ����������Υե�����
-                                   ��Ρ�̾����convert_�ǻϤޤ�¾�δؿ��Ǥ�Ʊ���Ǥ��� */
+convert_getstrs(int flg)
+/* verbose�⡼�ɤǵ��������Υե饰�ʺ��νꤽ���������������
+   ��ĥ�����뤫�⤷��ʤ��Τǡ�1��0��Ϳ���Ʋ����������Υե�����
+   ��Ρ�̾����convert_�ǻϤޤ�¾�δؿ��Ǥ�Ʊ���Ǥ��� */
 {
-  char *tdataptr;
-  int i;
+	char *tdataptr;
+	int i;
 
-  tdataptr = tdataarea;
+	tdataptr = tdataarea;
 
 #ifdef TERMCAP
-  for (i = 0; i < ENTRY_CNT; i++)
-    keydef_key[i] = my_tgetstr (cvttbl_entry[i], &tdataptr);
+	for (i = 0; i < ENTRY_CNT; i++)
+		keydef_key[i] = my_tgetstr(cvttbl_entry[i], &tdataptr);
   /* keydef_key[i] ���ͤϡ�NULL����tdataarea���ϰ���Ȥϸ¤�ʤ���
      "\177"�ʤɤ��ü�ǡ�����ؤ����Ȥ⤢�롣 */
 
-  if (flg)
-    fprintf (stderr, "convert_key: finished getting TERMCAP.\r\n");
+	if (flg)
+		fprintf (stderr, "convert_key: finished getting TERMCAP.\r\n");
 #endif
 
 #ifdef TERMINFO
-  i = 0;
-  keydef_key[i++] = stradd (&tdataptr, key_f0);
-  keydef_key[i++] = stradd (&tdataptr, key_f1);
-  keydef_key[i++] = stradd (&tdataptr, key_f2);
-  keydef_key[i++] = stradd (&tdataptr, key_f3);
-  keydef_key[i++] = stradd (&tdataptr, key_f4);
-  keydef_key[i++] = stradd (&tdataptr, key_f5);
-  keydef_key[i++] = stradd (&tdataptr, key_f6);
-  keydef_key[i++] = stradd (&tdataptr, key_f7);
-  keydef_key[i++] = stradd (&tdataptr, key_f8);
-  keydef_key[i++] = stradd (&tdataptr, key_f9);
-  keydef_key[i++] = stradd (&tdataptr, key_f10);
+	i = 0;
+	keydef_key[i++] = stradd(&tdataptr, key_f0);
+	keydef_key[i++] = stradd(&tdataptr, key_f1);
+	keydef_key[i++] = stradd(&tdataptr, key_f2);
+	keydef_key[i++] = stradd(&tdataptr, key_f3);
+	keydef_key[i++] = stradd(&tdataptr, key_f4);
+	keydef_key[i++] = stradd(&tdataptr, key_f5);
+	keydef_key[i++] = stradd(&tdataptr, key_f6);
+	keydef_key[i++] = stradd(&tdataptr, key_f7);
+	keydef_key[i++] = stradd(&tdataptr, key_f8);
+	keydef_key[i++] = stradd(&tdataptr, key_f9);
+	keydef_key[i++] = stradd(&tdataptr, key_f10);
 #ifdef SUPPORT_TWODIGIT_FUNCTIONS
-  keydef_key[i++] = stradd (&tdataptr, key_f11);
-  keydef_key[i++] = stradd (&tdataptr, key_f12);
-  keydef_key[i++] = stradd (&tdataptr, key_f13);
-  keydef_key[i++] = stradd (&tdataptr, key_f14);
-  keydef_key[i++] = stradd (&tdataptr, key_f15);
-  keydef_key[i++] = stradd (&tdataptr, key_f16);
-  keydef_key[i++] = stradd (&tdataptr, key_f17);
-  keydef_key[i++] = stradd (&tdataptr, key_f18);
-  keydef_key[i++] = stradd (&tdataptr, key_f19);
-  keydef_key[i++] = stradd (&tdataptr, key_f20);
-  keydef_key[i++] = stradd (&tdataptr, key_f21);
-  keydef_key[i++] = stradd (&tdataptr, key_f22);
-  keydef_key[i++] = stradd (&tdataptr, key_f23);
-  keydef_key[i++] = stradd (&tdataptr, key_f24);
-  keydef_key[i++] = stradd (&tdataptr, key_f25);
-  keydef_key[i++] = stradd (&tdataptr, key_f26);
-  keydef_key[i++] = stradd (&tdataptr, key_f27);
-  keydef_key[i++] = stradd (&tdataptr, key_f28);
-  keydef_key[i++] = stradd (&tdataptr, key_f29);
-  keydef_key[i++] = stradd (&tdataptr, key_f30);
-  keydef_key[i++] = stradd (&tdataptr, key_f31);
+	keydef_key[i++] = stradd(&tdataptr, key_f11);
+	keydef_key[i++] = stradd(&tdataptr, key_f12);
+	keydef_key[i++] = stradd(&tdataptr, key_f13);
+	keydef_key[i++] = stradd(&tdataptr, key_f14);
+	keydef_key[i++] = stradd(&tdataptr, key_f15);
+	keydef_key[i++] = stradd(&tdataptr, key_f16);
+	keydef_key[i++] = stradd(&tdataptr, key_f17);
+	keydef_key[i++] = stradd(&tdataptr, key_f18);
+	keydef_key[i++] = stradd(&tdataptr, key_f19);
+	keydef_key[i++] = stradd(&tdataptr, key_f20);
+	keydef_key[i++] = stradd(&tdataptr, key_f21);
+	keydef_key[i++] = stradd(&tdataptr, key_f22);
+	keydef_key[i++] = stradd(&tdataptr, key_f23);
+	keydef_key[i++] = stradd(&tdataptr, key_f24);
+	keydef_key[i++] = stradd(&tdataptr, key_f25);
+	keydef_key[i++] = stradd(&tdataptr, key_f26);
+	keydef_key[i++] = stradd(&tdataptr, key_f27);
+	keydef_key[i++] = stradd(&tdataptr, key_f28);
+	keydef_key[i++] = stradd(&tdataptr, key_f29);
+	keydef_key[i++] = stradd(&tdataptr, key_f30);
+	keydef_key[i++] = stradd(&tdataptr, key_f31);
 #endif /* SUPPORT_TWODIGIT_FUNCTIONS */
 /* �ʲ����
-        "kcuu1", "kcuf1", "kcub1", "kcud1", "khome",
-        "kbs", "ktbc", "kclr", "kctab", "kdch1", "kdl1",
-        "krmir", "kel", "ked", "kich1", "kil1",
-        "kll", "knp", "kpp", "kind", "kri", "khts",
+   "kcuu1", "kcuf1", "kcub1", "kcud1", "khome",
+   "kbs", "ktbc", "kclr", "kctab", "kdch1", "kdl1",
+   "krmir", "kel", "ked", "kich1", "kil1",
+   "kll", "knp", "kpp", "kind", "kri", "khts",
 */
-  keydef_key[i++] = stradd (&tdataptr, key_up);
-  keydef_key[i++] = stradd (&tdataptr, key_right);
-  keydef_key[i++] = stradd (&tdataptr, key_left);
-  keydef_key[i++] = stradd (&tdataptr, key_down);
-  keydef_key[i++] = stradd (&tdataptr, key_home);
-  keydef_key[i++] = stradd (&tdataptr, key_backspace);
-  keydef_key[i++] = stradd (&tdataptr, key_catab);
-  keydef_key[i++] = stradd (&tdataptr, key_clear);
-  keydef_key[i++] = stradd (&tdataptr, key_ctab);
-  keydef_key[i++] = stradd (&tdataptr, key_dc);
-  keydef_key[i++] = stradd (&tdataptr, key_dl);
-  keydef_key[i++] = stradd (&tdataptr, key_eic);
-  keydef_key[i++] = stradd (&tdataptr, key_eol);
-  keydef_key[i++] = stradd (&tdataptr, key_eos);
-  keydef_key[i++] = stradd (&tdataptr, key_ic);
-  keydef_key[i++] = stradd (&tdataptr, key_il);
-  keydef_key[i++] = stradd (&tdataptr, key_ll);
-  keydef_key[i++] = stradd (&tdataptr, key_npage);
-  keydef_key[i++] = stradd (&tdataptr, key_ppage);
-  keydef_key[i++] = stradd (&tdataptr, key_sf);
-  keydef_key[i++] = stradd (&tdataptr, key_sr);
-  keydef_key[i++] = stradd (&tdataptr, key_stab);
-
-  if (flg)
-    fprintf (stderr, "convert_key: finished getting TERMINFO.\r\n");
+	keydef_key[i++] = stradd(&tdataptr, key_up);
+	keydef_key[i++] = stradd(&tdataptr, key_right);
+	keydef_key[i++] = stradd(&tdataptr, key_left);
+	keydef_key[i++] = stradd(&tdataptr, key_down);
+	keydef_key[i++] = stradd(&tdataptr, key_home);
+	keydef_key[i++] = stradd(&tdataptr, key_backspace);
+	keydef_key[i++] = stradd(&tdataptr, key_catab);
+	keydef_key[i++] = stradd(&tdataptr, key_clear);
+	keydef_key[i++] = stradd(&tdataptr, key_ctab);
+	keydef_key[i++] = stradd(&tdataptr, key_dc);
+	keydef_key[i++] = stradd(&tdataptr, key_dl);
+	keydef_key[i++] = stradd(&tdataptr, key_eic);
+	keydef_key[i++] = stradd(&tdataptr, key_eol);
+	keydef_key[i++] = stradd(&tdataptr, key_eos);
+	keydef_key[i++] = stradd(&tdataptr, key_ic);
+	keydef_key[i++] = stradd(&tdataptr, key_il);
+	keydef_key[i++] = stradd(&tdataptr, key_ll);
+	keydef_key[i++] = stradd(&tdataptr, key_npage);
+	keydef_key[i++] = stradd(&tdataptr, key_ppage);
+	keydef_key[i++] = stradd(&tdataptr, key_sf);
+	keydef_key[i++] = stradd(&tdataptr, key_sr);
+	keydef_key[i++] = stradd(&tdataptr, key_stab);
+	
+	if (flg)
+		fprintf(stderr, "convert_key: finished getting TERMINFO.\r\n");
 #endif
 }
 
- /**    TERMINFO �ξ��� setupterm()��TERMCAP�ξ��� tgetent()�ν�����Ԥä�
-        �塢������ȯ�����륷�����󥹤Υǡ��������ѤΥ��ꥢ�˥��ԡ����롣
-        termcap/info�Υǡ����١����������ץ�Ǥ��ʤ��ä�����0���֤���*/
+/**    TERMINFO �ξ��� setupterm()��TERMCAP�ξ��� tgetent()�ν�����Ԥä�
+       �塢������ȯ�����륷�����󥹤Υǡ��������ѤΥ��ꥢ�˥��ԡ����롣
+       termcap/info�Υǡ����١����������ץ�Ǥ��ʤ��ä�����0���֤���*/
 #ifdef TERMCAP
 int
-convert_getterm (termname, flg)
-     char *termname;
-     int flg;
-{
-  extern int tgetent ();
-  char tcaparea[AREASIZE];
-
-  if (flg)
-    fprintf (stderr, "convert_key: using TERMCAP entry %s...\r\n", termname);
-  if (tgetent (tcaparea, termname) <= 0)
-    {
-      errdsp2 ("Can't get termcap entry", termname);
-      return (1);
-    }
-  convert_getstrs (flg);
-  return (0);
+convert_getterm(char *termname,
+		int flg)
+{
+	extern int tgetent ();
+	char tcaparea[AREASIZE];
+
+	if (flg)
+		fprintf(stderr, "convert_key: using TERMCAP entry %s...\r\n",
+			 termname);
+
+	if (tgetent(tcaparea, termname) <= 0) {
+		errdsp2("Can't get termcap entry", termname);
+		return (1);
+	}
+
+	convert_getstrs(flg);
+
+	return (0);
 }
 #endif
 #ifdef TERMINFO
 int
-convert_getterm (termname, flg)
-     char *termname;
-     int flg;
-{
-  int fd, rsl;
-
-  if (flg)
-    fprintf (stderr, "convert_key: using TERMINFO entry %s...\r\n", termname);
-  fd = open ("/dev/null", O_WRONLY, 0);
-  setupterm (termname, fd, &rsl);
-  close (fd);
-  if (rsl != 1)
-    {
-      errdsp2 ("Can't get terminfo entry", termname);
-      /* ���ΤȤ�resetterm()��ɬ�פ��� */
-      return (1);
-    }
-  convert_getstrs (flg);
-  resetterm ();
-  return (0);
+convert_getterm(char *termname,
+		int flg)
+{
+	int fd, rsl;
+
+	if (flg)
+		fprintf (stderr,
+			 "convert_key: using TERMINFO entry %s...\r\n",
+			 termname);
+
+	fd = open("/dev/null", O_WRONLY, 0);
+	setupterm(termname, fd, &rsl);
+	close (fd);
+
+	if (rsl != 1) {
+		errdsp2("Can't get terminfo entry", termname);
+		/* ���ΤȤ�resetterm()��ɬ�פ��� */
+		return (1);
+	}
+
+	convert_getstrs(flg);
+	resetterm();
+	return (0);
 }
 #endif
 
- /**    termcap/info�����ä������Υǡ������������ѥ��ꥢ�˼��ޤäƤ����
-        ���ơ������Ȥä�convert_key�����ν�����򤹤롣���ͤ����ｪλ��0��
-        ɽ�ɤ߹��߻���Warning��ȯ��������1��Error�򸡽Ф����Ȥ�-1��*/
+/**    termcap/info�����ä������Υǡ������������ѥ��ꥢ�˼��ޤäƤ����
+       ���ơ������Ȥä�convert_key�����ν�����򤹤롣���ͤ����ｪλ��0��
+       ɽ�ɤ߹��߻���Warning��ȯ��������1��Error�򸡽Ф����Ȥ�-1��*/
 int
-convert_key_setup (filename, flg)
-     char *filename;
-     int flg;
-{
-  register int i;
-  int c, d, cnt = 0, warn_occur = 0, entry_found;
-  char name[ENTRY_LEN + 1];
-
-  int keydef_code[ENTRY_CNT];   /* convert code */
-
-  if (CHANGE_MAX < div_up (ENTRY_CNT, BITSIZ))
-    {
-      fprintf (stderr, "%s%s%d%s", "Sorry, please set CHANGE_MAX(in file ", "conv/cvt_head.h) larger than ", div_up (ENTRY_CNT, BITSIZ) - 1, ",\r\nand recompile.\r\n");
-      return (-1);
-    }
-
-  for (i = 0; i < ENTRY_CNT; i++)
-    keydef_code[i] = -1;
-  /* code�� -1 �Τޤޤʤ顢convert_keyɽ�˥���ȥ꤬�ʤ����Ȥ򼨤��� */
-
-  if (NULL != filename)
-    convert_filename = filename;
-  else
-    {
-      convert_filename = default_cvt_fn;
+convert_key_setup(char *filename,
+		  int flg)
+{
+	register int i;
+	int c, d, cnt = 0, warn_occur = 0, entry_found;
+	char name[ENTRY_LEN + 1];
+
+	int keydef_code[ENTRY_CNT];   /* convert code */
+
+	if (CHANGE_MAX < div_up (ENTRY_CNT, BITSIZ)) {
+		fprintf (stderr, "%s%s%d%s",
+			 "Sorry, please set CHANGE_MAX(in file ",
+			 "conv/cvt_head.h) larger than ",
+			 div_up (ENTRY_CNT, BITSIZ) - 1,
+			 ",\r\nand recompile.\r\n");
+		return (-1);
+	}
+
+	for (i = 0; i < ENTRY_CNT; i++)
+		keydef_code[i] = -1;
+	/* code�� -1 �Τޤޤʤ顢convert_keyɽ�˥���ȥ꤬�ʤ����Ȥ򼨤��� */
+
+	if (NULL != filename)
+		convert_filename = filename;
+	else {
+		convert_filename = default_cvt_fn;
 #ifdef  WNNDEFAULT
-      strcpy (convert_filename, LIBDIR);        /* /usr/local/lib/wnn */
-      strcat (convert_filename, CONVERT_FILENAME);      /* /cvt_key_tbl */
+		strcpy(convert_filename, LIBDIR);        /* /usr/local/lib/wnn */
+		strcat(convert_filename, CONVERT_FILENAME);      /* /cvt_key_tbl */
 #else
-      strcpy (convert_filename, CONVERT_FILENAME);
+		strcpy(convert_filename, CONVERT_FILENAME);
 #endif /* WNNDEFAULT */
-    }
-  if (flg)
-    fprintf (stderr, "convert_key: using convert_key table %s...\r\n", convert_filename);
-  if (NULL == (convert_hyo = fopen (convert_filename, "r")))
-    {
+	}
+
+	if (flg)
+		fprintf (stderr, "convert_key: using convert_key table %s...\r\n",
+			 convert_filename);
+
+	if (NULL == (convert_hyo = fopen(convert_filename, "r"))) {
 #ifdef NOFILE_NOT_ABORT
-      warn1 (convert_filename);
-      cnv_tbl_cnt = 0;
-      return (1);
+		warn1(convert_filename);
+		cnv_tbl_cnt = 0;
+		return (1);
 #else
-      errdsp1 ("Convert-table file is not found", convert_filename);
-      return (-1);
+		errdsp1("Convert-table file is not found",
+			convert_filename);
+		return (-1);
 #endif
-    }
+	}
 
-  /* ɽ������ɤߤ��� */
-  while (EOF != (d = getc (convert_hyo)))
-    {
-      if (d == '#' || d == ';')
-        {
-          /* '#'����';'�ǻϤޤ�Ԥ�����Ȥ����ɤ����Ф��� */
-          linepass (convert_hyo);
-          continue;
-        }
-      ungetc (d, convert_hyo);
-
-      d = blank_ign_getc (convert_hyo);
-      if (is_eofnl (d))
-        continue;               /* ���� */
-      else
-        ungetc (d, convert_hyo);
-      if (!get_entrynm (name))
-        {
-          errdsp1 ("Entry name too long", convert_filename);
-          fclose (convert_hyo);
-          return (-1);
-        }                       /* ����ȥ�̾���ɤ߹������ */
-
-      d = blank_ign_getc (convert_hyo);
-      if (is_eofnl (d))
-        {
-          errdsp1 ("Convert code missing", convert_filename);
-          fclose (convert_hyo);
-          return (-1);
-        }
-      else
-        ungetc (d, convert_hyo);
-      if (get_code (&c) != 0 || linepass (convert_hyo) != 0)
-        {
-          errdsp1 ("Convert code illegal", convert_filename);
-          fclose (convert_hyo);
-          return (-1);
-        }                       /* �Ѵ������ɤ��ɤ߹������ */
+	/* ɽ������ɤߤ��� */
+	while (EOF != (d = getc(convert_hyo))) {
+		if (d == '#' || d == ';') {
+			/* '#'����';'�ǻϤޤ�Ԥ�����Ȥ����ɤ����Ф��� */
+			linepass(convert_hyo);
+			continue;
+		}
+
+		ungetc(d, convert_hyo);
+
+		d = blank_ign_getc(convert_hyo);
+
+		if (is_eofnl(d))
+			/* ���� */
+			continue;
+		else
+			ungetc(d, convert_hyo);
+
+		if (!get_entrynm(name)) {
+			errdsp1("Entry name too long",
+				convert_filename);
+			fclose(convert_hyo);
+			return (-1);
+		}
+		/* ����ȥ�̾���ɤ߹������ */
+
+		d = blank_ign_getc(convert_hyo);
+
+		if (is_eofnl(d)) {
+			errdsp1("Convert code missing",
+				convert_filename);
+			fclose (convert_hyo);
+			return (-1);
+		} else
+			ungetc(d, convert_hyo);
+
+		if (get_code(&c) != 0
+		    || linepass(convert_hyo) != 0) {
+			errdsp1("Convert code illegal", convert_filename);
+			fclose(convert_hyo);
+			return (-1);
+		}
+		/* �Ѵ������ɤ��ɤ߹������ */
 #ifdef DEBUG
-      printf ("%s %d\n", name, c);
+		printf("%s %d\n", name, c);
 #endif
-      for (entry_found = i = 0; i < ENTRY_CNT; i++)
-        {
-          if (!strcmp (cvttbl_entry[i], name))
-            {
-              if (keydef_code[i] != -1)
-                {
-                  warn2 (name, convert_filename);
-                  warn_occur = 1;
-                }
-              keydef_code[i] = c;
-              entry_found = 1;
-              break;
-            }
-        }
-      if (!entry_found)
-        {
-          warn3 (name, convert_filename);
-          warn_occur = 1;
-        }
-    }
-
-  /* �ɤߤ�����ǡ�����ơ��֥�˥��å� */
-  for (i = 0; i < ENTRY_CNT; i++)
-    {
-      if (keydef_key[i] != NULL)
-        {
-          if (keydef_code[i] != -1 && ((int) strlen (keydef_key[i]) > 1 || *keydef_key[i] != keydef_code[i]))
-            {
-              tbl[cnt].fromkey = keydef_key[i];
-              tbl[cnt++].tokey = keydef_code[i];
-            }
-        }
-      else if (keydef_code[i] != -1)
-        {
-          warn4 (cvttbl_entry[i], convert_filename, keydef_code[i]);
-          warn_occur = 1;
-        }
-    }
-
-  cnv_tbl_cnt = cnt;
-  fclose (convert_hyo);
-  if (flg)
-    fprintf (stderr, "convert_key: finished setting up.\r\n");
-  return (warn_occur);
-}
-
- /**    convert_key����������롼����TERMINFO �ξ��� setupterm()��TERMCAP��
-        ���� tgetent()�򤽤줾�쥳���뤷����˸Ƥ֡����ͤ�convert_key_setup
-        ���ȡ�*/
+		for (entry_found = i = 0; i < ENTRY_CNT; i++) {
+			if (!strcmp(cvttbl_entry[i], name)) {
+				if (keydef_code[i] != -1) {
+					warn2(name, convert_filename);
+					warn_occur = 1;
+				}
+				keydef_code[i] = c;
+				entry_found = 1;
+				break;
+			}
+		}
+
+		if (!entry_found) {
+			warn3(name, convert_filename);
+			warn_occur = 1;
+		}
+	}
+
+	/* �ɤߤ�����ǡ�����ơ��֥�˥��å� */
+
+	for (i = 0; i < ENTRY_CNT; i++) {
+		if (keydef_key[i] != NULL) {
+			if (keydef_code[i] != -1
+			    && ((int)strlen(keydef_key[i]) > 1
+				|| *keydef_key[i] != keydef_code[i])) {
+				tbl[cnt].fromkey = keydef_key[i];
+				tbl[cnt++].tokey = keydef_code[i];
+			}
+		} else if (keydef_code[i] != -1) {
+			warn4 (cvttbl_entry[i], convert_filename, keydef_code[i]);
+			warn_occur = 1;
+		}
+	}
+
+	cnv_tbl_cnt = cnt;
+	fclose(convert_hyo);
+
+	if (flg)
+		fprintf(stderr, "convert_key: finished setting up.\r\n");
+
+	return (warn_occur);
+}
+
+/**    convert_key����������롼����TERMINFO �ξ��� setupterm()��TERMCAP��
+       ���� tgetent()�򤽤줾�쥳���뤷����˸Ƥ֡����ͤ�convert_key_setup
+       ���ȡ�*/
 int
-convert_key_init (filename, flg)
-     char *filename;
-     int flg;
+convert_key_init (char *filename,
+		  int flg)
 {
-  convert_getstrs (flg);
-  return (convert_key_setup (filename, flg));
+	convert_getstrs (flg);
+	return (convert_key_setup (filename, flg));
 }
 
- /**    TERMINFO �ξ��� setupterm()��TERMCAP�ξ��� tgetent()�ޤǴޤ�Ƽ¹�
-        convert_key����������롼�����֤��ͤ�convert_key_setup���ȡ�â����
-        termcap/info���ɤ߹��ߤ˼��Ԥ������ϡ�-2���֤롣*/
+/**    TERMINFO �ξ��� setupterm()��TERMCAP�ξ��� tgetent()�ޤǴޤ�Ƽ¹�
+       convert_key����������롼�����֤��ͤ�convert_key_setup���ȡ�â����
+       termcap/info���ɤ߹��ߤ˼��Ԥ������ϡ�-2���֤롣*/
 int
-convert_getterm_init (termname, filename, flg)
-     char *termname, *filename;
-     int flg;
-{
-  if (convert_getterm (termname, flg) != 0)
-    return (-2);
-  return (convert_key_setup (filename, flg));
+convert_getterm_init (char *termname,
+		      char *filename,
+		      int flg)
+{
+	if (convert_getterm (termname, flg) != 0)
+		return (-2);
+
+	return (convert_key_setup (filename, flg));
 }