svnno****@sourc*****
svnno****@sourc*****
2010年 6月 20日 (日) 15:45:33 JST
Tera TermRevision: 3929
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3929
Author: yutakapon
Date: 2010-06-20 15:45:33 +0900 (Sun, 20 Jun 2010)
Log Message:
-----------
YMODEMé€ä¿¡å‡¦ç†ã«ãŠã„ã¦ã€ãƒã‚¤ãƒ‘ーターミナル仕様（標準仕様）ã«æº–æ‹ ã™ã‚‹ã‚ˆã†ã«ã—ãŸã€‚
cf.
http://sourceforge.jp/ticket/browse.php?group_id=1412&tid=22059
http://ja.wikipedia.org/wiki/YMODEM
Modified Paths:
--------------
trunk/teraterm/ttpfile/ymodem.c
-------------- next part --------------
Modified: trunk/teraterm/ttpfile/ymodem.c
===================================================================
--- trunk/teraterm/ttpfile/ymodem.c 2010-06-11 09:17:12 UTC (rev 3928)
+++ trunk/teraterm/ttpfile/ymodem.c 2010-06-20 06:45:33 UTC (rev 3929)
@@ -552,6 +552,7 @@
do {
if (i==0) return TRUE;
firstch = b;
+
switch (b) {
case ACK:
// 1‰ñ–Ú‚ÌEOT‘—MŒã‚ÌACKŽóM‚ÅAu1ƒtƒ@ƒCƒ‹‘—Mv‚ÌI‚í‚è‚Æ‚·‚éB
@@ -574,6 +575,13 @@
}
else if (yv->PktNumSent==(BYTE)(yv->PktNum+1)) // ŽŸ‚̃uƒƒbƒN‚ð‘—‚é
{
+ // ƒuƒƒbƒN0iƒtƒ@ƒCƒ‹î•ñj‘—MŒã‚ÍAACK ‚Æ 'C' ‚ð˜A‘±‚µ‚ÄŽóM‚·‚邱‚Æ‚É
+ // ‚È‚Á‚Ä‚¢‚邽‚ßAŽŸ‚Ì'C'‚ð‘Ò‚ÂB(2010.6.20 yutaka)
+ if ((yv->PktNum==0) && (yv->PktNumOffset==0)) {
+ SendFlag = FALSE;
+ break;
+ }
+
yv->PktNum = yv->PktNumSent;
if (yv->PktNum==0)
yv->PktNumOffset = yv->PktNumOffset + 256;
@@ -582,6 +590,13 @@
break;
case NAK:
+ // 1‰ñ–Ú‚ÌEOT‘—MŒã‚ÌNAKŽóM‚ÅAÅŒã"EOT"‚ð‘—‚éB
+ if (yv->SendEot) {
+ yv->PktNum = yv->PktNumSent;
+ if (yv->PktNum==0)
+ yv->PktNumOffset = yv->PktNumOffset + 256;
+ }
+
SendFlag = TRUE;
break;
@@ -593,6 +608,13 @@
// 'C'‚ðŽó‚¯Žæ‚é‚ÆAƒuƒƒbƒN‚Ì‘—M‚ðŠJŽn‚·‚éB
if ((yv->PktNum==0) && (yv->PktNumOffset==0))
{
+ // ƒtƒ@ƒCƒ‹î•ñ‘—MŒãAACK -> 'C' ‚ÆŽóM‚µ‚½‚Ì‚ÅAŽŸ‚̃uƒƒbƒN‚ð‘—M‚·‚éB
+ if (yv->SendFileInfo) {
+ yv->PktNum = yv->PktNumSent;
+ if (yv->PktNum==0)
+ yv->PktNumOffset = yv->PktNumOffset + 256;
+ }
+
SendFlag = TRUE;
}
else if (yv->LastSendEot) {