Commit: f9a20c32d16076be27e54bff43e4eb98795c5fa4 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revision: f9a20c32d16076be27e54bff43e4eb98795c5fa4 (tree)
• Zeit: 2011-09-23 01:10:11
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix bugs of UTF-8 to UTF-16 API bridge.
Add support for additional features of hosts.
Add support for MLSD command.

Ändern Zusammenfassung

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: common.h
• modified: connect.c
• modified: filelist.c
• modified: history.c
• modified: hostman.c
• modified: mbswrapper.c
• modified: mbswrapper.h
• modified: registory.c
• modified: remote.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/common.h
+++ b/common.h
@@ -292,6 +292,8 @@
 #define LIST_UNIX_73	45		/* UNIX 73 */
 #define LIST_UNIX_74	46		/* UNIX 74 */
 #define LIST_UNIX_75	47		/* UNIX 75 */
+// MLSD対応
+#define LIST_MLSD		48
 
 #define LIST_MELCOM		0x100	/* MELCOM80 */
 
@@ -868,6 +870,12 @@ LIST_UNIX_70
 #define CRYPT_FTPIS			2
 #define CRYPT_SFTP			3
 
+// FEAT対応
+// UTF-8対応
+#define FEATURE_UTF8		0x00000001
+// MLSD対応
+#define FEATURE_MLSD		0x00000002
+
 
 /*=================================================
 *		ストラクチャ
@@ -918,6 +926,10 @@ typedef struct {
 	int UseSFTP;						/* SFTPで接続する (YES/NO) */
 	// 同時接続対応
 	int MaxThreadCount;					/* 同時接続数 */
+	// FEAT対応
+	int Feature;						/* 利用可能な機能のフラグ (FEATURE_xxx) */
+	// MLSD対応
+	int UseMLSD;						/* "MLSD"コマンドを使用する */
 } HOSTDATA;
 
 
@@ -970,6 +982,8 @@ typedef struct historydata {
 	int UseSFTP;						/* SFTPで接続する (YES/NO) */
 	// 同時接続対応
 	int MaxThreadCount;					/* 同時接続数 */
+	// MLSD対応
+	int UseMLSD;						/* "MLSD"コマンドを使用する */
 	struct historydata *Next;
 } HISTORYDATA;
 
@@ -1383,6 +1397,10 @@ int AskUseFTPIS(void);
 int AskUseSFTP(void);
 // 同時接続対応
 int AskMaxThreadCount(void);
+// FEAT対応
+int AskHostFeature(void);
+// MLSD対応
+int AskUseMLSD(void);
 
 /*===== cache.c =====*/
 

--- a/connect.c
+++ b/connect.c
@@ -957,7 +957,7 @@ int ReConnectCmdSkt(void)
 // 同時接続対応
 int ReConnectTrnSkt(SOCKET *Skt)
 {
-	char Path[FMAX_PATH+1];
+//	char Path[FMAX_PATH+1];
 	int Sts;
 
 	Sts = FFFTP_FAIL;
@@ -1476,6 +1476,29 @@ static SOCKET DoConnect(char *Host, char *User, char *Pass, char *Acct, int Port
 #endif
 	TryConnect = NO;
 
+	// FEAT対応
+	// ホストの機能を確認
+	if(ContSock != INVALID_SOCKET)
+	{
+		if((Sts = command(ContSock, Reply, &CancelFlg, "FEAT")) == 211)
+		{
+			// 改行文字はReadReplyMessageで消去されるため区切り文字に空白を使用
+			// UTF-8対応
+			if(strstr(Reply, " UTF8 "))
+				CurHost.Feature |= FEATURE_UTF8;
+			// MLST対応
+			if(strstr(Reply, " MLST ") || strstr(Reply, " MLSD "))
+				CurHost.Feature |= FEATURE_MLSD;
+		}
+		// UTF-8対応
+		if(CurHost.NameKanjiCode == KANJI_AUTO && (CurHost.Feature & FEATURE_UTF8))
+		{
+			if((Sts = command(ContSock, Reply, &CancelFlg, "OPTS UTF8 ON")) == 200)
+			{
+			}
+		}
+	}
+
 	return(ContSock);
 }
 
@@ -2238,3 +2261,15 @@ int AskMaxThreadCount(void)
 	return(CurHost.MaxThreadCount);
 }
 
