Tera Term

[Ttssh2-commit] [3825] xmodem.c: ソースコード整形

svnno****@sourc***** svnno****@sourc*****
2010年 3月 26日 (金) 15:47:13 JST

• 前の記事 [Ttssh2-commit] [3824] xmodem. log に末尾のデータが正しく16進ダンプされるようにした。
• 次の記事 [Ttssh2-commit] [3826] XMODEM: 受信したバイナリファイルの末尾に、CPMEOF (0x1A) が除去されないままとなっていた問題を修正した。
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 3825
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3825
Author:   yutakapon
Date:     2010-03-26 15:47:13 +0900 (Fri, 26 Mar 2010)

Log Message:
-----------
xmodem.c: ソースコード整形

Modified Paths:
--------------
    trunk/teraterm/ttpfile/xmodem.c


-------------- next part --------------
Modified: trunk/teraterm/ttpfile/xmodem.c
===================================================================
--- trunk/teraterm/ttpfile/xmodem.c	2010-03-26 06:37:31 UTC (rev 3824)
+++ trunk/teraterm/ttpfile/xmodem.c	2010-03-26 06:47:13 UTC (rev 3825)
@@ -24,527 +24,482 @@
 
 int XRead1Byte(PFileVar fv, PXVar xv, PComVar cv, LPBYTE b)
 {
-  if (CommRead1Byte(cv,b) == 0)
-    return 0;
+	if (CommRead1Byte(cv, b) == 0)
+		return 0;
 
-  if (fv->LogFlag)
-  {
-    if (fv->LogState==0)
-    {
+	if (fv->LogFlag) {
+		if (fv->LogState == 0) {
 			// Žc‚è‚ÌASCII•\Ž¦‚ðs‚¤
 			fv->FlushLogLineBuf = 1;
-			FTLog1Byte(fv,0);
+			FTLog1Byte(fv, 0);
 			fv->FlushLogLineBuf = 0;
 
-      fv->LogState = 1;
-      fv->LogCount = 0;
-      _lwrite(fv->LogFile,"\015\012<<<\015\012",7);
-    }
-    FTLog1Byte(fv,*b);
-  }
-  return 1;
+			fv->LogState = 1;
+			fv->LogCount = 0;
+			_lwrite(fv->LogFile, "\015\012<<<\015\012", 7);
+		}
+		FTLog1Byte(fv, *b);
+	}
+	return 1;
 }
 
 int XWrite(PFileVar fv, PXVar xv, PComVar cv, PCHAR B, int C)
 {
-  int i, j;
+	int i, j;
 
-  i = CommBinaryOut(cv,B,C);
-  if (fv->LogFlag && (i>0))
-  {
-    if (fv->LogState != 0)
-    {
+	i = CommBinaryOut(cv, B, C);
+	if (fv->LogFlag && (i > 0)) {
+		if (fv->LogState != 0) {
 			// Žc‚è‚ÌASCII•\Ž¦‚ðs‚¤
 			fv->FlushLogLineBuf = 1;
-			FTLog1Byte(fv,0);
+			FTLog1Byte(fv, 0);
 			fv->FlushLogLineBuf = 0;
 
-      fv->LogState = 0;
-      fv->LogCount = 0;
-      _lwrite(fv->LogFile,"\015\012>>>\015\012",7);
-    }
-    for (j=0 ; j <= i-1 ; j++)
-      FTLog1Byte(fv,B[j]);
-  }
-  return i;
+			fv->LogState = 0;
+			fv->LogCount = 0;
+			_lwrite(fv->LogFile, "\015\012>>>\015\012", 7);
+		}
+		for (j = 0; j <= i - 1; j++)
+			FTLog1Byte(fv, B[j]);
+	}
+	return i;
 }
 
 void XSetOpt(PFileVar fv, PXVar xv, WORD Opt)
 {
-  char Tmp[21];
+	char Tmp[21];
 
-  xv->XOpt = Opt;
+	xv->XOpt = Opt;
 
-  strncpy_s(Tmp, sizeof(Tmp),"XMODEM (", _TRUNCATE);
-  switch (xv->XOpt) {
-    case XoptCheck: /* Checksum */
-      strncat_s(Tmp,sizeof(Tmp),"checksum)",_TRUNCATE);
-      xv->DataLen = 128;
-      xv->CheckLen = 1;
-      break;
-    case XoptCRC: /* CRC */
-      strncat_s(Tmp,sizeof(Tmp),"CRC)",_TRUNCATE);
-      xv->DataLen = 128;
-      xv->CheckLen = 2;
-      break;
-    case Xopt1K: /* 1K */
-      strncat_s(Tmp,sizeof(Tmp),"1K)",_TRUNCATE);
-      xv->DataLen = 1024;
-      xv->CheckLen = 2;
-      break;
-  }
-  SetDlgItemText(fv->HWin, IDC_PROTOPROT, Tmp);
+	strncpy_s(Tmp, sizeof(Tmp), "XMODEM (", _TRUNCATE);
+	switch (xv->XOpt) {
+	case XoptCheck:			/* Checksum */
+		strncat_s(Tmp, sizeof(Tmp), "checksum)", _TRUNCATE);
+		xv->DataLen = 128;
+		xv->CheckLen = 1;
+		break;
+	case XoptCRC:				/* CRC */
+		strncat_s(Tmp, sizeof(Tmp), "CRC)", _TRUNCATE);
+		xv->DataLen = 128;
+		xv->CheckLen = 2;
+		break;
+	case Xopt1K:				/* 1K */
+		strncat_s(Tmp, sizeof(Tmp), "1K)", _TRUNCATE);
+		xv->DataLen = 1024;
+		xv->CheckLen = 2;
+		break;
+	}
+	SetDlgItemText(fv->HWin, IDC_PROTOPROT, Tmp);
 }
 
 void XSendNAK(PFileVar fv, PXVar xv, PComVar cv)
 {
-  BYTE b;
-  int t;
+	BYTE b;
+	int t;
 
-  /* flush comm buffer */
-  cv->InBuffCount = 0;
-  cv->InPtr = 0;
+	/* flush comm buffer */
+	cv->InBuffCount = 0;
+	cv->InPtr = 0;
 
-  xv->NAKCount--;
-  if (xv->NAKCount<0)
-  {
-    if (xv->NAKMode==XnakC)
-    {
-      XSetOpt(fv,xv,XoptCheck);
-      xv->NAKMode = XnakNAK;
-      xv->NAKCount = 9;
-    }
-    else {
-      XCancel(fv,xv,cv);
-      return;
-    }
-  }
+	xv->NAKCount--;
+	if (xv->NAKCount < 0) {
+		if (xv->NAKMode == XnakC) {
+			XSetOpt(fv, xv, XoptCheck);
+			xv->NAKMode = XnakNAK;
+			xv->NAKCount = 9;
+		} else {
+			XCancel(fv, xv, cv);
+			return;
+		}
+	}
 
-  if (xv->NAKMode==XnakNAK)
-  {
-    b = NAK;
-    if ((xv->PktNum==0) && (xv->PktNumOffset==0))
-      t = TimeOutInit;
-    else
-      t = xv->TOutLong;
-  }
-  else {
-    b = 'C';
-    t = TimeOutC;
-  }
-  XWrite(fv,xv,cv,&b,1);
-  xv->PktReadMode = XpktSOH;
-  FTSetTimeOut(fv,t);
+	if (xv->NAKMode == XnakNAK) {
+		b = NAK;
+		if ((xv->PktNum == 0) && (xv->PktNumOffset == 0))
+			t = TimeOutInit;
+		else
+			t = xv->TOutLong;
+	} else {
+		b = 'C';
+		t = TimeOutC;
+	}
+	XWrite(fv, xv, cv, &b, 1);
+	xv->PktReadMode = XpktSOH;
+	FTSetTimeOut(fv, t);
 }
 
 WORD XCalcCheck(PXVar xv, PCHAR PktBuf)
 {
-  int i;
-  WORD Check;
+	int i;
+	WORD Check;
 
-  if (xv->CheckLen==1) /* CheckSum */
-  {
-    /* Calc sum */
-    Check = 0;
-    for (i = 0 ; i <= xv->DataLen-1 ; i++)
-      Check = Check + (BYTE)(PktBuf[3+i]);
-    return (Check & 0xff);
-  }
-  else { /* CRC */
-    Check = 0;
-    for (i = 0 ; i <= xv->DataLen-1 ; i++)
-      Check = UpdateCRC(PktBuf[3+i],Check);
-    return (Check);
-  }
+	if (xv->CheckLen == 1) {	/* CheckSum */
+		/* Calc sum */
+		Check = 0;
+		for (i = 0; i <= xv->DataLen - 1; i++)
+			Check = Check + (BYTE) (PktBuf[3 + i]);
+		return (Check & 0xff);
+	} else {					/* CRC */
+		Check = 0;
+		for (i = 0; i <= xv->DataLen - 1; i++)
+			Check = UpdateCRC(PktBuf[3 + i], Check);
+		return (Check);
+	}
 }
 
 BOOL XCheckPacket(PXVar xv)
 {
-  WORD Check;
+	WORD Check;
 
-  Check = XCalcCheck(xv,xv->PktIn);
-  if (xv->CheckLen==1) /* Checksum */
-    return ((BYTE)Check==xv->PktIn[xv->DataLen+3]);
-  else
-    return ((HIBYTE(Check)==xv->PktIn[xv->DataLen+3]) &&
-	    (LOBYTE(Check)==xv->PktIn[xv->DataLen+4]));  
+	Check = XCalcCheck(xv, xv->PktIn);
+	if (xv->CheckLen == 1)		/* Checksum */
+		return ((BYTE) Check == xv->PktIn[xv->DataLen + 3]);
+	else
+		return ((HIBYTE(Check) == xv->PktIn[xv->DataLen + 3]) &&
+				(LOBYTE(Check) == xv->PktIn[xv->DataLen + 4]));
 }
 
