1
0
mirror of https://github.com/winscp/winscp.git synced 2026-10-24 02:28:55 +03:00
This commit is contained in:
Martin Prikryl
2013-09-16 14:43:13 +00:00
parent 1abb25b42b
commit 0b4c19ead3
169 changed files with 3666 additions and 5920 deletions

View File

@@ -3186,6 +3186,7 @@ void __fastcall TSFTPFileSystem::ReadSymlink(TRemoteFile * SymlinkFile,
FTerminal->FatalError(NULL, LoadStr(SFTP_NON_ONE_FXP_NAME_PACKET));
}
SymlinkFile->LinkTo = ReadLinkPacket.GetPathString(FUtfStrings);
FTerminal->LogEvent(FORMAT(L"Link resolved to \"%s\".", (SymlinkFile->LinkTo)));
ReceiveResponse(&AttrsPacket, &AttrsPacket, SSH_FXP_ATTRS);
// SymlinkFile->FileName was used instead SymlinkFile->LinkTo before, why?
@@ -4903,7 +4904,7 @@ void __fastcall TSFTPFileSystem::SFTPSink(const UnicodeString FileName,
);
FILE_OPERATION_LOOP (FMTLOAD(CREATE_DIR_ERROR, (DestFullName)),
if (!ForceDirectories(DestFullName)) RaiseLastOSError();
THROWOSIFFALSE(ForceDirectories(DestFullName));
);
TSinkFileParams SinkFileParams;
@@ -5310,12 +5311,9 @@ void __fastcall TSFTPFileSystem::SFTPSink(const UnicodeString FileName,
if (FileExists(DestFullName))
{
THROWOSIFFALSE(Sysutils::DeleteFile(DestFullName));
}
if (!Sysutils::RenameFile(DestPartialFullName, DestFullName))
{
RaiseLastOSError();
DeleteFileChecked(DestFullName);
}
THROWOSIFFALSE(Sysutils::RenameFile(DestPartialFullName, DestFullName));
);
}