svnno****@sourc*****
svnno****@sourc*****
2010年 3月 26日 (金) 18:09:02 JST
Tera TermRevision: 3826
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3826
Author: yutakapon
Date: 2010-03-26 18:09:02 +0900 (Fri, 26 Mar 2010)
Log Message:
-----------
XMODEM: å—ä¿¡ã—ãŸãƒã‚¤ãƒŠãƒªãƒ•ã‚¡ã‚¤ãƒ«ã®æœ«å°¾ã«ã€CPMEOF(0x1A)ãŒé™¤åŽ»ã•ã‚Œãªã„ã¾ã¾ã¨ãªã£ã¦ã„ãŸå•é¡Œã‚’ä¿®æ£ã—ãŸã€‚
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/teraterm/ttpfile/xmodem.c
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2010-03-26 06:47:13 UTC (rev 3825)
+++ trunk/doc/en/html/about/history.html 2010-03-26 09:09:02 UTC (rev 3826)
@@ -30,7 +30,7 @@
<h2><a name="teraterm">Tera Term</a></h2>
-<h3><a name="teraterm_4.66">2010.3.24 (Ver 4.66 unreleased)</a></h3>
+<h3><a name="teraterm_4.66">2010.3.26 (Ver 4.66 unreleased)</a></h3>
<ul class="history">
<li>Changes
<ul>
@@ -51,6 +51,7 @@
<!--li>‘ã‘ÖƒXƒNƒŠ[ƒ“ƒoƒbƒtƒ@‘Ήž‚̃J[ƒ\ƒ‹ˆÊ’u•Û‘¶§ŒäƒV[ƒPƒ“ƒX‚ÅA‘ã‘Ö‰æ–ʃoƒbƒtƒ@‚Ö‚ÌØ‚è‘Ö‚¦A‚¨‚æ‚щæ–ʂ̃NƒŠƒA‚ªs‚í‚ê‚Ä‚¢‚½‚Ì‚ðC³‚µ‚½B</li-->
<li>If ClearOnResize setting is on, DECCOLM (Change Column Mode) control sequence does not clear screen.</li>
<!--li>ƒL[ƒ{[ƒhÝ’èƒtƒ@ƒCƒ‹‚Å Alt+ƒL[ ‚É‹@”\‚ðŠ„‚è“–‚Ä‚½ŽžA—]Œv‚È•¶Žš—ñ‚ª’ljÁ‚Åo—Í‚³‚ê‚é‚Ì‚ðC³‚µ‚½B</li-->
+ <li>XMODEM: A received file may include the CPMEOF(0x1A) block at the end of the file.</li>
</ul>
</li>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2010-03-26 06:47:13 UTC (rev 3825)
+++ trunk/doc/ja/html/about/history.html 2010-03-26 09:09:02 UTC (rev 3826)
@@ -30,7 +30,7 @@
<h2><a name="teraterm">Tera Term</a></h2>
-<h3><a name="teraterm_4.66">2010.3.24 (Ver 4.66 unreleased)</a></h3>
+<h3><a name="teraterm_4.66">2010.3.26 (Ver 4.66 unreleased)</a></h3>
<ul class="history">
<li>•ÏX
<ul>
@@ -50,6 +50,7 @@
<li>‘ã‘ÖƒXƒNƒŠ[ƒ“ƒoƒbƒtƒ@‘Ήž‚̃J[ƒ\ƒ‹ˆÊ’u•Û‘¶§ŒäƒV[ƒPƒ“ƒX‚ÅA‘ã‘Ö‰æ–ʃoƒbƒtƒ@‚Ö‚ÌØ‚è‘Ö‚¦A‚¨‚æ‚щæ–ʂ̃NƒŠƒA‚ªs‚í‚ê‚Ä‚¢‚½‚Ì‚ðC³‚µ‚½B</li>
<li>ClearOnResize ‚ª on ‚ÌŽžADECCOLM(Œ…”ƒ‚[ƒh•ÏX)§ŒäƒV[ƒPƒ“ƒX‚ʼnæ–Ê‚ªƒNƒŠƒA‚³‚ê‚È‚¢‚Ì‚ðC³‚µ‚½B</li>
<li>ƒL[ƒ{[ƒhÝ’èƒtƒ@ƒCƒ‹‚Å Alt+ƒL[ ‚É‹@”\‚ðŠ„‚è“–‚Ä‚½ŽžA—]Œv‚È•¶Žš—ñ‚ª’ljÁ‚Åo—Í‚³‚ê‚é‚Ì‚ðC³‚µ‚½B</li>
+ <li>XMODEM: ŽóM‚µ‚½ƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚Ì––”ö‚ÉACPMEOF(0x1A)‚ªœ‹Ž‚³‚ê‚È‚¢‚Ü‚Ü‚Æ‚È‚Á‚Ä‚¢‚½–â‘è‚ðC³‚µ‚½B</li>
</ul>
</li>
Modified: trunk/teraterm/ttpfile/xmodem.c
===================================================================
--- trunk/teraterm/ttpfile/xmodem.c 2010-03-26 06:47:13 UTC (rev 3825)
+++ trunk/teraterm/ttpfile/xmodem.c 2010-03-26 09:09:02 UTC (rev 3826)
@@ -7,6 +7,10 @@
#include "tttypes.h"
#include "ttftypes.h"
#include <stdio.h>
+#include <io.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <fcntl.h>
#include "tt_res.h"
#include "ttcommon.h"
@@ -220,6 +224,12 @@
FTSetTimeOut(fv, TimeOutVeryLong);
break;
case IdXReceive:
+#if 0
+// strcpy(inistr, "sx svnrev.exe\r\n");
+ strcpy(inistr, "sx -b lrzsz-0.12.20.tar.gz\r\n");
+ XWrite(fv, xv, cv, inistr, strlen(inistr));
+#endif
+
XSendNAK(fv, xv, cv);
break;
}
@@ -249,7 +259,7 @@
BOOL XReadPacket(PFileVar fv, PXVar xv, PComVar cv)
{
BYTE b, d;
- int i, c;
+ int i, c, t;
BOOL GetPkt;
c = XRead1Byte(fv, xv, cv, &b);
@@ -271,6 +281,21 @@
XSetOpt(fv, xv, Xopt1K);
FTSetTimeOut(fv, xv->TOutShort);
} else if (b == EOT) {
+ // ƒoƒCƒiƒŠƒ‚[ƒh‚Ìê‡A––”ö‚ÌCPMEOF‚ð휂·‚éB
+ if (xv->TextFlag == 0) {
+ int fd;
+
+ _lclose(fv->FileHandle);
+ fv->FileHandle = -1;
+ fv->FileOpen = 0;
+
+ fd = _open(fv->FullName, _O_RDWR);
+ if (fd != -1) {
+ _chsize_s(fd, fv->FileSize);
+ _close(fd);
+ }
+ }
+
b = ACK;
fv->Success = TRUE;
XWrite(fv, xv, cv, &b, 1);
@@ -351,10 +376,20 @@
if (xv->PktNum == 0)
xv->PktNumOffset = xv->PktNumOffset + 256;
- c = xv->DataLen;
+ // XMODEM‚ÌŽd—l‚É‚æ‚ê‚ÎAÅŒã‚̃uƒƒbƒN‚ª 128/1024 byte‚É–ž‚½‚È‚¢ê‡ACPMEOF(0x1A)‚Å
+ // ƒpƒfƒBƒ“ƒO‚·‚邱‚Æ‚É‚È‚Á‚Ä‚¢‚éBASCIIƒ‚[ƒhEƒoƒCƒiƒŠƒ‚[ƒh‚ÍŠÖŒW‚È‚A–³ðŒ‚É
+ // ƒpƒfƒBƒ“ƒO‚³‚ê‚éB"lrzsz-0.12.20"‚Ì filbuf()#src/lsz.c ‚ÌŽÀ‘•‚à‚»‚¤‚È‚Á‚Ä‚¢‚éB
+ // ‚æ‚Á‚ÄA–³ðŒ‚É CPMEOF 휈—‚ª“®ì‚·‚é‚悤‚É‚µAƒoƒCƒiƒŠƒtƒ@ƒCƒ‹‚Ì––”ö‚ª‰ó‚ê‚é
+ // Œ»Û‚ð‰ñ”ð‚·‚éB
+ // (2010.3.26 yutaka)
+ t = xv->DataLen;
+ while ((t > 0) && (xv->PktIn[2 + t] == 0x1A))
+ t--;
if (xv->TextFlag > 0)
- while ((c > 0) && (xv->PktIn[2 + c] == 0x1A))
- c--;
+ c = t;
+ else
+ c = xv->DataLen;
+ fv->FileSize = fv->ByteCount + t;
if (xv->TextFlag > 0)
for (i = 0; i <= c - 1; i++) {