svnno****@sourc*****
svnno****@sourc*****
2012年 1月 21日 (土) 19:12:28 JST
Tera TermRevision: 4797
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4797
Author: yutakapon
Date: 2012-01-21 19:12:28 +0900 (Sat, 21 Jan 2012)
Log Message:
-----------
kermit.log
- 末尾の16進ダンプが正しく表示できるようにした。
- packet formatのMARK(CTRL-A) も表示するようにした。
Modified Paths:
--------------
trunk/teraterm/ttpfile/kermit.c
-------------- next part --------------
Modified: trunk/teraterm/ttpfile/kermit.c
===================================================================
--- trunk/teraterm/ttpfile/kermit.c 2012-01-21 09:44:20 UTC (rev 4796)
+++ trunk/teraterm/ttpfile/kermit.c 2012-01-21 10:12:28 UTC (rev 4797)
@@ -33,47 +33,34 @@
#define MyREPT '~'
-static void KmtReadLog(PFileVar fv, BYTE *buf, int len)
+static void KmtOutputCommonLog(PFileVar fv, BYTE *buf, int len)
{
- int j;
+ int i;
+ for (i = 0 ; i < len ; i++)
+ FTLog1Byte(fv, buf[i]);
+
+ // \x8Ec\x82\xE8\x82\xCCASCII\x95\\x8E\xA6\x82\xF0\x8Ds\x82\xA4
+ fv->FlushLogLineBuf = 1;
+ FTLog1Byte(fv, 0);
+ fv->FlushLogLineBuf = 0;
+}
+
+static void KmtReadLog(PFileVar fv, BYTE *buf, int len)
+{
if (fv->LogFlag && (len>0))
{
- if (fv->LogState == 0)
- {
- // \x8Ec\x82\xE8\x82\xCCASCII\x95\\x8E\xA6\x82\xF0\x8Ds\x82\xA4
- fv->FlushLogLineBuf = 1;
- FTLog1Byte(fv,0);
- fv->FlushLogLineBuf = 0;
-
- fv->LogState = 1;
- fv->LogCount = 0;
- _lwrite(fv->LogFile,"\015\012<<<\015\012",7);
- }
- for (j=0 ; j <= len-1 ; j++)
- FTLog1Byte(fv, buf[j]);
+ _lwrite(fv->LogFile,"\015\012<<<\015\012",7);
+ KmtOutputCommonLog(fv, buf, len);
}
}
static void KmtWriteLog(PFileVar fv, BYTE *buf, int len)
{
- int j;
-
if (fv->LogFlag && (len>0))
{
- if (fv->LogState != 0)
- {
- // \x8Ec\x82\xE8\x82\xCCASCII\x95\\x8E\xA6\x82\xF0\x8Ds\x82\xA4
- fv->FlushLogLineBuf = 1;
- FTLog1Byte(fv,0);
- fv->FlushLogLineBuf = 0;
-
- fv->LogState = 0;
- fv->LogCount = 0;
- _lwrite(fv->LogFile,"\015\012>>>\015\012",7);
- }
- for (j=0 ; j <= len-1 ; j++)
- FTLog1Byte(fv, buf[j]);
+ _lwrite(fv->LogFile,"\015\012>>>\015\012",7);
+ KmtOutputCommonLog(fv, buf, len);
}
}
@@ -120,7 +107,7 @@
_lwrite(fv->LogFile,&(kv->PktOut[1]),C-1);
_lwrite(fv->LogFile,"\015\012",2);
#else
- KmtWriteLog(fv,&(kv->PktOut[1]),C-1);
+ KmtWriteLog(fv, &(kv->PktOut[0]), C);
#endif
}
@@ -825,7 +812,7 @@
_lwrite(fv->LogFile,&(kv->PktIn[1]),kv->PktInLen+1);
_lwrite(fv->LogFile,"\015\012",2);
#else
- KmtReadLog(fv,&(kv->PktIn[1]),kv->PktInLen+1);
+ KmtReadLog(fv,&(kv->PktIn[0]),kv->PktInLen);
#endif
}