Commit: 5a37200135b1c3c60df84d0dc0a8f294d7ca9604 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revision: 5a37200135b1c3c60df84d0dc0a8f294d7ca9604 (tree)
• Zeit: 2013-01-06 21:24:49
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix bugs of analysis of LIST/MLSD response types.

Ändern Zusammenfassung

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: filelist.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/filelist.c
+++ b/filelist.c
@@ -3601,11 +3601,22 @@ static int AnalizeFileInfo(char *Str)
 		Ret = LIST_SHIBASOKU;
 	else
 	{
+		// MLSD対応
+		if(FindField(Str, Tmp, 0, NO) == FFFTP_SUCCESS && strstr(Tmp, "type=") != NULL)
+		{
+			if(FindField2(Str, Tmp, ';', 1, NO) == FFFTP_SUCCESS && FindField2(Str, Tmp, '=', 1, NO) == FFFTP_SUCCESS)
+			{
+				Ret = LIST_MLSD;
+			}
+		}
+
 		/* 以下のフォーマットをチェック */
 		/* LIST_UNIX_10, LIST_UNIX_20, LIST_UNIX_12, LIST_UNIX_22, LIST_UNIX_50, LIST_UNIX_60 */
 		/* MELCOM80 */
 
-		if(FindField(Str, Tmp, 0, NO) == FFFTP_SUCCESS)
+		// MLSD対応
+//		if(FindField(Str, Tmp, 0, NO) == FFFTP_SUCCESS)
+		if(Ret == LIST_UNKNOWN && FindField(Str, Tmp, 0, NO) == FFFTP_SUCCESS)
 		{
 			/* MELCOM80は "d rwxrwxrwx" のようにスペースが空いている */
 			Flag1 = NO;
@@ -4041,14 +4052,6 @@ static int AnalizeFileInfo(char *Str)
 		}
 #endif
 
-		// 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);