+// FEAT対応
+int AskHostFeature(void)
+{
+	return(CurHost.Feature);
+}
+
+// MLSD対応
+int AskUseMLSD(void)
+{
+	return(CurHost.UseMLSD);
+}
+

--- a/filelist.c
+++ b/filelist.c
@@ -97,6 +97,8 @@ static int CheckYYMMDDformat(char *Str, char Sym, int Dig3);
 static int CheckYYYYMMDDformat(char *Str, char Sym);
 static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size, FILETIME *Time, int *Attr, char *Owner, int *Link, int *InfoExist);
 static int FindField(char *Str, char *Buf, int Num, int ToLast);
+// MLSD対応
+static int FindField2(char *Str, char *Buf, char Separator, int Num, int ToLast);
 static void GetMonth(char *Str, WORD *Month, WORD *Day);
 static int GetYearMonthDay(char *Str, WORD *Year, WORD *Month, WORD *Day);
 static int GetHourAndMinute(char *Str, WORD *Hour, WORD *Minute);
@@ -3594,6 +3596,14 @@ static int AnalizeFileInfo(char *Str)
 			}
 		}
 
+		// MLSD対応
+		if(Ret == LIST_UNKNOWN)
+		{
+			if(FindField2(Str, Tmp, ';', 1, NO) == FFFTP_SUCCESS && FindField2(Str, Tmp, '=', 1, NO) == FFFTP_SUCCESS)
+			{
+				Ret = LIST_MLSD;
+			}
+		}
 	}
 
 DoPrintf("ListType=%d", Ret);
@@ -4830,6 +4840,56 @@ static int ResolvFileInfo(char *Str, int ListType, char *Fname, LONGLONG *Size,
 					Ret = NODE_NONE;
 			}
 			break;
+
+			// MLSD対応
+		case LIST_MLSD:
+			{
+				int i = 0;
+				char Tmp[FMAX_PATH + 1];
+				char Name[FMAX_PATH + 1];
+				char Value[FMAX_PATH + 1];
+				while(FindField2(Str, Tmp, ';', i, NO) == FFFTP_SUCCESS)
+				{
+					if(strncmp(Tmp, " ", 1) == 0)
+						strcpy(Fname, Tmp + 1);
+					else if(FindField2(Tmp, Name, '=', 0, NO) == FFFTP_SUCCESS && FindField2(Tmp, Value, '=', 1, NO) == FFFTP_SUCCESS)
+					{
+						if(_stricmp(Name, "type") == 0)
+						{
+							if(_stricmp(Value, "dir") == 0)
+								Ret = NODE_DIR;
+							else if(_stricmp(Value, "file") == 0)
+								Ret = NODE_FILE;
+						}
+						else if(_stricmp(Name, "size") == 0)
+						{
+							*Size = _atoi64(Value);
+							*InfoExist |= FINFO_SIZE;
+						}
+						else if(_stricmp(Name, "modify") == 0)
+						{
+							sTime.wYear = atoi_n(Value, 4);
+							sTime.wMonth = atoi_n(Value + 4, 2);
+							sTime.wDay = atoi_n(Value + 6, 2);
+							sTime.wHour = atoi_n(Value + 8, 2);
+							sTime.wMinute = atoi_n(Value + 10, 2);
+							sTime.wSecond = atoi_n(Value + 12, 2);
+							SystemTimeToFileTime(&sTime, Time);
+							SpecificLocalFileTime2FileTime(Time, AskHostTimeZone());
+							*InfoExist |= FINFO_DATE | FINFO_TIME;
+						}
+						else if(_stricmp(Name, "UNIX.mode") == 0)
+						{
+							*Attr = strtol(Value, NULL, 16);
+							*InfoExist |= FINFO_ATTR;
+						}
+						else if(_stricmp(Name, "UNIX.owner") == 0)
+							strcpy(Owner, Value);
+					}
+					i++;
+				}
+			}
+			break;
 	}
 
 	if((Ret != NODE_NONE) && (strlen(Fname) > 0))
