提交: c16fea1548774bded6901c861158d9e648582259 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• 修订版: c16fea1548774bded6901c861158d9e648582259 (tree)
• 时间: 2012-05-21 23:11:57
• 作者: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Add routines for checking capability of MDTM and MFMT.

更改概述

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: common.h
• modified: connect.c
• modified: remote.c

差异

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
@@ -938,6 +938,10 @@ LIST_UNIX_70
 // IPv6対応
 #define FEATURE_EPRT		0x00000004
 #define FEATURE_EPSV		0x00000008
+// ホスト側の日時取得
+#define FEATURE_MDTM		0x00000010
+// ホスト側の日時設定
+#define FEATURE_MFMT		0x00000020
 
 // IPv6対応
 #define NTYPE_AUTO			0		/* 自動 */

--- a/connect.c
+++ b/connect.c
@@ -1773,6 +1773,12 @@ static SOCKET DoConnectCrypt(int CryptMode, HOSTDATA* HostData, char *Host, char
 				// IPv6対応
 				if(strstr(Reply, " EPRT ") || strstr(Reply, " EPSV "))
 					HostData->Feature |= FEATURE_EPRT | FEATURE_EPSV;
+				// ホスト側の日時取得
+				if(strstr(Reply, " MDTM "))
+					HostData->Feature |= FEATURE_MDTM;
+				// ホスト側の日時設定
+				if(strstr(Reply, " MFMT "))
+					HostData->Feature |= FEATURE_MFMT;
 			}
 			// UTF-8対応
 			if(HostData->CurNameKanjiCode == KANJI_AUTO && (HostData->Feature & FEATURE_UTF8))

--- a/remote.c
+++ b/remote.c
@@ -441,8 +441,11 @@ int DoMDTM(SOCKET cSkt, char *Path, FILETIME *Time, int *CancelCheckWork)
     Time->dwHighDateTime = 0;
 
 	// 同時接続対応
+	// ホスト側の日時取得
 //	Sts = CommandProcTrn(Tmp, "MDTM %s", Path);
-	Sts = CommandProcTrn(cSkt, Tmp, CancelCheckWork, "MDTM %s", Path);
+	Sts = 500;
+	if(AskHostFeature() & FEATURE_MDTM)
+		Sts = CommandProcTrn(cSkt, Tmp, CancelCheckWork, "MDTM %s", Path);
 	if(Sts/100 == FTP_COMPLETE)
 	{
 		sTime.wMilliseconds = 0;
@@ -469,7 +472,9 @@ int DoMFMT(SOCKET cSkt, char *Path, FILETIME *Time, int *CancelCheckWork)
 
 	FileTimeToSystemTime(Time, &sTime);
 
-	Sts = CommandProcTrn(cSkt, Tmp, CancelCheckWork, "MFMT %04d%02d%02d%02d%02d%02d %s", sTime.wYear, sTime.wMonth, sTime.wDay, sTime.wHour, sTime.wMinute, sTime.wSecond, Path);
+	Sts = 500;
+	if(AskHostFeature() & FEATURE_MFMT)
+		Sts = CommandProcTrn(cSkt, Tmp, CancelCheckWork, "MFMT %04d%02d%02d%02d%02d%02d %s", sTime.wYear, sTime.wMonth, sTime.wDay, sTime.wHour, sTime.wMinute, sTime.wSecond, Path);
 	return(Sts/100);
 }