Bug 1424: Autodetected timezone difference for servers not supporting MLST command was not taken into account for time on overwrite confirmation dialog

https://winscp.net/tracker/1424

Source commit: c3c99c63b01c9af8b732447dfa1b8944ffd3ab63

source/core/FtpFileSystem.cpp

@@ -2463,23 +2463,46 @@ void __fastcall TFTPFileSystem::ApplyTimeDifference(TRemoteFile * File)
   DebugAssert(File->Modification == File->LastAccess);
   File->ShiftTimeInSeconds(FTimeDifference);
 
-  if (File->ModificationFmt != mfFull)
+  TDateTime Modification = File->Modification;
+  if (LookupUploadModificationTime(File->FullFileName, Modification, File->ModificationFmt))
   {
-    TUploadedTimes::iterator Iterator = FUploadedTimes.find(AbsolutePath(File->FullFileName, false));
+    // implicitly sets ModificationFmt to mfFull
+    File->Modification = Modification;
+  }
+}
+//---------------------------------------------------------------------------
+void __fastcall TFTPFileSystem::ApplyTimeDifference(
+  const UnicodeString & FileName, TDateTime & Modification, TModificationFmt & ModificationFmt)
+{
+  TRemoteFile::ShiftTimeInSeconds(Modification, ModificationFmt, FTimeDifference);
+
+  if (LookupUploadModificationTime(FileName, Modification, ModificationFmt))
+  {
+    ModificationFmt = mfFull;
+  }
+}
+//---------------------------------------------------------------------------
+bool __fastcall TFTPFileSystem::LookupUploadModificationTime(
+  const UnicodeString & FileName, TDateTime & Modification, TModificationFmt ModificationFmt)
+{
+  bool Result = false;
+  if (ModificationFmt != mfFull)
+  {
+    TUploadedTimes::iterator Iterator = FUploadedTimes.find(AbsolutePath(FileName, false));
     if (Iterator != FUploadedTimes.end())
     {
       TDateTime UploadModification = Iterator->second;
-      TDateTime UploadModificationReduced = ReduceDateTimePrecision(UploadModification, File->ModificationFmt);
-      if (UploadModificationReduced == File->Modification)
+      TDateTime UploadModificationReduced = ReduceDateTimePrecision(UploadModification, ModificationFmt);
+      if (UploadModificationReduced == Modification)
       {
         if ((FTerminal->Configuration->ActualLogProtocol >= 2))
         {
           FTerminal->LogEvent(
             FORMAT(L"Enriching modification time of \"%s\" from [%s] to [%s]",
-                   (File->FullFileName, StandardTimestamp(File->Modification), StandardTimestamp(UploadModification))));
+                   (FileName, StandardTimestamp(Modification), StandardTimestamp(UploadModification))));
         }
-        // implicitly sets ModificationFmt to mfFull
-        File->Modification = UploadModification;
+        Modification = UploadModification;
+        Result = true;
       }
       else
       {
@@ -2487,12 +2510,14 @@ void __fastcall TFTPFileSystem::ApplyTimeDifference(TRemoteFile * File)
         {
           FTerminal->LogEvent(
             FORMAT(L"Remembered modification time [%s]/[%s] of \"%s\" is obsolete, keeping [%s]",
-                   (StandardTimestamp(UploadModification), StandardTimestamp(UploadModificationReduced), File->FullFileName, StandardTimestamp(File->Modification))));
+                   (StandardTimestamp(UploadModification), StandardTimestamp(UploadModificationReduced), FileName, StandardTimestamp(Modification))));
         }
         FUploadedTimes.erase(Iterator);
       }
     }
   }
+
+  return Result;
 }
 //---------------------------------------------------------------------------
 void __fastcall TFTPFileSystem::AutoDetectTimeDifference(TRemoteFileList * FileList)
