Commit: 0ae23bd18c4f4de6781bec3a83021fddddae7480 - ffftp (git)

Loweynet

Commit MetaInfo

• Revision: 0ae23bd18c4f4de6781bec3a83021fddddae7480 (tree)
• Time: 2012-05-17 00:00:33
• Author: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix conditions of sending commands for keep alive.
Fix routines for queuing files.

Change Summary

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: common.h
• modified: ftpproc.c
• modified: getput.c

Incremental Difference

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

--- a/common.h
+++ b/common.h
@@ -1662,6 +1662,8 @@ void EraseTmpTransFileList(TRANSPACKET **Base);
 int RemoveTmpTransFileListItem(TRANSPACKET **Base, int Num);
 
 void AddTransFileList(TRANSPACKET *Pkt);
+// バグ対策
+void AddNullTransFileList();
 void AppendTransFileList(TRANSPACKET *Pkt);
 void KeepTransferDialog(int Sw);
 int AskTransferNow(void);

--- a/ftpproc.c
+++ b/ftpproc.c
@@ -314,6 +314,9 @@ void DownloadProc(int ChName, int ForceFile, int All)
 //		strcpy(Pkt.Cmd, "GOQUIT");
 //		AddTransFileList(&Pkt);
 
+		// バグ対策
+		AddNullTransFileList();
+
 		GoForwardTransWindow();
 //		KeepTransferDialog(NO);
 
@@ -427,6 +430,9 @@ void DirectDownloadProc(char *Fname)
 //		strcpy(Pkt.Cmd, "GOQUIT");
 //		AddTransFileList(&Pkt);
 
+		// バグ対策
+		AddNullTransFileList();
+
 		GoForwardTransWindow();
 //		KeepTransferDialog(NO);
 
@@ -697,6 +703,9 @@ void MirrorDownloadProc(int Notify)
 			else
 				EraseTmpTransFileList(&Base);
 
+			// バグ対策
+			AddNullTransFileList();
+
 			DeleteFileList(&LocalListBase);
 			DeleteFileList(&RemoteListBase);
 
@@ -1203,6 +1212,9 @@ void UploadListProc(int ChName, int All)
 //		strcpy(Pkt.Cmd, "GOQUIT");
 //		AddTransFileList(&Pkt);
 
+		// バグ対策
+		AddNullTransFileList();
+
 		GoForwardTransWindow();
 
 		EnableUserOpe();
@@ -1379,6 +1391,9 @@ void UploadDragProc(WPARAM wParam)
 //		strcpy(Pkt.Cmd, "GOQUIT");
 //		AddTransFileList(&Pkt);
 
+		// バグ対策
+		AddNullTransFileList();
+
 		GoForwardTransWindow();
 
 		EnableUserOpe();
@@ -1654,6 +1669,9 @@ void MirrorUploadProc(int Notify)
 			else
 				EraseTmpTransFileList(&Base);
 
+			// バグ対策
+			AddNullTransFileList();
+
 			DeleteFileList(&LocalListBase);
 			DeleteFileList(&RemoteListBase);
 
@@ -3675,7 +3693,7 @@ void NoopProc(void)
 	CancelCheckWork = NO;
 	if(AskConnecting() == YES && AskUserOpeDisabled() == NO)
 	{
-		if(AskReuseCmdSkt() == NO || AskShareProh() == YES)
+		if(AskReuseCmdSkt() == NO || AskShareProh() == YES || AskTransferNow() == NO)
 		{
 			DisableUserOpe();
 			DoDirListCmdSkt("", "", 999, &CancelCheckWork);

--- a/getput.c
+++ b/getput.c
@@ -436,6 +436,15 @@ void AddTransFileList(TRANSPACKET *Pkt)
 }
 
 
+// バグ対策
+void AddNullTransFileList()
+{
+	TRANSPACKET Pkt;
+	memset(&Pkt, 0, sizeof(TRANSPACKET));
+	strcpy(Pkt.Cmd, "NULL");
+	AddTransFileList(&Pkt);
+}
+
 /*----- 転送ファイル情報を転送ファイルリストに追加する ------------------------
 *
 *	Parameter