sysutils/winscp
1
0
Fork 0
mirror of https://github.com/winscp/winscp.git synced 2026-10-24 02:28:55 +03:00
Code Activity

Bug fix: XML log and .NET assembly API does not use an absolute path for source of SCP download

Browse Source 
Source commit: c3bd3113e0adad75a23523f32e05bfc5bbfce613
This commit is contained in:
Martin Prikryl
2017-11-22 10:06:40 +00:00
parent 0070f40e4c
commit 7846d8d59f
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/core/ScpFileSystem.cpp
View File

@@ -2275,7 +2275,7 @@ void __fastcall TSCPFileSystem::SCPSink(const UnicodeString TargetDir,
// We can finally use full path here, as we get current path in FileName param
// (we used to set the file into OperationProgress->FileName, but it collided
// with progress outputting, particularly for scripting)
UnicodeString AbsoluteFileName = FileName;
UnicodeString FullFileName = FileName;
try
{
@@ -2384,8 +2384,8 @@ void __fastcall TSCPFileSystem::SCPSink(const UnicodeString TargetDir,
FTerminal->LogEvent(FORMAT(L"Warning: Remote host set a compound pathname '%s'", (Line)));
}
AbsoluteFileName = SourceDir + OnlyFileName;
OperationProgress->SetFile(AbsoluteFileName);
FullFileName = SourceDir + OnlyFileName;
OperationProgress->SetFile(FullFileName);
OperationProgress->SetTransferSize(TSize);
}
catch (Exception &E)
@@ -2404,16 +2404,16 @@ void __fastcall TSCPFileSystem::SCPSink(const UnicodeString TargetDir,
}
bool Dir = (Ctrl == L'D');
UnicodeString BaseFileName = FTerminal->GetBaseFileName(AbsoluteFileName);
UnicodeString BaseFileName = FTerminal->GetBaseFileName(FullFileName);
if (!CopyParam->AllowTransfer(BaseFileName, osRemote, Dir, MaskParams))
{
FTerminal->LogEvent(FORMAT(L"File \"%s\" excluded from transfer",
(AbsoluteFileName)));
(FullFileName)));
SkipConfirmed = true;
SCPError(L"", false);
}
if (CopyParam->SkipTransfer(AbsoluteFileName, Dir))
if (CopyParam->SkipTransfer(FullFileName, Dir))
{
SkipConfirmed = true;
SCPError(L"", false);
@@ -2456,7 +2456,7 @@ void __fastcall TSCPFileSystem::SCPSink(const UnicodeString TargetDir,
else if (Ctrl == L'C')
{
TDownloadSessionAction Action(FTerminal->ActionLog);
Action.FileName(AbsoluteFileName);
Action.FileName(FTerminal->AbsolutePath(FullFileName, true));
try
{
@@ -2642,7 +2642,7 @@ void __fastcall TSCPFileSystem::SCPSink(const UnicodeString TargetDir,
{
TSuspendFileOperationProgress Suspend(OperationProgress);
TQueryParams Params(qpAllowContinueOnError);
if (FTerminal->QueryUserException(FMTLOAD(COPY_ERROR, (AbsoluteFileName)),
if (FTerminal->QueryUserException(FMTLOAD(COPY_ERROR, (FullFileName)),
&E, qaOK | qaAbort, &Params, qtError) == qaAbort)
{
OperationProgress->SetCancel(csCancel);