Commit: 0e15e2357c8940b493952ca05daf8464fbd33d91 - ffftp (git)

Loweynet

Commit MetaInfo

• Revisão: 0e15e2357c8940b493952ca05daf8464fbd33d91 (tree)
• Hora: 2012-02-15 20:54:34
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Mensagem de Log

Fix bugs of uploading files with unique names.

Mudança Sumário

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: getput.c

Diff

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/getput.c
+++ b/getput.c
@@ -2684,6 +2684,10 @@ static int UpLoadNonPassive(TRANSPACKET *Pkt)
 		iRetCode = command(Pkt->ctrl_skt, Reply, &Canceled[Pkt->ThreadCount], "%s", Buf);
 		if((iRetCode/100) == FTP_PRELIM)
 		{
+			// STOUの応答を処理
+			// 応答の形式に規格が無くファイル名を取得できないため属性変更を無効化
+			if(Pkt->Mode == EXIST_UNIQUE)
+				Pkt->Attr = -1;
 			// 同時接続対応
 //			if(SocksGet2ndBindReply(listen_socket, &data_socket) == FFFTP_FAIL)
 			if(SocksGet2ndBindReply(listen_socket, &data_socket, &Canceled[Pkt->ThreadCount]) == FFFTP_FAIL)
@@ -2840,6 +2844,10 @@ static int UpLoadPassive(TRANSPACKET *Pkt)
 				iRetCode = command(Pkt->ctrl_skt, Reply, &Canceled[Pkt->ThreadCount], "%s", Buf);
 				if(iRetCode/100 == FTP_PRELIM)
 				{
+					// STOUの応答を処理
+					// 応答の形式に規格が無くファイル名を取得できないため属性変更を無効化
+					if(Pkt->Mode == EXIST_UNIQUE)
+						Pkt->Attr = -1;
 					// 一部TYPE、STOR(RETR)、PORT(PASV)を並列に処理できないホストがあるため
 					ReleaseMutex(hListAccMutex);
 					// FTPS対応