Skip to content

Commit

Permalink
Bug 1535: Do not terminate path with slash in CWD FTP command for bet…
Browse files Browse the repository at this point in the history 
…ter compatibility with VMS systems

https://winscp.net/tracker/1535

Source commit: 788d6278bdb6323693356499051b92dcb7cf4dd1
  • Loading branch information
@martinprikryl
martinprikryl committed Jan 28, 2018
1 parent ee1a6cc commit 50ceaef
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 13 deletions.
24 changes: 12 additions & 12 deletions source/filezilla/FtpControlSocket.cpp
View file
Expand Up @@ -2031,7 +2031,7 @@ void CFtpControlSocket::List(BOOL bFinish, int nError /*=FALSE*/, CServerPath pa
if (m_Operation.nOpState == LIST_PWD)
cmd=L"PWD";
else if (m_Operation.nOpState==LIST_CWD)
cmd=L"CWD " + pData->path.GetPath(); //Command to retrieve the current directory
cmd=L"CWD " + pData->path.GetPathUnterminated(); //Command to retrieve the current directory
else if (m_Operation.nOpState==LIST_PWD2)
cmd=L"PWD";
else if (m_Operation.nOpState==LIST_CWD2)
Expand All @@ -2047,7 +2047,7 @@ void CFtpControlSocket::List(BOOL bFinish, int nError /*=FALSE*/, CServerPath pa
{
CServerPath path = m_pOwner->GetCurrentPath();
path.AddSubdir(pData->subdir);
cmd = L"CWD " + path.GetPath();
cmd = L"CWD " + path.GetPathUnterminated();
}
else
cmd = L"CWD " + pData->subdir;
Expand Down Expand Up @@ -2413,7 +2413,7 @@ void CFtpControlSocket::ListFile(CString filename, const CServerPath &path)
if (code == 2)
{
pData->direntry->dir = TRUE;
if (Send(L"CWD " + pData->pwd.GetPath()))
if (Send(L"CWD " + pData->pwd.GetPathUnterminated()))
{
m_Operation.nOpState = LISTFILE_CWD2;
}
Expand Down Expand Up @@ -2950,7 +2950,7 @@ void CFtpControlSocket::FileTransfer(t_transferfile *transferfile/*=0*/,BOOL bFi
{
pData->MKDSegments.push_front(pData->MKDCurrent.GetLastSegment());
pData->MKDCurrent=pData->MKDCurrent.GetParent();
if (!Send(L"CWD "+pData->MKDCurrent.GetPath()))
if (!Send(L"CWD "+pData->MKDCurrent.GetPathUnterminated()))
return;
}
}
Expand Down Expand Up @@ -3048,7 +3048,7 @@ void CFtpControlSocket::FileTransfer(t_transferfile *transferfile/*=0*/,BOOL bFi
m_Operation.nOpState=FILETRANSFER_CWD2;
else
{
if (Send( L"CWD " + pData->MKDCurrent.GetPath()))
if (Send( L"CWD " + pData->MKDCurrent.GetPathUnterminated()))
pData->nMKDOpState=MKD_MAKESUBDIRS;
else
return;
Expand Down Expand Up @@ -3792,7 +3792,7 @@ void CFtpControlSocket::FileTransfer(t_transferfile *transferfile/*=0*/,BOOL bFi
bError = TRUE;
break;
case FILETRANSFER_CWD:
if (!Send(L"CWD "+pData->transferfile.remotepath.GetPath()))
if (!Send(L"CWD "+pData->transferfile.remotepath.GetPathUnterminated()))
bError=TRUE;
break;
case FILETRANSFER_MKD:
Expand All @@ -3804,15 +3804,15 @@ void CFtpControlSocket::FileTransfer(t_transferfile *transferfile/*=0*/,BOOL bFi
ResetOperation(FZ_REPLY_CRITICALERROR);
return;
}
if (!Send(L"CWD "+pData->transferfile.remotepath.GetParent().GetPath()))
if (!Send(L"CWD "+pData->transferfile.remotepath.GetParent().GetPathUnterminated()))
bError=TRUE;
pData->MKDCurrent=pData->transferfile.remotepath.GetParent();
pData->MKDSegments.push_front(pData->transferfile.remotepath.GetLastSegment());
pData->nMKDOpState=MKD_FINDPARENT;
}
break;
case FILETRANSFER_CWD2:
if (!Send(L"CWD "+pData->transferfile.remotepath.GetPath()))
if (!Send(L"CWD "+pData->transferfile.remotepath.GetPathUnterminated()))
bError=TRUE;
break;
case FILETRANSFER_PWD2:
Expand Down Expand Up @@ -4782,7 +4782,7 @@ void CFtpControlSocket::RemoveDir(CString dirname, const CServerPath &path)
ShowStatus(L"Unable to concatenate path", FZ_LOG_ERROR);
return;
}
if (!Send(L"RMD "+ newPath.GetPath()))
if (!Send(L"RMD "+ newPath.GetPathUnterminated()))
return;
CRemoveDirData *data = new CRemoveDirData;
data->m_DirName = dirname;
Expand Down Expand Up @@ -5111,7 +5111,7 @@ void CFtpControlSocket::MakeDir(const CServerPath &path)
DebugAssert(m_Operation.nOpMode==CSMODE_NONE);
DebugAssert(!m_Operation.pData);
m_Operation.nOpMode = CSMODE_MKDIR;
if (!Send(L"CWD "+path.GetParent().GetPath()))
if (!Send(L"CWD "+path.GetParent().GetPathUnterminated()))
return;
CMakeDirData *data = new CMakeDirData;
data->path = path;
Expand Down Expand Up @@ -5148,7 +5148,7 @@ void CFtpControlSocket::MakeDir(const CServerPath &path)
{
pData->Segments.push_front(pData->Current.GetLastSegment());
pData->Current=pData->Current.GetParent();
if (!Send(L"CWD "+pData->Current.GetPath()))
if (!Send(L"CWD "+pData->Current.GetPathUnterminated()))
return;
}
}
Expand Down Expand Up @@ -5254,7 +5254,7 @@ void CFtpControlSocket::MakeDir(const CServerPath &path)
ResetOperation(FZ_REPLY_OK);
else
{
if (Send( L"CWD " + pData->Current.GetPath()))
if (Send( L"CWD " + pData->Current.GetPathUnterminated()))
m_Operation.nOpState=MKD_MAKESUBDIRS;
else
return;
Expand Down
19 changes: 18 additions & 1 deletion source/filezilla/ServerPath.cpp
View file
Expand Up @@ -309,7 +309,7 @@ BOOL CServerPath::SetPath(CString &newpath, BOOL bIsFile /*=FALSE*/)
return TRUE;
}

const CString CServerPath::GetPath() const
const CString CServerPath::DoGetPath(bool unterminated) const
{
if (m_bEmpty)
return L"";
Expand Down Expand Up @@ -343,6 +343,13 @@ const CString CServerPath::GetPath() const
path=L"/";
for (iter=m_Segments.begin(); iter!=m_Segments.end(); iter++)
path+=*iter + L"/";
if (unterminated)
{
if (path.GetLength() >= 2)
{
path.Delete(path.GetLength() - 1, 1);
}
}
break;
}
break;
Expand All @@ -352,6 +359,16 @@ const CString CServerPath::GetPath() const
return path;
}

const CString CServerPath::GetPath() const
{
return DoGetPath(false);
}

const CString CServerPath::GetPathUnterminated() const
{
return DoGetPath(true);
}

CServerPath& CServerPath::operator=(const CServerPath &op)
{
if (this == &op)
Expand Down
4 changes: 4 additions & 0 deletions source/filezilla/ServerPath.h
View file
Expand Up @@ -21,6 +21,7 @@ class CServerPath
BOOL SetPath(CString & newpath, BOOL bIsFile);
BOOL SetPath(CString newpath);
const CString GetPath() const;
const CString GetPathUnterminated() const;

CServerPath & operator=(const CServerPath & op);

Expand All @@ -37,6 +38,9 @@ class CServerPath
typedef std::list<CString>::const_iterator tConstIter;
CString m_Prefix;
int m_nServerType;

private:
const CString DoGetPath(bool unterminated) const;
};
//---------------------------------------------------------------------------
#endif // ServerPathH

0 comments on commit 50ceaef

Please sign in to comment.