コミット: 2a2b6d8b2448f4acb3e987ade7712712bce5a686 - ffftp (git)

Loweynet

コミットメタ情報

• リビジョン: 2a2b6d8b2448f4acb3e987ade7712712bce5a686 (tree)
• 日時: 2012-11-08 23:08:20
• 作者: s_kawamoto <s_kawamoto@user...>
• コミッター: s_kawamoto

ログメッセージ

Fix bugs of handling of time stamps.

変更サマリ

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: filelist.c
• modified: misc.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/filelist.c
+++ b/filelist.c
@@ -2838,6 +2838,7 @@ void MakeSelectedFileList(int Win, int Expand, int All, FILELIST **Base, int *Ca
 
 					if(Ignore == NO)
 					{
+//						Pkt.Node = NODE_DIR;
 						if(GetImageIndex(Win, Pos) == 4) // symlink
 							Pkt.Node = NODE_FILE;
 						else
@@ -2847,6 +2848,18 @@ void MakeSelectedFileList(int Win, int Expand, int All, FILELIST **Base, int *Ca
 						memset(&Pkt.Time, 0, sizeof(FILETIME));
 						AddFileList(&Pkt, Base);
 
+//						if(Win == WIN_LOCAL)
+//							MakeLocalTree(Name, Base);
+//						else
+//						{
+//							AskRemoteCurDir(Cur, FMAX_PATH);
+//
+//							if((AskListCmdMode() == NO) &&
+//							   (AskUseNLST_R() == YES))
+//								MakeRemoteTree1(Name, Cur, Base, CancelCheckWork);
+//							else
+//								MakeRemoteTree2(Name, Cur, Base, CancelCheckWork);
+//						}
 						if(GetImageIndex(Win, Pos) != 4) { // symlink
 							if(Win == WIN_LOCAL)
 								MakeLocalTree(Name, Base);
@@ -3081,8 +3094,9 @@ static void MakeRemoteTree2(char *Path, char *Cur, FILELIST **Base, int *CancelC
 
 					/* まずディレクトリ名をセット */
 					strcpy(Pkt.File, Pos->File);
+//					Pkt.Node = NODE_DIR;
 					Pkt.Link = Pos->Link;
-					if(Pkt.Link)
+					if(Pkt.Link == YES)
 						Pkt.Node = NODE_FILE;
 					else
 						Pkt.Node = NODE_DIR;
@@ -3092,7 +3106,8 @@ static void MakeRemoteTree2(char *Path, char *Cur, FILELIST **Base, int *CancelC
 					AddFileList(&Pkt, Base);
 
 					/* そのディレクトリの中を検索 */
-					if(!Pkt.Link)
+//					MakeRemoteTree2(Pos->File, Cur, Base, CancelCheckWork);
+					if(Pkt.Link == NO)
 						MakeRemoteTree2(Pos->File, Cur, Base, CancelCheckWork);
 				}
 				Pos = Pos->Next;

--- a/misc.c
+++ b/misc.c
@@ -1155,19 +1155,30 @@ void FileTime2TimeString(FILETIME *Time, char *Buf, int Mode, int InfoExist)
 		FileTimeToLocalFileTime(Time, &fTime);
 		FileTimeToSystemTime(&fTime, &sTime);
 
-		if(InfoExist & FINFO_DATE)
-			sprintf(Buf, "%04d/%02d/%02d ", sTime.wYear, sTime.wMonth, sTime.wDay);
-		else
-			sprintf(Buf, "           ");
-
-		if(InfoExist & FINFO_TIME)
-			// タイムスタンプのバグ修正
+		// タイムスタンプのバグ修正
+//		if(InfoExist & FINFO_DATE)
+//			sprintf(Buf, "%04d/%02d/%02d ", sTime.wYear, sTime.wMonth, sTime.wDay);
+//		else
+//			sprintf(Buf, "           ");
+//
+//		if(InfoExist & FINFO_TIME)
 //			sprintf(Buf+11, "%2d:%02d", sTime.wHour, sTime.wMinute);
-			sprintf(Buf+11, "%2d:%02d:%02d", sTime.wHour, sTime.wMinute, sTime.wSecond);
-		else
-			// タイムスタンプのバグ修正
+//		else
 //			sprintf(Buf+11, "     ");
-			sprintf(Buf+11, "        ");
+		if(InfoExist & (FINFO_DATE | FINFO_TIME))
+		{
+			if(InfoExist & FINFO_DATE)
+				sprintf(Buf, "%04d/%02d/%02d ", sTime.wYear, sTime.wMonth, sTime.wDay);
+			else
+				sprintf(Buf, "           ");
+
+			if(InfoExist & FINFO_TIME)
+				sprintf(Buf+11, "%2d:%02d:%02d", sTime.wHour, sTime.wMinute, sTime.wSecond);
+			else
+				sprintf(Buf+11, "        ");
+		}
+		else
+			Buf[0] = NUL;
 	}
 	else
 	{