@@ -3946,7 +3971,7 @@ TDateTime __fastcall TFTPFileSystem::ConvertLocalTimestamp(time_t Time)
 //---------------------------------------------------------------------------
 bool __fastcall TFTPFileSystem::HandleAsynchRequestOverwrite(
   wchar_t * FileName1, size_t FileName1Len, const wchar_t * FileName2,
-  const wchar_t * /*Path1*/, const wchar_t * Path2,
+  const wchar_t * Path1, const wchar_t * Path2,
   __int64 Size1, __int64 Size2, time_t LocalTime,
   bool /*HasLocalTime*/, const TRemoteFileTime & RemoteTime, void * AUserData, int & RequestResult)
 {
@@ -3967,6 +3992,22 @@ bool __fastcall TFTPFileSystem::HandleAsynchRequestOverwrite(
       TFileOperationProgressType * OperationProgress = FTerminal->OperationProgress;
       UnicodeString TargetFileName = FileName1;
       DebugAssert(UserData.FileName == TargetFileName);
+
+      UnicodeString SourceFullFileName = Path2;
+      UnicodeString TargetFullFileName = Path1;
+      if (OperationProgress->Side == osLocal)
+      {
+        SourceFullFileName = IncludeTrailingBackslash(SourceFullFileName);
+        TargetFullFileName = UnixIncludeTrailingBackslash(TargetFullFileName);
+      }
+      else
+      {
+        SourceFullFileName = UnixIncludeTrailingBackslash(SourceFullFileName);
+        TargetFullFileName = IncludeTrailingBackslash(TargetFullFileName);
+      }
+      SourceFullFileName += FileName2;
+      TargetFullFileName += FileName1;
+
       TOverwriteMode OverwriteMode = omOverwrite;
       TOverwriteFileParams FileParams;
       bool NoFileParams =
@@ -3977,29 +4018,29 @@ bool __fastcall TFTPFileSystem::HandleAsynchRequestOverwrite(
         FileParams.SourceSize = Size2;
         FileParams.DestSize = Size1;
 
+        // Time is coming from LIST (not from MLSD or MDTM)
+        bool NeedApplyTimeDifference = !RemoteTime.Utc && DebugAlwaysTrue(!FFileZillaIntf->UsingMlsd());
+
         if (OperationProgress->Side == osLocal)
         {
           FileParams.SourceTimestamp = ConvertLocalTimestamp(LocalTime);
           RemoteFileTimeToDateTimeAndPrecision(RemoteTime, FileParams.DestTimestamp, FileParams.DestPrecision);
+          if (NeedApplyTimeDifference)
+          {
+            ApplyTimeDifference(TargetFullFileName, FileParams.DestTimestamp, FileParams.DestPrecision);
+          }
         }
         else
         {
           FileParams.DestTimestamp = ConvertLocalTimestamp(LocalTime);
           RemoteFileTimeToDateTimeAndPrecision(RemoteTime, FileParams.SourceTimestamp, FileParams.SourcePrecision);
+          if (NeedApplyTimeDifference)
+          {
+            ApplyTimeDifference(SourceFullFileName, FileParams.SourceTimestamp, FileParams.SourcePrecision);
+          }
         }
       }
 
-      UnicodeString SourceFullFileName = Path2;
-      if (OperationProgress->Side == osLocal)
-      {
-        SourceFullFileName = IncludeTrailingBackslash(SourceFullFileName);
-      }
-      else
-      {
-        SourceFullFileName = UnixIncludeTrailingBackslash(SourceFullFileName);
-      }
-      SourceFullFileName += FileName2;
-
       if (ConfirmOverwrite(SourceFullFileName, TargetFileName, OverwriteMode, OperationProgress,
             (NoFileParams ? NULL : &FileParams), UserData.CopyParam, UserData.Params,
             UserData.AutoResume && UserData.CopyParam->AllowResume(FileParams.SourceSize)))

source/core/FtpFileSystem.h

@@ -190,6 +190,10 @@ protected:
   bool __fastcall SupportsReadingFile();
   void __fastcall AutoDetectTimeDifference(TRemoteFileList * FileList);
   void __fastcall ApplyTimeDifference(TRemoteFile * File);
+  void __fastcall ApplyTimeDifference(
+    const UnicodeString & FileName, TDateTime & Modification, TModificationFmt & ModificationFmt);
+  bool __fastcall LookupUploadModificationTime(
+    const UnicodeString & FileName, TDateTime & Modification, TModificationFmt ModificationFmt);
   UnicodeString __fastcall DoCalculateFileChecksum(bool UsingHashCommand, const UnicodeString & Alg, TRemoteFile * File);
   void __fastcall DoCalculateFilesChecksum(bool UsingHashCommand, const UnicodeString & Alg,
     TStrings * FileList, TStrings * Checksums,

source/core/RemoteFiles.cpp

@@ -988,18 +988,27 @@ bool __fastcall TRemoteFile::GetBrokenLink()
 }
 //---------------------------------------------------------------------------
 bool __fastcall TRemoteFile::IsTimeShiftingApplicable()
+{
+  return IsTimeShiftingApplicable(ModificationFmt);
+}
+//---------------------------------------------------------------------------
+bool __fastcall TRemoteFile::IsTimeShiftingApplicable(TModificationFmt ModificationFmt)
 {
   return (ModificationFmt == mfMDHM) || (ModificationFmt == mfFull);
 }
 //---------------------------------------------------------------------------
 void __fastcall TRemoteFile::ShiftTimeInSeconds(__int64 Seconds)
 {
-  if ((Seconds != 0) && IsTimeShiftingApplicable())
+  ShiftTimeInSeconds(FModification, ModificationFmt, Seconds);
+  ShiftTimeInSeconds(FLastAccess, ModificationFmt, Seconds);
+}
+//---------------------------------------------------------------------------
+void __fastcall TRemoteFile::ShiftTimeInSeconds(TDateTime & DateTime, TModificationFmt ModificationFmt, __int64 Seconds)
+{
+  if ((Seconds != 0) && IsTimeShiftingApplicable(ModificationFmt))
   {
-    DebugAssert(int(FModification) != 0);
-    FModification = IncSecond(FModification, Seconds);
-    DebugAssert(int(FLastAccess) != 0);
-    FLastAccess = IncSecond(FLastAccess, Seconds);
+    DebugAssert(int(DateTime) != 0);
+    DateTime = IncSecond(DateTime, Seconds);
   }
 }
 //---------------------------------------------------------------------------

source/core/RemoteFiles.h

@@ -145,6 +145,9 @@ public:
   bool __fastcall IsTimeShiftingApplicable();
   void __fastcall Complete();
 
+  static bool __fastcall IsTimeShiftingApplicable(TModificationFmt ModificationFmt);
+  static void __fastcall ShiftTimeInSeconds(TDateTime & DateTime, TModificationFmt ModificationFmt, __int64 Seconds);
+
   __property int Attr = { read = GetAttr };
   __property bool BrokenLink = { read = GetBrokenLink };
   __property TRemoteFileList * Directory = { read = FDirectory, write = FDirectory };