eric
/
mysticbbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for a non-carried detected issue, fix for ZOC download endsender

This commit is contained in:
mysticbbs 2012-08-13 22:01:23 -04:00
parent 3a276d0e21
commit 137547d56c
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mdl/m_protocol_zmodem.pas
View File

@ -1061,8 +1061,8 @@ Start:
{$IFDEF ZDEBUG} ZLog('ZSendFile -> Got ZRPOS Sending ZDATA position: ' + strI2S(TxPos)); {$ENDIF} {$IFDEF ZDEBUG} ZLog('ZSendFile -> Got ZRPOS Sending ZDATA position: ' + strI2S(TxPos)); {$ENDIF}
Client.PurgeInputData; // Client.PurgeInputData;
Client.PurgeOutputData; // Client.PurgeOutputData;
If TxPos < Status.FileSize Then Begin If TxPos < Status.FileSize Then Begin
ZPutLong (TxPos); ZPutLong (TxPos);
@ -1106,11 +1106,14 @@ End;
Procedure TProtocolZmodem.ZEndSender; Procedure TProtocolZmodem.ZEndSender;
Var Var
TimeOut : LongInt; TimeOut : LongInt;
C : SmallInt;
Begin Begin
{$IFDEF ZDEBUG} ZLog('ZEndSender -> begin'); {$ENDIF}
TimeOut := TimerSet(500); TimeOut := TimerSet(500);
While Not AbortTransfer And Not TimerUp(TimeOut) Do Begin While Not AbortTransfer And Not TimerUp(TimeOut) Do Begin
Client.PurgeInputData; // Client.PurgeInputData;
ZPutLong (0); ZPutLong (0);
ZSendBinaryHeader (ZFIN); ZSendBinaryHeader (ZFIN);
@ -1118,7 +1121,11 @@ Begin
If Not Client.DataWaiting Then If Not Client.DataWaiting Then
WaitMS(500) WaitMS(500)
Else Else
Case ZGetHeader(RxHdr) of C := ZGetHeader(RxHdr);
{$IFDEF ZDEBUG} ZLog('ZEndSender -> Got header:' + HeaderType(C)); {$ENDIF}
Case C of
ZFIN: Begin ZFIN: Begin
Client.BufWriteStr('OO'); Client.BufWriteStr('OO');
Client.BufFlush; Client.BufFlush;
@ -1441,7 +1448,7 @@ Begin
{$IFDEF ZDEBUG} ZLog('ZRecvFile -> File:' + FName); {$ENDIF} {$IFDEF ZDEBUG} ZLog('ZRecvFile -> File:' + FName); {$ENDIF}
{$IFDEF ZDEBUG} ZLog('ZRecvFile -> Size:' + strI2S(FSize)); {$ENDIF} {$IFDEF ZDEBUG} ZLog('ZRecvFile -> Size:' + strI2S(FSize)); {$ENDIF}
Client.PurgeInputData; // Client.PurgeInputData;
Queue.Add(ReceivePath, FName); Queue.Add(ReceivePath, FName);
@ -1554,6 +1561,11 @@ NextHeader:
ZReceiveFile := C; ZReceiveFile := C;
Exit;
End;
RCDO : Begin
Close (WrkFile);
ZReceiveFile := ZERROR;
Exit; Exit;
End; End;
ZERROR : Begin ZERROR : Begin
@ -1702,6 +1714,7 @@ Begin
Client.PurgeInputData; Client.PurgeInputData;
Client.PurgeOutputData; Client.PurgeOutputData;
Client.BufWriteStr(Attn); Client.BufWriteStr(Attn);
Client.BufWriteStr(CancelStr); Client.BufWriteStr(CancelStr);
Client.BufFlush; Client.BufFlush;