X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0c133e13b36a923c65f94499554e432bc3a0daa..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/common/ftp.cpp diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp index e2854eeb6b..dfda3b0c8c 100644 --- a/src/common/ftp.cpp +++ b/src/common/ftp.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: common/ftp.cpp +// Name: src/common/ftp.cpp // Purpose: FTP protocol // Author: Guilhem Lavaux // Modified by: Mark Johnson, wxWindows@mj10777.de @@ -48,9 +48,7 @@ #include "wx/protocol/protocol.h" #include "wx/protocol/ftp.h" -#ifndef __MWERKS__ - #include -#endif +#include // ---------------------------------------------------------------------------- // constants @@ -155,11 +153,15 @@ bool wxFTP::Connect(const wxSockAddress& addr, bool WXUNUSED(wait)) return true; } -bool wxFTP::Connect(const wxString& host) +bool wxFTP::Connect(const wxString& host, unsigned short port) { wxIPV4address addr; addr.Hostname(host); - addr.Service(wxT("ftp")); + + if ( port ) + addr.Service(port); + else if (!addr.Service(wxT("ftp"))) + addr.Service(21); return Connect(addr); } @@ -177,7 +179,7 @@ bool wxFTP::Close() if ( !CheckCommand(wxT("QUIT"), '2') ) { m_lastError = wxPROTO_CONNERR; - wxLogDebug(_T("Failed to close connection gracefully.")); + wxLogDebug(wxT("Failed to close connection gracefully.")); } } @@ -199,8 +201,7 @@ wxSocketBase *wxFTP::AcceptIfActive(wxSocketBase *sock) { m_lastError = wxPROTO_CONNERR; wxLogError(_("Timeout while waiting for FTP server to connect, try passive mode.")); - delete sock; - sock = NULL; + wxDELETE(sock); } else { @@ -245,20 +246,18 @@ char wxFTP::SendCommand(const wxString& command) return 0; } -#ifdef __WXDEBUG__ // don't show the passwords in the logs (even in debug ones) wxString cmd, password; - if ( command.Upper().StartsWith(_T("PASS "), &password) ) + if ( command.Upper().StartsWith(wxT("PASS "), &password) ) { - cmd << _T("PASS ") << wxString(_T('*'), password.length()); + cmd << wxT("PASS ") << wxString(wxT('*'), password.length()); } else { cmd = command; } - wxLogTrace(FTP_TRACE_MASK, _T("==> %s"), cmd.c_str()); -#endif // __WXDEBUG__ + LogRequest(cmd); m_lastError = wxPROTO_NOERR; return GetResult(); @@ -301,10 +300,12 @@ char wxFTP::GetResult() return 0; } + LogResponse(line); + if ( !m_lastResult.empty() ) { // separate from last line - m_lastResult += _T('\n'); + m_lastResult += wxT('\n'); } m_lastResult += line; @@ -317,11 +318,6 @@ char wxFTP::GetResult() { badReply = true; } - else - { - wxLogTrace(FTP_TRACE_MASK, _T("<== %s %s"), - code.c_str(), line.c_str()); - } } else // line has at least 4 chars { @@ -331,16 +327,14 @@ char wxFTP::GetResult() if ( firstLine ) { code = wxString(line, LEN_CODE); - wxLogTrace(FTP_TRACE_MASK, _T("<== %s %s"), - code.c_str(), line.c_str() + LEN_CODE + 1); switch ( chMarker ) { - case _T(' '): + case wxT(' '): endOfReply = true; break; - case _T('-'): + case wxT('-'): firstLine = false; break; @@ -353,19 +347,10 @@ char wxFTP::GetResult() { if ( line.compare(0, LEN_CODE, code) == 0 ) { - if ( chMarker == _T(' ') ) + if ( chMarker == wxT(' ') ) { endOfReply = true; } - - wxLogTrace(FTP_TRACE_MASK, _T("<== %s %s"), - code.c_str(), line.c_str() + LEN_CODE + 1); - } - else - { - // just part of reply - wxLogTrace(FTP_TRACE_MASK, _T("<== %s %s"), - code.c_str(), line.c_str()); } } } @@ -373,7 +358,7 @@ char wxFTP::GetResult() if ( badReply ) { - wxLogDebug(_T("Broken FTP server: '%s' is not a valid reply."), + wxLogDebug(wxT("Broken FTP server: '%s' is not a valid reply."), m_lastResult.c_str()); m_lastError = wxPROTO_PROTERR; @@ -403,19 +388,19 @@ bool wxFTP::SetTransferMode(TransferMode transferMode) switch ( transferMode ) { default: - wxFAIL_MSG(_T("unknown FTP transfer mode")); + wxFAIL_MSG(wxT("unknown FTP transfer mode")); // fall through case BINARY: - mode = _T('I'); + mode = wxT('I'); break; case ASCII: - mode = _T('A'); + mode = wxT('A'); break; } - if ( !DoSimpleCommand(_T("TYPE"), mode) ) + if ( !DoSimpleCommand(wxT("TYPE"), mode) ) { wxLogError(_("Failed to set FTP transfer mode to %s."), (transferMode == ASCII ? _("ASCII") : _("binary"))); @@ -435,12 +420,12 @@ bool wxFTP::DoSimpleCommand(const wxChar *command, const wxString& arg) wxString fullcmd = command; if ( !arg.empty() ) { - fullcmd << _T(' ') << arg; + fullcmd << wxT(' ') << arg; } if ( !CheckCommand(fullcmd, '2') ) { - wxLogDebug(_T("FTP command '%s' failed."), fullcmd.c_str()); + wxLogDebug(wxT("FTP command '%s' failed."), fullcmd.c_str()); m_lastError = wxPROTO_NETERR; return false; @@ -456,17 +441,17 @@ bool wxFTP::ChDir(const wxString& dir) // tree conventions, but they always understand CDUP - should we use it if // dir == ".."? OTOH, do such servers (still) exist? - return DoSimpleCommand(_T("CWD"), dir); + return DoSimpleCommand(wxT("CWD"), dir); } bool wxFTP::MkDir(const wxString& dir) { - return DoSimpleCommand(_T("MKD"), dir); + return DoSimpleCommand(wxT("MKD"), dir); } bool wxFTP::RmDir(const wxString& dir) { - return DoSimpleCommand(_T("RMD"), dir); + return DoSimpleCommand(wxT("RMD"), dir); } wxString wxFTP::Pwd() @@ -477,20 +462,20 @@ wxString wxFTP::Pwd() { // the result is at least that long if CheckCommand() succeeded wxString::const_iterator p = m_lastResult.begin() + LEN_CODE + 1; - if ( *p != _T('"') ) + if ( *p != wxT('"') ) { - wxLogDebug(_T("Missing starting quote in reply for PWD: %s"), + wxLogDebug(wxT("Missing starting quote in reply for PWD: %s"), wxString(p, m_lastResult.end())); } else { for ( ++p; (bool)*p; ++p ) // FIXME-DMARS { - if ( *p == _T('"') ) + if ( *p == wxT('"') ) { // check if the quote is doubled ++p; - if ( !*p || *p != _T('"') ) + if ( !*p || *p != wxT('"') ) { // no, this is the end break; @@ -504,7 +489,7 @@ wxString wxFTP::Pwd() if ( !*p ) { - wxLogDebug(_T("Missing ending quote in reply for PWD: %s"), + wxLogDebug(wxT("Missing ending quote in reply for PWD: %s"), m_lastResult.c_str() + LEN_CODE + 1); } } @@ -512,7 +497,7 @@ wxString wxFTP::Pwd() else { m_lastError = wxPROTO_PROTERR; - wxLogDebug(_T("FTP PWD command failed.")); + wxLogDebug(wxT("FTP PWD command failed.")); } return path; @@ -582,10 +567,10 @@ wxString wxFTP::GetPortCmdArgument(const wxIPV4address& addrLocal, int portNew = addrNew.Service(); // We need to break the PORT number in bytes - addrIP.Replace(_T("."), _T(",")); - addrIP << _T(',') - << wxString::Format(_T("%d"), portNew >> 8) << _T(',') - << wxString::Format(_T("%d"), portNew & 0xff); + addrIP.Replace(wxT("."), wxT(",")); + addrIP << wxT(',') + << wxString::Format(wxT("%d"), portNew >> 8) << wxT(',') + << wxString::Format(wxT("%d"), portNew & 0xff); // Now we have a value like "10,0,0,1,5,23" return addrIP; @@ -600,9 +585,9 @@ wxSocketBase *wxFTP::GetActivePort() addrNew.Service(0); // pick an open port number. wxSocketServer *sockSrv = new wxSocketServer(addrNew); - if (!sockSrv->Ok()) + if (!sockSrv->IsOk()) { - // We use Ok() here to see if everything is ok + // We use IsOk() here to see if everything is ok m_lastError = wxPROTO_PROTERR; delete sockSrv; return NULL; @@ -615,7 +600,7 @@ wxSocketBase *wxFTP::GetActivePort() // addresses because the addrNew has an IP of "0.0.0.0", so we need the // value in addrLocal wxString port = GetPortCmdArgument(addrLocal, addrNew); - if ( !DoSimpleCommand(_T("PORT"), port) ) + if ( !DoSimpleCommand(wxT("PORT"), port) ) { m_lastError = wxPROTO_PROTERR; delete sockSrv; @@ -630,17 +615,17 @@ wxSocketBase *wxFTP::GetActivePort() wxSocketBase *wxFTP::GetPassivePort() { - if ( !DoSimpleCommand(_T("PASV")) ) + if ( !DoSimpleCommand(wxT("PASV")) ) { m_lastError = wxPROTO_PROTERR; wxLogError(_("The FTP server doesn't support passive mode.")); return NULL; } - size_t addrStart = m_lastResult.find(_T('(')); + size_t addrStart = m_lastResult.find(wxT('(')); size_t addrEnd = (addrStart == wxString::npos) ? wxString::npos - : m_lastResult.find(_T(')'), addrStart); + : m_lastResult.find(wxT(')'), addrStart); if ( addrEnd == wxString::npos ) { @@ -699,7 +684,7 @@ public: // when checking the result, the stream will // almost always show an error, even if the file was - // properly transfered, thus, lets just grab the result + // properly transferred, thus, let's just grab the result // we are looking for "226 transfer completed" char code = m_ftp->GetResult(); @@ -845,16 +830,16 @@ bool wxFTP::GetList(wxArrayString& files, // - Unix : result like "ls" command // - Windows : like "dir" command // - others : ? - wxString line(details ? _T("LIST") : _T("NLST")); + wxString line(details ? wxT("LIST") : wxT("NLST")); if ( !wildcard.empty() ) { - line << _T(' ') << wildcard; + line << wxT(' ') << wildcard; } if ( !CheckCommand(line, '1') ) { m_lastError = wxPROTO_PROTERR; - wxLogDebug(_T("FTP 'LIST' command returned unexpected result from server")); + wxLogDebug(wxT("FTP 'LIST' command returned unexpected result from server")); delete sock; return false; } @@ -915,7 +900,7 @@ int wxFTP::GetFileSize(const wxString& fileName) int filesize = -1; - // Check for existance of file via wxFTP::FileExists(...) + // Check for existence of file via wxFTP::FileExists(...) if ( FileExists(fileName) ) { wxString command; @@ -927,7 +912,7 @@ int wxFTP::GetFileSize(const wxString& fileName) // will we need to hold this file? TransferMode oldTransfermode = m_currentTransfermode; SetTransferMode(BINARY); - command << _T("SIZE ") << fileName; + command << wxT("SIZE ") << fileName; bool ok = CheckCommand(command, '2'); @@ -937,7 +922,7 @@ int wxFTP::GetFileSize(const wxString& fileName) // 213 is File Status (STD9) // "SIZE" is not described anywhere..? It works on most servers int statuscode; - if ( wxSscanf(GetLastResult().c_str(), _T("%i %i"), + if ( wxSscanf(GetLastResult().c_str(), wxT("%i %i"), &statuscode, &filesize) == 2 ) { // We've gotten a good reply. @@ -952,7 +937,7 @@ int wxFTP::GetFileSize(const wxString& fileName) } // Set transfermode back to the original. Only the "SIZE"-command - // is dependant on transfermode + // is dependent on transfermode if ( oldTransfermode != NONE ) { SetTransferMode(oldTransfermode); @@ -976,15 +961,15 @@ int wxFTP::GetFileSize(const wxString& fileName) // substring containing the name we are looking for. We // stop the iteration at the first occurrence of the // filename. The search is not case-sensitive. - bool foundIt = false; - + const size_t numFiles = fileList.size(); size_t i; - for ( i = 0; !foundIt && i < fileList.GetCount(); i++ ) + for ( i = 0; i < fileList.GetCount(); i++ ) { - foundIt = fileList[i].Upper().Contains(fileName.Upper()); + if ( fileList[i].Upper().Contains(fileName.Upper()) ) + break; } - if ( foundIt ) + if ( i != numFiles ) { // The index i points to the first occurrence of // fileName in the array Now we have to find out what @@ -1000,27 +985,25 @@ int wxFTP::GetFileSize(const wxString& fileName) // check if the first character is '-'. This would // indicate Unix-style (this also limits this function // to searching for files, not directories) - if ( fileList[i].Mid(0, 1) == _T("-") ) + if ( fileList[i].Mid(0, 1) == wxT("-") ) { if ( wxSscanf(fileList[i].c_str(), - _T("%*s %*s %*s %*s %i %*s %*s %*s %*s"), + wxT("%*s %*s %*s %*s %i %*s %*s %*s %*s"), &filesize) != 9 ) { // Hmm... Invalid response - wxLogTrace(FTP_TRACE_MASK, - _T("Invalid LIST response")); + wxLogDebug(wxT("Invalid LIST response")); } } else // Windows-style response (?) { if ( wxSscanf(fileList[i].c_str(), - _T("%*s %*s %i %*s"), + wxT("%*s %*s %i %*s"), &filesize) != 4 ) { // something bad happened..? - wxLogTrace(FTP_TRACE_MASK, - _T("Invalid or unknown LIST response")); + wxLogDebug(wxT("Invalid or unknown LIST response")); } } }