@@ -4902,6 +4962,53 @@ static int FindField(char *Str, char *Buf, int Num, int ToLast)
 }
 
 
+// MLSD対応
+static int FindField2(char *Str, char *Buf, char Separator, int Num, int ToLast)
+{
+	char *Pos;
+	int Sts;
+
+	Sts = FFFTP_FAIL;
+	*Buf = NUL;
+	if(Num >= 0)
+	{
+		while(*Str == Separator)
+			Str++;
+
+		for(; Num > 0; Num--)
+		{
+			if((Str = strchr(Str, Separator)) != NULL)
+			{
+				while(*Str == Separator)
+				{
+					if(*Str == NUL)
+					{
+						Str = NULL;
+						break;
+					}
+					Str++;
+				}
+			}
+			else
+				break;
+		}
+	}
+
+	if(Str != NULL)
+	{
+		if((ToLast == YES) || ((Pos = strchr(Str, Separator)) == NULL))
+			strcpy(Buf, Str);
+		else
+		{
+			strncpy(Buf, Str, Pos - Str);
+			*(Buf + (Pos - Str)) = NUL;
+		}
+		Sts = FFFTP_SUCCESS;
+	}
+	return(Sts);
+}
+
+
 /*----- 文字列から月を求める --------------------------------------------------
 *
 *	Parameter

--- a/history.c
+++ b/history.c
@@ -229,6 +229,8 @@ static void CopyHostToHistory(HOSTDATA *Host, HISTORYDATA *New)
 	New->UseSFTP = Host->UseSFTP;
 	// 同時接続対応
 	New->MaxThreadCount = Host->MaxThreadCount;
+	// MLSD対応
+	New->UseMLSD = Host->UseMLSD;
 	return;
 }
 
@@ -284,6 +286,8 @@ void CopyHistoryToHost(HISTORYDATA *Hist, HOSTDATA *Host)
 	Host->UseSFTP = Hist->UseSFTP;
 	// 同時接続対応
 	Host->MaxThreadCount = Hist->MaxThreadCount;
+	// MLSD対応
+	Host->UseMLSD = Hist->UseMLSD;
 	return;
 }
 

--- a/hostman.c
+++ b/hostman.c
@@ -1029,6 +1029,8 @@ int CopyHostFromListInConnect(int Num, HOSTDATA *Set)
 		Set->UseSFTP = Pos->Set.UseSFTP;
 		// 同時接続対応
 		Set->MaxThreadCount = Pos->Set.MaxThreadCount;
+		// MLSD対応
+		Set->UseMLSD = Pos->Set.UseMLSD;
 		Sts = FFFTP_SUCCESS;
 	}
 	return(Sts);
@@ -1309,6 +1311,9 @@ void CopyDefaultHost(HOSTDATA *Set)
 	Set->UseSFTP = YES;
 	// 同時接続対応
 	Set->MaxThreadCount = 1;
+	// MLSD対応
+	Set->Feature = 0;
+	Set->UseMLSD = YES;
 	return;
 }
 

--- a/mbswrapper.c
+++ b/mbswrapper.c
@@ -355,6 +355,18 @@ void FreeDuplicatedString(void* p)
 #define END_ROUTINE						}while(0);end_of_routine:
 #define QUIT_ROUTINE					goto end_of_routine;
 
+int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow)
+{
+	int r = 0;
+	char* pm0 = NULL;
+START_ROUTINE
+	pm0 = DuplicateWtoM(lpCmdLine, -1);
+	r = WinMainM(hInstance, hPrevInstance, pm0, nCmdShow);
+END_ROUTINE
+	FreeDuplicatedString(pm0);
+	return r;
+}
+
 HANDLE CreateFileM(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile)
 {
 	HANDLE r = INVALID_HANDLE_VALUE;

--- a/mbswrapper.h
+++ b/mbswrapper.h
@@ -11,6 +11,9 @@
 
 #ifndef DO_NOT_REPLACE
 
+#undef WinMain
+#define WinMain WinMainM
+int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow);
 #undef CreateFile
 #define CreateFile CreateFileM
 HANDLE CreateFileM(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile);
@@ -222,5 +225,7 @@ char* DuplicateWtoM(LPCWSTR lpString, int c);
 char* DuplicateWtoA(LPCWSTR lpString, int c);
 void FreeDuplicatedString(void* p);
 
+int WINAPI WinMainM(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow);
+
 #endif
 

--- a/registory.c
+++ b/registory.c
@@ -468,6 +468,8 @@ void SaveRegistory(void)
 							SaveIntNum(hKey5, "SFTP", Hist.UseSFTP, DefaultHist.UseSFTP);
 							// 同時接続対応
 							SaveIntNum(hKey5, "ThreadCount", Hist.MaxThreadCount, DefaultHist.MaxThreadCount);
+							// MLSD対応
+							SaveIntNum(hKey5, "MLSD", Hist.UseMLSD, DefaultHist.UseMLSD);
 
 							CloseSubKey(hKey5);
 							n++;
@@ -542,6 +544,8 @@ void SaveRegistory(void)
 							SaveIntNum(hKey5, "SFTP", Host.UseSFTP, DefaultHost.UseSFTP);
 							// 同時接続対応
 							SaveIntNum(hKey5, "ThreadCount", Host.MaxThreadCount, DefaultHost.MaxThreadCount);
+							// MLSD対応
+							SaveIntNum(hKey5, "MLSD", Host.UseMLSD, DefaultHost.UseMLSD);
 						}
 						CloseSubKey(hKey5);
 					}
@@ -798,6 +802,8 @@ int LoadRegistory(void)
 					ReadIntValueFromReg(hKey5, "SFTP", &Hist.UseSFTP);
 					// 同時接続対応
 					ReadIntValueFromReg(hKey5, "ThreadCount", &Hist.MaxThreadCount);
+					// MLSD対応
+					ReadIntValueFromReg(hKey5, "MLSD", &Hist.UseMLSD);
 
 					CloseSubKey(hKey5);
 					AddHistoryToHistory(&Hist);
@@ -871,6 +877,8 @@ int LoadRegistory(void)
 					ReadIntValueFromReg(hKey5, "SFTP", &Host.UseSFTP);
 					// 同時接続対応
 					ReadIntValueFromReg(hKey5, "ThreadCount", &Host.MaxThreadCount);
+					// MLSD対応
+					ReadIntValueFromReg(hKey5, "MLSD", &Host.UseMLSD);
 
 					CloseSubKey(hKey5);
 

--- a/remote.c
+++ b/remote.c
@@ -593,7 +593,12 @@ static int DoDirList(HWND hWnd, SOCKET cSkt, char *AddOpt, char *Path, int Num,
 	}
 	else
 	{
-		strcpy(MainTransPkt.Cmd, "LIST");
+		// MLSD対応
+//		strcpy(MainTransPkt.Cmd, "LIST");
+		if(AskUseMLSD() && (AskHostFeature() & FEATURE_MLSD))
+			strcpy(MainTransPkt.Cmd, "MLSD");
+		else
+			strcpy(MainTransPkt.Cmd, "LIST");
 		if(strlen(AddOpt) > 0)
 		{
 			strcat(MainTransPkt.Cmd, " -");