Fix bugs of handling of time stamps.

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index 93fc720..270bf3e 100644 (file)
Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

diff --git a/Release/FFFTP.exe b/Release/FFFTP.exe
index 20751fc..e5c50c6 100644 (file)
Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

diff --git a/main.c b/main.c
index 1b5d7e8..f45f923 100644 (file)
--- a/main.c
+++ b/main.c
@@ -166,8 +166,8 @@ int WinWidth = 790;
 int WinHeight = 513;\r
 int LocalWidth = 389;\r
 int TaskHeight = 100;\r
-int LocalTabWidth[4] = { 160, 110, 60, 37 };\r
-int RemoteTabWidth[6] = { 160, 110, 60, 37, 60, 60 };\r
+int LocalTabWidth[4] = { 150, 120, 60, 37 };\r
+int RemoteTabWidth[6] = { 150, 120, 60, 37, 60, 60 };\r
 char UserMailAdrs[USER_MAIL_LEN+1] = { "who@example.com" };\r
 char ViewerName[VIEWERS][FMAX_PATH+1] = { { "notepad" }, { "" }, { "" } };\r
 HFONT ListFont = NULL;\r

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