提交: c49416f1b104061b94d29d77b115d10c7d8cdb27 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• 修订版: c49416f1b104061b94d29d77b115d10c7d8cdb27 (tree)
• 时间: 2012-10-25 23:10:51
• 作者: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix bugs of handling of time stamps.

更改概述

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: main.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/main.c
+++ b/main.c
@@ -166,8 +166,8 @@ int WinWidth = 790;
 int WinHeight = 513;
 int LocalWidth = 389;
 int TaskHeight = 100;
-int LocalTabWidth[4] = { 160, 110, 60, 37 };
-int RemoteTabWidth[6] = { 160, 110, 60, 37, 60, 60 };
+int LocalTabWidth[4] = { 150, 120, 60, 37 };
+int RemoteTabWidth[6] = { 150, 120, 60, 37, 60, 60 };
 char UserMailAdrs[USER_MAIL_LEN+1] = { "[e-mail]" };
 char ViewerName[VIEWERS][FMAX_PATH+1] = { { "notepad" }, { "" }, { "" } };
 HFONT ListFont = NULL;

--- a/misc.c
+++ b/misc.c
@@ -1094,10 +1094,15 @@ int TimeString2FileTime(char *Time, FILETIME *Buf)
     Buf->dwLowDateTime = 0;
     Buf->dwHighDateTime = 0;
 
-	if(strlen(Time) >= 16)
+	// タイムスタンプのバグ修正
+//	if(strlen(Time) >= 16)
+	if(strlen(Time) >= 19)
 	{
+		// タイムスタンプのバグ修正
+//		if(IsDigit(Time[0]) && IsDigit(Time[5]) && IsDigit(Time[8]) && 
+//		   IsDigit(Time[12]) && IsDigit(Time[14]))
 		if(IsDigit(Time[0]) && IsDigit(Time[5]) && IsDigit(Time[8]) && 
-		   IsDigit(Time[12]) && IsDigit(Time[14]))
+		   IsDigit(Time[12]) && IsDigit(Time[14]) && IsDigit(Time[17]))
 		{
 			Ret = YES;
 		}
@@ -1110,7 +1115,9 @@ int TimeString2FileTime(char *Time, FILETIME *Buf)
 		else
 			sTime.wHour = atoi(Time + 12);
 		sTime.wMinute = atoi(Time + 14);
-		sTime.wSecond = 0;
+		// タイムスタンプのバグ修正
+//		sTime.wSecond = 0;
+		sTime.wSecond = atoi(Time + 17);
 		sTime.wMilliseconds = 0;
 
 		SystemTimeToFileTime(&sTime, &fTime);
@@ -1142,7 +1149,9 @@ void FileTime2TimeString(FILETIME *Time, char *Buf, int Mode, int InfoExist)
 		if((Time->dwLowDateTime == 0) && (Time->dwHighDateTime == 0))
 			InfoExist = 0;
 
-		/* "yyyy/mm/dd hh:mm" */
+		// タイムスタンプのバグ修正
+//		/* "yyyy/mm/dd hh:mm" */
+		/* "yyyy/mm/dd hh:mm:ss" */
 		FileTimeToLocalFileTime(Time, &fTime);
 		FileTimeToSystemTime(&fTime, &sTime);
 
@@ -1152,9 +1161,13 @@ void FileTime2TimeString(FILETIME *Time, char *Buf, int Mode, int InfoExist)
 			sprintf(Buf, "           ");
 
 		if(InfoExist & FINFO_TIME)
-			sprintf(Buf+11, "%2d:%02d", sTime.wHour, sTime.wMinute);
+			// タイムスタンプのバグ修正
+//			sprintf(Buf+11, "%2d:%02d", sTime.wHour, sTime.wMinute);
+			sprintf(Buf+11, "%2d:%02d:%02d", sTime.wHour, sTime.wMinute, sTime.wSecond);
 		else
-			sprintf(Buf+11, "     ");
+			// タイムスタンプのバグ修正
+//			sprintf(Buf+11, "     ");
+			sprintf(Buf+11, "        ");
 	}
 	else
 	{