-void XInit
-  (PFileVar fv, PXVar xv, PComVar cv, PTTSet ts)
-{
-  char inistr[MAXPATHLEN + 10];
+void XInit(PFileVar fv, PXVar xv, PComVar cv, PTTSet ts) {
+	char inistr[MAXPATHLEN + 10];
 
-  fv->LogFlag = ((ts->LogFlag & LOG_X)!=0);
-  if (fv->LogFlag)
-    fv->LogFile = _lcreat("XMODEM.LOG",0);
-  fv->LogState = 0;
-  fv->LogCount = 0;
+	fv->LogFlag = ((ts->LogFlag & LOG_X) != 0);
+	if (fv->LogFlag)
+		fv->LogFile = _lcreat("XMODEM.LOG", 0);
+	fv->LogState = 0;
+	fv->LogCount = 0;
 
-  fv->FileSize = 0;
-  if ((xv->XMode==IdXSend) && fv->FileOpen) {
-    fv->FileSize = GetFSize(fv->FullName);
-    InitDlgProgress(fv->HWin, IDC_PROTOPROGRESS, &fv->ProgStat);
-  }
-  else {
-    fv->ProgStat = -1;
-  }
+	fv->FileSize = 0;
+	if ((xv->XMode == IdXSend) && fv->FileOpen) {
+		fv->FileSize = GetFSize(fv->FullName);
+		InitDlgProgress(fv->HWin, IDC_PROTOPROGRESS, &fv->ProgStat);
+	} else {
+		fv->ProgStat = -1;
+	}
 
-  SetWindowText(fv->HWin, fv->DlgCaption);
-  SetDlgItemText(fv->HWin, IDC_PROTOFNAME, &(fv->FullName[fv->DirLen]));
+	SetWindowText(fv->HWin, fv->DlgCaption);
+	SetDlgItemText(fv->HWin, IDC_PROTOFNAME, &(fv->FullName[fv->DirLen]));
 
-  xv->PktNumOffset = 0;
-  xv->PktNum = 0;
-  xv->PktNumSent = 0;
-  xv->PktBufCount = 0;
-  xv->CRRecv = FALSE;
+	xv->PktNumOffset = 0;
+	xv->PktNum = 0;
+	xv->PktNumSent = 0;
+	xv->PktBufCount = 0;
+	xv->CRRecv = FALSE;
 
-  fv->ByteCount = 0;
+	fv->ByteCount = 0;
 
-  if (cv->PortType==IdTCPIP)
-  {
-    xv->TOutShort = TimeOutVeryLong;
-    xv->TOutLong  = TimeOutVeryLong;
-  }
-  else {
-    xv->TOutShort = TimeOutShort;
-    xv->TOutLong  = TimeOutLong;
-  }  
+	if (cv->PortType == IdTCPIP) {
+		xv->TOutShort = TimeOutVeryLong;
+		xv->TOutLong = TimeOutVeryLong;
+	} else {
+		xv->TOutShort = TimeOutShort;
+		xv->TOutLong = TimeOutLong;
+	}
 
-  XSetOpt(fv,xv,xv->XOpt);
+	XSetOpt(fv, xv, xv->XOpt);
 
-  if (xv->XOpt==XoptCheck)
-  {
-    xv->NAKMode = XnakNAK;
-    xv->NAKCount = 10;
-  }
-  else {
-    xv->NAKMode = XnakC;
-    xv->NAKCount = 3;
-  }
+	if (xv->XOpt == XoptCheck) {
+		xv->NAKMode = XnakNAK;
+		xv->NAKCount = 10;
+	} else {
+		xv->NAKMode = XnakC;
+		xv->NAKCount = 3;
+	}
 
-  switch (xv->XMode) {
-    case IdXSend:
-      xv->TextFlag = 0;
+	switch (xv->XMode) {
+	case IdXSend:
+		xv->TextFlag = 0;
 
-	  // ƒtƒ@ƒCƒ‹‘—MŠJŽn‘O‚ɁA"rx ƒtƒ@ƒCƒ‹–¼"‚ðŽ©“®“I‚ɌĂяo‚·B(2007.12.20 yutaka)
-	  if (ts->XModemRcvCommand[0] != '\0') {
-		  _snprintf_s(inistr, sizeof(inistr), _TRUNCATE, "%s %s\015", 
-			  ts->XModemRcvCommand,
-			  &(fv->FullName[fv->DirLen]));
-		  FTConvFName(inistr + strlen(ts->XModemRcvCommand) + 1);
-		  XWrite(fv,xv,cv, inistr , strlen(inistr));
-	  }
+		// ƒtƒ@ƒCƒ‹‘—MŠJŽn‘O‚ɁA"rx ƒtƒ@ƒCƒ‹–¼"‚ðŽ©“®“I‚ɌĂяo‚·B(2007.12.20 yutaka)
+		if (ts->XModemRcvCommand[0] != '\0') {
+			_snprintf_s(inistr, sizeof(inistr), _TRUNCATE, "%s %s\015",
+						ts->XModemRcvCommand, &(fv->FullName[fv->DirLen]));
+			FTConvFName(inistr + strlen(ts->XModemRcvCommand) + 1);
+			XWrite(fv, xv, cv, inistr, strlen(inistr));
+		}
 
-      FTSetTimeOut(fv,TimeOutVeryLong);
-      break;
-    case IdXReceive:
-      XSendNAK(fv,xv,cv);
-      break;
-  }
+		FTSetTimeOut(fv, TimeOutVeryLong);
+		break;
+	case IdXReceive:
+		XSendNAK(fv, xv, cv);
+		break;
+	}
 }
 
 void XCancel(PFileVar fv, PXVar xv, PComVar cv)
 {
-  BYTE b;
+	BYTE b;
 
-  b = CAN;
-  XWrite(fv,xv,cv,&b,1);
-  xv->XMode = 0; // quit
+	b = CAN;
+	XWrite(fv, xv, cv, &b, 1);
+	xv->XMode = 0;				// quit
 }
 
 void XTimeOutProc(PFileVar fv, PXVar xv, PComVar cv)
 {
-  switch (xv->XMode) {
-    case IdXSend:
-      xv->XMode = 0; // quit
-      break;
-    case IdXReceive:
-      XSendNAK(fv,xv,cv);
-      break;
-  }
+	switch (xv->XMode) {
+	case IdXSend:
+		xv->XMode = 0;			// quit
+		break;
+	case IdXReceive:
+		XSendNAK(fv, xv, cv);
+		break;
+	}
 }
 
 BOOL XReadPacket(PFileVar fv, PXVar xv, PComVar cv)
 {
-  BYTE b, d;
-  int i, c;
-  BOOL GetPkt;
+	BYTE b, d;
+	int i, c;
+	BOOL GetPkt;
 
-  c = XRead1Byte(fv,xv,cv,&b);
+	c = XRead1Byte(fv, xv, cv, &b);
 
-  GetPkt = FALSE;
+	GetPkt = FALSE;
 
-  while ((c>0) && (! GetPkt))
-  {
-    switch (xv->PktReadMode) {
-      case XpktSOH:
-	if (b==SOH)
-	{
-	  xv->PktIn[0] = b;
-	  xv->PktReadMode = XpktBLK;
-	  if (xv->XOpt==Xopt1K)
-	    XSetOpt(fv,xv,XoptCRC);
-	  FTSetTimeOut(fv,xv->TOutShort);
+	while ((c > 0) && (!GetPkt)) {
+		switch (xv->PktReadMode) {
+		case XpktSOH:
+			if (b == SOH) {
+				xv->PktIn[0] = b;
+				xv->PktReadMode = XpktBLK;
+				if (xv->XOpt == Xopt1K)
+					XSetOpt(fv, xv, XoptCRC);
+				FTSetTimeOut(fv, xv->TOutShort);
+			} else if (b == STX) {
+				xv->PktIn[0] = b;
+				xv->PktReadMode = XpktBLK;
+				XSetOpt(fv, xv, Xopt1K);
+				FTSetTimeOut(fv, xv->TOutShort);
+			} else if (b == EOT) {
+				b = ACK;
+				fv->Success = TRUE;
+				XWrite(fv, xv, cv, &b, 1);
+				return FALSE;
+			} else {
+				/* flush comm buffer */
+				cv->InBuffCount = 0;
+				cv->InPtr = 0;
+				return TRUE;
+			}
+			break;
+		case XpktBLK:
+			xv->PktIn[1] = b;
+			xv->PktReadMode = XpktBLK2;
+			FTSetTimeOut(fv, xv->TOutShort);
+			break;
+		case XpktBLK2:
+			xv->PktIn[2] = b;
+			if ((b ^ xv->PktIn[1]) == 0xff) {
+				xv->PktBufPtr = 3;
+				xv->PktBufCount = xv->DataLen + xv->CheckLen;
+				xv->PktReadMode = XpktDATA;
+				FTSetTimeOut(fv, xv->TOutShort);
+			} else
+				XSendNAK(fv, xv, cv);
+			break;
+		case XpktDATA:
+			xv->PktIn[xv->PktBufPtr] = b;
+			xv->PktBufPtr++;
+			xv->PktBufCount--;
+			GetPkt = xv->PktBufCount == 0;
+			if (GetPkt) {
+				FTSetTimeOut(fv, xv->TOutLong);
+				xv->PktReadMode = XpktSOH;
+			} else
+				FTSetTimeOut(fv, xv->TOutShort);
+			break;
+		}
+
+		if (!GetPkt)
+			c = XRead1Byte(fv, xv, cv, &b);
 	}
-	else if (b==STX)
-	{
-	  xv->PktIn[0] = b;
-	  xv->PktReadMode = XpktBLK;
-	  XSetOpt(fv,xv,Xopt1K);
-	  FTSetTimeOut(fv,xv->TOutShort);
-	}
-	else if (b==EOT)
-	{
-	  b = ACK;
-	  fv->Success = TRUE;
-	  XWrite(fv,xv,cv,&b, 1);
-	  return FALSE;
-	}
-	else {
-	  /* flush comm buffer */
-	  cv->InBuffCount = 0;
-	  cv->InPtr = 0;
-	  return TRUE;
-	}
-	break;
-      case XpktBLK:
-	xv->PktIn[1] = b;
-	xv->PktReadMode = XpktBLK2;
-	FTSetTimeOut(fv,xv->TOutShort);
-	break;
-      case XpktBLK2:
-	xv->PktIn[2] = b;
-	if ((b ^ xv->PktIn[1]) == 0xff)
-	{
-	  xv->PktBufPtr = 3;
-	  xv->PktBufCount = xv->DataLen + xv->CheckLen;
-	  xv->PktReadMode = XpktDATA;
-	  FTSetTimeOut(fv,xv->TOutShort);
-	}
-	else
-	  XSendNAK(fv,xv,cv);
-	break;
-      case XpktDATA:
-	xv->PktIn[xv->PktBufPtr] = b;
-	xv->PktBufPtr++;
-	xv->PktBufCount--;
-	GetPkt = xv->PktBufCount==0;
-	if (GetPkt)
-	{
-	  FTSetTimeOut(fv,xv->TOutLong);
-	  xv->PktReadMode = XpktSOH;
-	}
-	else
-	  FTSetTimeOut(fv,xv->TOutShort);
-	break;
-    }
 
-    if (! GetPkt) c = XRead1Byte(fv,xv,cv,&b);
-  }
+	if (!GetPkt)
+		return TRUE;
 
-  if (! GetPkt) return TRUE;
+	if ((xv->PktIn[1] == 0) && (xv->PktNum == 0) &&
+		(xv->PktNumOffset == 0)) {
+		if (xv->NAKMode == XnakNAK)
+			xv->NAKCount = 10;
+		else
+			xv->NAKCount = 3;
+		XSendNAK(fv, xv, cv);
+		return TRUE;
+	}
 
-  if ((xv->PktIn[1]==0) && (xv->PktNum==0) &&
-      (xv->PktNumOffset==0))
-  {
-    if (xv->NAKMode==XnakNAK)
-      xv->NAKCount = 10;
-    else
-      xv->NAKCount = 3;
-    XSendNAK(fv,xv,cv);
-    return TRUE;
-  }
+	GetPkt = XCheckPacket(xv);
+	if (!GetPkt) {
+		XSendNAK(fv, xv, cv);
+		return TRUE;
+	}
 
-  GetPkt = XCheckPacket(xv);
-  if (! GetPkt)
-  {
-    XSendNAK(fv,xv,cv);
-    return TRUE;
-  }
+	d = xv->PktIn[1] - xv->PktNum;
+	if (d > 1) {
+		XCancel(fv, xv, cv);
+		return FALSE;
+	}
 
-  d = xv->PktIn[1] - xv->PktNum;
-  if (d>1)
-  {
-    XCancel(fv,xv,cv);
-    return FALSE;
-  }
+	/* send ACK */
+	b = ACK;
+	XWrite(fv, xv, cv, &b, 1);
+	xv->NAKMode = XnakNAK;
+	xv->NAKCount = 10;
 
-  /* send ACK */
-  b = ACK;
-  XWrite(fv,xv,cv,&b, 1);
-  xv->NAKMode = XnakNAK;
-  xv->NAKCount = 10;
+	if (d == 0)
+		return TRUE;
+	xv->PktNum = xv->PktIn[1];
+	if (xv->PktNum == 0)
+		xv->PktNumOffset = xv->PktNumOffset + 256;
 
-  if (d==0) return TRUE;
-  xv->PktNum = xv->PktIn[1];
-  if (xv->PktNum==0)
-    xv->PktNumOffset = xv->PktNumOffset + 256;
+	c = xv->DataLen;
+	if (xv->TextFlag > 0)
+		while ((c > 0) && (xv->PktIn[2 + c] == 0x1A))
+			c--;
 
-  c = xv->DataLen;
-  if (xv->TextFlag>0)
-    while ((c>0) && (xv->PktIn[2+c]==0x1A))
-      c--;
+	if (xv->TextFlag > 0)
+		for (i = 0; i <= c - 1; i++) {
+			b = xv->PktIn[3 + i];
+			if ((b == LF) && (!xv->CRRecv))
+				_lwrite(fv->FileHandle, "\015", 1);
+			if (xv->CRRecv && (b != LF))
+				_lwrite(fv->FileHandle, "\012", 1);
+			xv->CRRecv = b == CR;
+			_lwrite(fv->FileHandle, &b, 1);
+	} else
+		_lwrite(fv->FileHandle, &(xv->PktIn[3]), c);
 
-  if (xv->TextFlag>0)
-    for (i = 0 ; i <= c-1 ; i++)
-    {
-      b = xv->PktIn[3+i];
-      if ((b==LF) && (! xv->CRRecv))
-	_lwrite(fv->FileHandle,"\015",1);
-      if (xv->CRRecv && (b!=LF))
-	_lwrite(fv->FileHandle,"\012",1);
-      xv->CRRecv = b==CR;
-      _lwrite(fv->FileHandle,&b,1);
-    }
-  else
-    _lwrite(fv->FileHandle, &(xv->PktIn[3]), c);
+	fv->ByteCount = fv->ByteCount + c;
 
-  fv->ByteCount = fv->ByteCount + c;
+	SetDlgNum(fv->HWin, IDC_PROTOPKTNUM, xv->PktNumOffset + xv->PktNum);
+	SetDlgNum(fv->HWin, IDC_PROTOBYTECOUNT, fv->ByteCount);
 
-  SetDlgNum(fv->HWin, IDC_PROTOPKTNUM, xv->PktNumOffset+xv->PktNum);
-  SetDlgNum(fv->HWin, IDC_PROTOBYTECOUNT, fv->ByteCount);
+	FTSetTimeOut(fv, xv->TOutLong);
 
-  FTSetTimeOut(fv,xv->TOutLong);
-
-  return TRUE;
+	return TRUE;
 }
 
 BOOL XSendPacket(PFileVar fv, PXVar xv, PComVar cv)
 {
-  BYTE b;
-  int i;
-  BOOL SendFlag;
-  WORD Check;
+	BYTE b;
+	int i;
+	BOOL SendFlag;
+	WORD Check;
 
-  SendFlag = FALSE;
-  if (xv->PktBufCount==0)
-  {
-    i = XRead1Byte(fv,xv,cv,&b);
-    do {
-      if (i==0) return TRUE;
-      switch (b) {
-	case ACK:
-	  if (! fv->FileOpen)
-	  {
-	    fv->Success = TRUE;
-	    return FALSE;
-	  }
-	  else if (xv->PktNumSent==(BYTE)(xv->PktNum+1))
-	  {
-	    xv->PktNum = xv->PktNumSent;
-	    if (xv->PktNum==0)
-	      xv->PktNumOffset = xv->PktNumOffset + 256;
-	    SendFlag = TRUE;
-	  }
-	  break;
-	case NAK:
-	  if (xv->PktNum == 0 && xv->XOpt == Xopt1K)
-	  {
-	    /* we wanted 1k with CRC, but the other end specified checksum */
-	    /* keep the 1k block, but move back to checksum mode.          */
-	    xv->XOpt = XoptCheck;
-	    xv->CheckLen = 1;
-	  }
-	  SendFlag = TRUE;
-	  break;
-	case CAN:
-	  break;
-	case 0x43:
-	  if ((xv->PktNum==0) && (xv->PktNumOffset==0))
-	  {
-	    if ((xv->XOpt==XoptCheck) &&
-		(xv->PktNumSent==0)) XSetOpt(fv,xv,XoptCRC);
-	    if (xv->XOpt!=XoptCheck) SendFlag = TRUE;
-	  }
-	  break;
-      }
-      if (! SendFlag) i = XRead1Byte(fv,xv,cv,&b);
-    } while (!SendFlag);
-    // reset timeout timer
-    FTSetTimeOut(fv,TimeOutVeryLong);
+	SendFlag = FALSE;
+	if (xv->PktBufCount == 0) {
+		i = XRead1Byte(fv, xv, cv, &b);
+		do {
+			if (i == 0)
+				return TRUE;
+			switch (b) {
+			case ACK:
+				if (!fv->FileOpen) {
+					fv->Success = TRUE;
+					return FALSE;
+				} else if (xv->PktNumSent == (BYTE) (xv->PktNum + 1)) {
+					xv->PktNum = xv->PktNumSent;
+					if (xv->PktNum == 0)
+						xv->PktNumOffset = xv->PktNumOffset + 256;
+					SendFlag = TRUE;
+				}
+				break;
+			case NAK:
+				if (xv->PktNum == 0 && xv->XOpt == Xopt1K) {
+					/* we wanted 1k with CRC, but the other end specified checksum */
+					/* keep the 1k block, but move back to checksum mode.          */
+					xv->XOpt = XoptCheck;
+					xv->CheckLen = 1;
+				}
+				SendFlag = TRUE;
+				break;
+			case CAN:
+				break;
+			case 0x43:
+				if ((xv->PktNum == 0) && (xv->PktNumOffset == 0)) {
+					if ((xv->XOpt == XoptCheck) && (xv->PktNumSent == 0))
+						XSetOpt(fv, xv, XoptCRC);
+					if (xv->XOpt != XoptCheck)
+						SendFlag = TRUE;
+				}
+				break;
+			}
+			if (!SendFlag)
+				i = XRead1Byte(fv, xv, cv, &b);
+		} while (!SendFlag);
+		// reset timeout timer
+		FTSetTimeOut(fv, TimeOutVeryLong);
 
-    do {
-      i = XRead1Byte(fv,xv,cv,&b);
-    } while (i!=0);
+		do {
+			i = XRead1Byte(fv, xv, cv, &b);
+		} while (i != 0);
 
-    if (xv->PktNumSent==xv->PktNum) /* make a new packet */
-    {
-      xv->PktNumSent++;
-      if (xv->DataLen==128)
-	xv->PktOut[0] = SOH;
-      else
-	xv->PktOut[0] = STX;
-      xv->PktOut[1] = xv->PktNumSent;
-      xv->PktOut[2] = ~ xv->PktNumSent;
+		if (xv->PktNumSent == xv->PktNum) {	/* make a new packet */
+			xv->PktNumSent++;
+			if (xv->DataLen == 128)
+				xv->PktOut[0] = SOH;
+			else
+				xv->PktOut[0] = STX;
+			xv->PktOut[1] = xv->PktNumSent;
+			xv->PktOut[2] = ~xv->PktNumSent;
 
-      i = 1;
-      while ((i<=xv->DataLen) && fv->FileOpen &&
-	     (_lread(fv->FileHandle,&b,1)==1))
-      {
-	xv->PktOut[2+i] = b;
-	i++;
-	fv->ByteCount++;
-      }
+			i = 1;
+			while ((i <= xv->DataLen) && fv->FileOpen &&
+				   (_lread(fv->FileHandle, &b, 1) == 1)) {
+				xv->PktOut[2 + i] = b;
+				i++;
+				fv->ByteCount++;
+			}
 
-      if (i>1)
-      {
-	while (i<=xv->DataLen)
-	{
-	  xv->PktOut[2+i] = 0x1A;
-	  i++;
+			if (i > 1) {
+				while (i <= xv->DataLen) {
+					xv->PktOut[2 + i] = 0x1A;
+					i++;
+				}
+
+				Check = XCalcCheck(xv, xv->PktOut);
+				if (xv->CheckLen == 1)	/* Checksum */
+					xv->PktOut[xv->DataLen + 3] = (BYTE) Check;
+				else {
+					xv->PktOut[xv->DataLen + 3] = HIBYTE(Check);
+					xv->PktOut[xv->DataLen + 4] = LOBYTE(Check);
+				}
+				xv->PktBufCount = 3 + xv->DataLen + xv->CheckLen;
+			} else {			/* send EOT */
+				if (fv->FileOpen) {
+					_lclose(fv->FileHandle);
+					fv->FileHandle = 0;
+					fv->FileOpen = FALSE;
+				}
+				xv->PktOut[0] = EOT;
+				xv->PktBufCount = 1;
+			}
+		} else {				/* resend packet */
+			xv->PktBufCount = 3 + xv->DataLen + xv->CheckLen;
+		}
+		xv->PktBufPtr = 0;
 	}
+	/* a NAK or C could have arrived while we were buffering.  Consume it. */
+	do {
+		i = XRead1Byte(fv, xv, cv, &b);
+	} while (i != 0);
 
-	Check = XCalcCheck(xv,xv->PktOut);
-	if (xv->CheckLen==1) /* Checksum */
-	  xv->PktOut[xv->DataLen+3] = (BYTE)Check;
-	else {
-	  xv->PktOut[xv->DataLen+3] = HIBYTE(Check);
-	  xv->PktOut[xv->DataLen+4] = LOBYTE(Check);
+	i = 1;
+	while ((xv->PktBufCount > 0) && (i > 0)) {
+		b = xv->PktOut[xv->PktBufPtr];
+		i = XWrite(fv, xv, cv, &b, 1);
+		if (i > 0) {
+			xv->PktBufCount--;
+			xv->PktBufPtr++;
+		}
 	}
-	xv->PktBufCount = 3 + xv->DataLen + xv->CheckLen;
-      }
-      else { /* send EOT */
-	if (fv->FileOpen)
-	{
-	  _lclose(fv->FileHandle);
-	  fv->FileHandle = 0;
-	  fv->FileOpen = FALSE;
+
+	if (xv->PktBufCount == 0) {
+		SetDlgNum(fv->HWin, IDC_PROTOPKTNUM,
+				  xv->PktNumOffset + xv->PktNumSent);
+		SetDlgNum(fv->HWin, IDC_PROTOBYTECOUNT, fv->ByteCount);
+		SetDlgPercent(fv->HWin, IDC_PROTOPERCENT, IDC_PROTOPROGRESS,
+					  fv->ByteCount, fv->FileSize, &fv->ProgStat);
 	}
-	xv->PktOut[0] = EOT;
-	xv->PktBufCount = 1;
-      }
-    }
-    else { /* resend packet */
-      xv->PktBufCount = 3 + xv->DataLen + xv->CheckLen;
-    }
-    xv->PktBufPtr = 0;
-  }
-  /* a NAK or C could have arrived while we were buffering.  Consume it. */
-  do {
-    i = XRead1Byte(fv,xv,cv,&b);
-  } while (i!=0);
 
-  i = 1;
-  while ((xv->PktBufCount>0) && (i>0))
-  {
-    b = xv->PktOut[xv->PktBufPtr];
-    i = XWrite(fv,xv,cv,&b, 1);
-    if (i>0)
-    {
-      xv->PktBufCount--;
-      xv->PktBufPtr++;
-    }
-  }
-
-  if (xv->PktBufCount==0)
-  {
-    SetDlgNum(fv->HWin, IDC_PROTOPKTNUM,
-	      xv->PktNumOffset+xv->PktNumSent);
-    SetDlgNum(fv->HWin, IDC_PROTOBYTECOUNT, fv->ByteCount);
-    SetDlgPercent(fv->HWin, IDC_PROTOPERCENT, IDC_PROTOPROGRESS,
-		  fv->ByteCount, fv->FileSize, &fv->ProgStat);
-  }
-
-  return TRUE;
+	return TRUE;
 }

• 前の記事 [Ttssh2-commit] [3824] xmodem. log に末尾のデータが正しく16進ダンプされるようにした。
• 次の記事 [Ttssh2-commit] [3826] XMODEM: 受信したバイナリファイルの末尾に、CPMEOF (0x1A) が除去されないままとなっていた問題を修正した。
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]