/////////////////////////////////////////////////////////////////////////////
-// Name: ftp.cpp
+// Name: src/common/ftp.cpp
// Purpose: FTP protocol
// Author: Guilhem Lavaux
// Modified by: Mark Johnson, wxWindows@mj10777.de
// Vadim Zeitlin (numerous fixes and rewrites to all part of the
// code, support ASCII/Binary modes, better error reporting, more
// robust Abort(), support for arbitrary FTP commands, ...)
+// Randall Fox (support for active mode)
// Created: 07/07/1997
// RCS-ID: $Id$
// Copyright: (c) 1997, 1998 Guilhem Lavaux
-// Licence: wxWindows license
+// (c) 1998-2004 wxWidgets team
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// declarations
// ============================================================================
-#ifdef __GNUG__
- #pragma implementation "ftp.h"
-#endif
-
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
#pragma hdrstop
#endif
-#if wxUSE_SOCKETS && wxUSE_STREAMS
+#if wxUSE_PROTOCOL_FTP
#ifndef WX_PRECOMP
#include <stdlib.h>
#include "wx/utils.h"
#include "wx/log.h"
#include "wx/intl.h"
+ #include "wx/wxcrtvararg.h"
#endif // WX_PRECOMP
#include "wx/sckaddr.h"
#include "wx/protocol/protocol.h"
#include "wx/protocol/ftp.h"
-#if defined(__WXMAC__)
- #include "wx/mac/macsock.h"
-#endif
-
#ifndef __MWERKS__
#include <memory.h>
#endif
// ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxFTP, wxProtocol)
-IMPLEMENT_PROTOCOL(wxFTP, wxT("ftp"), wxT("ftp"), TRUE)
+IMPLEMENT_PROTOCOL(wxFTP, wxT("ftp"), wxT("ftp"), true)
// ============================================================================
// implementation
wxFTP::wxFTP()
{
- m_lastError = wxPROTO_NOERR;
- m_streaming = FALSE;
+ m_streaming = false;
m_currentTransfermode = NONE;
- m_user = wxT("anonymous");
- m_passwd << wxGetUserId() << wxT('@') << wxGetFullHostName();
+ m_username = wxT("anonymous");
+ m_password << wxGetUserId() << wxT('@') << wxGetFullHostName();
SetNotify(0);
- SetFlags(wxSOCKET_NONE);
+ SetFlags(wxSOCKET_NOWAIT);
+ m_bPassive = true;
+ m_bEncounteredError = false;
}
wxFTP::~wxFTP()
{
if ( m_streaming )
{
+ // if we are streaming, this will issue
+ // an FTP ABORT command, to tell the server we are aborting
(void)Abort();
}
+ // now this issues a "QUIT" command to tell the server we are
Close();
}
// wxFTP connect and login methods
// ----------------------------------------------------------------------------
-bool wxFTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
+bool wxFTP::Connect(const wxSockAddress& addr, bool WXUNUSED(wait))
{
if ( !wxProtocol::Connect(addr) )
{
m_lastError = wxPROTO_NETERR;
- return FALSE;
+ return false;
}
- if ( !m_user )
+ if ( !m_username )
{
m_lastError = wxPROTO_CONNERR;
- return FALSE;
+ return false;
}
// we should have 220 welcome message
if ( !CheckResult('2') )
{
Close();
- return FALSE;
+ return false;
}
wxString command;
- command.Printf(wxT("USER %s"), m_user.c_str());
+ command.Printf(wxT("USER %s"), m_username.c_str());
char rc = SendCommand(command);
if ( rc == '2' )
{
// 230 return: user accepted without password
- return TRUE;
+ m_lastError = wxPROTO_NOERR;
+ return true;
}
if ( rc != '3' )
{
+ m_lastError = wxPROTO_CONNERR;
Close();
- return FALSE;
+ return false;
}
- command.Printf(wxT("PASS %s"), m_passwd.c_str());
+ command.Printf(wxT("PASS %s"), m_password.c_str());
if ( !CheckCommand(command, '2') )
{
+ m_lastError = wxPROTO_CONNERR;
Close();
- return FALSE;
+ return false;
}
- return TRUE;
+ m_lastError = wxPROTO_NOERR;
+ 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);
}
if ( m_streaming )
{
m_lastError = wxPROTO_STREAMING;
- return FALSE;
+ return false;
}
if ( IsConnected() )
{
if ( !CheckCommand(wxT("QUIT"), '2') )
{
- wxLogDebug(_T("Failed to close connection gracefully."));
+ m_lastError = wxPROTO_CONNERR;
+ wxLogDebug(wxT("Failed to close connection gracefully."));
}
}
// low level methods
// ============================================================================
+wxSocketBase *wxFTP::AcceptIfActive(wxSocketBase *sock)
+{
+ if ( m_bPassive )
+ return sock;
+
+ // now wait for a connection from server
+ wxSocketServer *sockSrv = (wxSocketServer *)sock;
+ if ( !sockSrv->WaitForAccept() )
+ {
+ m_lastError = wxPROTO_CONNERR;
+ wxLogError(_("Timeout while waiting for FTP server to connect, try passive mode."));
+ wxDELETE(sock);
+ }
+ else
+ {
+ m_lastError = wxPROTO_NOERR;
+ sock = sockSrv->Accept(true);
+ delete sockSrv;
+ }
+
+ return sock;
+}
+
+bool wxFTP::Abort()
+{
+ if ( !m_streaming )
+ return true;
+
+ m_streaming = false;
+ if ( !CheckCommand(wxT("ABOR"), '4') )
+ return false;
+
+ return CheckResult('2');
+}
+
+
// ----------------------------------------------------------------------------
// Send command to FTP server
// ----------------------------------------------------------------------------
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();
}
// ----------------------------------------------------------------------------
-// Recieve servers reply
+// Receive servers reply
// ----------------------------------------------------------------------------
char wxFTP::GetResult()
{
+ // if we've already had a read or write timeout error, the connection is
+ // probably toast, so don't bother, it just wastes the users time
+ if ( m_bEncounteredError )
+ return 0;
+
wxString code;
// m_lastResult will contain the entire server response, possibly on
// ...
// xyz ...
// and the intermeidate lines may start with xyz or not
- bool badReply = FALSE;
- bool firstLine = TRUE;
- bool endOfReply = FALSE;
+ bool badReply = false;
+ bool firstLine = true;
+ bool endOfReply = false;
while ( !endOfReply && !badReply )
{
wxString line;
- m_lastError = ReadLine(line);
+ m_lastError = ReadLine(this,line);
if ( m_lastError )
+ {
+ m_bEncounteredError = true;
return 0;
+ }
+
+ LogResponse(line);
if ( !m_lastResult.empty() )
{
// separate from last line
- m_lastResult += _T('\n');
+ m_lastResult += wxT('\n');
}
m_lastResult += line;
{
if ( firstLine )
{
- badReply = TRUE;
- }
- else
- {
- wxLogTrace(FTP_TRACE_MASK, _T("<== %s %s"),
- code.c_str(), line.c_str());
+ badReply = true;
}
}
else // line has at least 4 chars
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(' '):
- endOfReply = TRUE;
+ case wxT(' '):
+ endOfReply = true;
break;
- case _T('-'):
- firstLine = FALSE;
+ case wxT('-'):
+ firstLine = false;
break;
default:
// unexpected
- badReply = TRUE;
+ badReply = true;
}
}
else // subsequent line of multiline reply
{
- if ( wxStrncmp(line, code, LEN_CODE) == 0 )
+ if ( line.compare(0, LEN_CODE, code) == 0 )
{
- if ( chMarker == _T(' ') )
+ if ( chMarker == wxT(' ') )
{
- endOfReply = TRUE;
+ 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());
}
}
}
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;
return 0;
}
+ else
+ m_lastError = wxPROTO_NOERR;
// if we got here we must have a non empty code string
- return code[0u];
+ return (char)code[0u];
}
// ----------------------------------------------------------------------------
if ( transferMode == m_currentTransfermode )
{
// nothing to do
- return TRUE;
+ return true;
}
wxString mode;
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."), (const wxChar*)
+ wxLogError(_("Failed to set FTP transfer mode to %s."),
(transferMode == ASCII ? _("ASCII") : _("binary")));
- return FALSE;
+ return false;
}
- // If we get here the operation has been succesfully completed
+ // If we get here the operation has been successfully completed
// Set the status-member
m_currentTransfermode = transferMode;
- return TRUE;
+ return true;
}
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;
+ return false;
}
- return TRUE;
+ m_lastError = wxPROTO_NOERR;
+ return true;
}
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()
if ( CheckCommand(wxT("PWD"), '2') )
{
// the result is at least that long if CheckCommand() succeeded
- const wxChar *p = m_lastResult.c_str() + LEN_CODE + 1;
- if ( *p != _T('"') )
+ wxString::const_iterator p = m_lastResult.begin() + LEN_CODE + 1;
+ if ( *p != wxT('"') )
{
- wxLogDebug(_T("Missing starting quote in reply for PWD: %s"), p);
+ wxLogDebug(wxT("Missing starting quote in reply for PWD: %s"),
+ wxString(p, m_lastResult.end()));
}
else
{
- for ( p++; *p; p++ )
+ for ( ++p; (bool)*p; ++p ) // FIXME-DMARS
{
- if ( *p == _T('"') )
+ if ( *p == wxT('"') )
{
// check if the quote is doubled
- p++;
- if ( !*p || *p != _T('"') )
+ ++p;
+ if ( !*p || *p != wxT('"') )
{
// no, this is the end
break;
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);
}
}
}
else
{
- wxLogDebug(_T("FTP PWD command failed."));
+ m_lastError = wxPROTO_PROTERR;
+ wxLogDebug(wxT("FTP PWD command failed."));
}
return path;
str = wxT("RNFR ") + src;
if ( !CheckCommand(str, '3') )
- return FALSE;
+ return false;
str = wxT("RNTO ") + dst;
return CheckCommand(str, '2');
}
+// ----------------------------------------------------------------------------
+// wxFTP port methods
+// ----------------------------------------------------------------------------
+
+wxSocketBase *wxFTP::GetPort()
+{
+ /*
+ PASSIVE: Client sends a "PASV" to the server. The server responds with
+ an address and port number which it will be listening on. Then
+ the client connects to the server at the specified address and
+ port.
+
+ ACTIVE: Client sends the server a PORT command which includes an
+ address and port number which the client will be listening on.
+ The server then connects to the client at that address and
+ port.
+ */
+
+ wxSocketBase *socket = m_bPassive ? GetPassivePort() : GetActivePort();
+ if ( !socket )
+ {
+ m_bEncounteredError = true;
+ return NULL;
+ }
+
+ // Now set the time for the new socket to the default or user selected
+ // timeout period
+ socket->SetTimeout(m_uiDefaultTimeout);
+
+ return socket;
+}
+
+wxString wxFTP::GetPortCmdArgument(const wxIPV4address& addrLocal,
+ const wxIPV4address& addrNew)
+{
+ // Just fills in the return value with the local IP
+ // address of the current socket. Also it fill in the
+ // PORT which the client will be listening on
+
+ wxString addrIP = addrLocal.IPAddress();
+ int portNew = addrNew.Service();
+
+ // We need to break the PORT number in bytes
+ 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;
+}
+
+wxSocketBase *wxFTP::GetActivePort()
+{
+ // we need an address to listen on
+ wxIPV4address addrNew, addrLocal;
+ GetLocal(addrLocal);
+ addrNew.AnyAddress();
+ addrNew.Service(0); // pick an open port number.
+
+ wxSocketServer *sockSrv = new wxSocketServer(addrNew);
+ if (!sockSrv->IsOk())
+ {
+ // We use IsOk() here to see if everything is ok
+ m_lastError = wxPROTO_PROTERR;
+ delete sockSrv;
+ return NULL;
+ }
+
+ //gets the new address, actually it is just the port number
+ sockSrv->GetLocal(addrNew);
+
+ // Now we create the argument of the PORT command, we send in both
+ // 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(wxT("PORT"), port) )
+ {
+ m_lastError = wxPROTO_PROTERR;
+ delete sockSrv;
+ wxLogError(_("The FTP server doesn't support the PORT command."));
+ return NULL;
+ }
+
+ m_lastError = wxPROTO_NOERR;
+ sockSrv->Notify(false); // Don't send any events
+ return sockSrv;
+}
+
+wxSocketBase *wxFTP::GetPassivePort()
+{
+ 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(wxT('('));
+ size_t addrEnd = (addrStart == wxString::npos)
+ ? wxString::npos
+ : m_lastResult.find(wxT(')'), addrStart);
+
+ if ( addrEnd == wxString::npos )
+ {
+ m_lastError = wxPROTO_PROTERR;
+ return NULL;
+ }
+
+ // get the port number and address
+ int a[6];
+ wxString straddr(m_lastResult, addrStart + 1, addrEnd - (addrStart + 1));
+ wxSscanf(straddr, wxT("%d,%d,%d,%d,%d,%d"),
+ &a[2],&a[3],&a[4],&a[5],&a[0],&a[1]);
+
+ wxUint32 hostaddr = (wxUint16)a[2] << 24 |
+ (wxUint16)a[3] << 16 |
+ (wxUint16)a[4] << 8 |
+ a[5];
+ wxUint16 port = (wxUint16)(a[0] << 8 | a[1]);
+
+ wxIPV4address addr;
+ addr.Hostname(hostaddr);
+ addr.Service(port);
+
+ wxSocketClient *client = new wxSocketClient();
+ if ( !client->Connect(addr) )
+ {
+ m_lastError = wxPROTO_CONNERR;
+ delete client;
+ return NULL;
+ }
+
+ client->Notify(false);
+
+ m_lastError = wxPROTO_NOERR;
+ return client;
+}
+
+
// ----------------------------------------------------------------------------
// wxFTP download and upload
// ----------------------------------------------------------------------------
: wxSocketInputStream(*sock)
{
m_ftp = ftp;
-
- // FIXME make the timeout configurable
-
- // set a shorter than default timeout
- m_i_socket->SetTimeout(60); // 1 minute
+ // socket timeout automatically set in GetPort function
}
- size_t GetSize() const { return m_ftpsize; }
-
virtual ~wxInputFTPStream()
{
- delete m_i_socket;
+ delete m_i_socket; // keep at top
- if ( LastError() == wxStream_NOERROR )
- {
- // wait for "226 transfer completed"
- m_ftp->CheckResult('2');
+ // when checking the result, the stream will
+ // almost always show an error, even if the file was
+ // properly transfered, thus, let's just grab the result
- m_ftp->m_streaming = FALSE;
+ // we are looking for "226 transfer completed"
+ char code = m_ftp->GetResult();
+ if ('2' == code)
+ {
+ // it was a good transfer.
+ // we're done!
+ m_ftp->m_streaming = false;
+ return;
}
- else
+ // did we timeout?
+ if (0 == code)
{
+ // the connection is probably toast. issue an abort, and
+ // then a close. there won't be any more waiting
+ // for this connection
m_ftp->Abort();
+ m_ftp->Close();
+ return;
}
-
- // delete m_i_socket; // moved to top of destructor to accomodate wu-FTPd >= 2.6.0
+ // There was a problem with the transfer and the server
+ // has acknowledged it. If we issue an "ABORT" now, the user
+ // would get the "226" for the abort and think the xfer was
+ // complete, thus, don't do anything here, just return
}
wxFTP *m_ftp;
- size_t m_ftpsize;
+
+ wxDECLARE_NO_COPY_CLASS(wxInputFTPStream);
};
class wxOutputFTPStream : public wxSocketOutputStream
delete m_o_socket;
// read this reply
- m_ftp->CheckResult('2');
+ m_ftp->GetResult(); // save result so user can get to it
- m_ftp->m_streaming = FALSE;
+ m_ftp->m_streaming = false;
}
else
{
}
wxFTP *m_ftp;
-};
-
-wxSocketClient *wxFTP::GetPort()
-{
- int a[6];
-
- if ( !DoSimpleCommand(_T("PASV")) )
- {
- wxLogError(_("The FTP server doesn't support passive mode."));
-
- return NULL;
- }
-
- const wxChar *addrStart = wxStrchr(m_lastResult, _T('('));
- if ( !addrStart )
- {
- m_lastError = wxPROTO_PROTERR;
- return NULL;
- }
-
- const wxChar *addrEnd = wxStrchr(addrStart, _T(')'));
- if ( !addrEnd )
- {
- m_lastError = wxPROTO_PROTERR;
-
- return NULL;
- }
-
- wxString straddr(addrStart + 1, addrEnd);
-
- wxSscanf(straddr, wxT("%d,%d,%d,%d,%d,%d"),
- &a[2],&a[3],&a[4],&a[5],&a[0],&a[1]);
-
- wxUint32 hostaddr = (wxUint16)a[5] << 24 |
- (wxUint16)a[4] << 16 |
- (wxUint16)a[3] << 8 |
- a[2];
- wxUint16 port = (wxUint16)a[0] << 8 | a[1];
-
- wxIPV4address addr;
- addr.Hostname(hostaddr);
- addr.Service(port);
-
- wxSocketClient *client = new wxSocketClient();
- if ( !client->Connect(addr) )
- {
- delete client;
- return NULL;
- }
-
- client->Notify(FALSE);
-
- return client;
-}
-
-bool wxFTP::Abort()
-{
- if ( !m_streaming )
- return TRUE;
-
- m_streaming = FALSE;
- if ( !CheckCommand(wxT("ABOR"), '4') )
- return FALSE;
-
- return CheckResult('2');
-}
+ wxDECLARE_NO_COPY_CLASS(wxOutputFTPStream);
+};
wxInputStream *wxFTP::GetInputStream(const wxString& path)
{
- int pos_size;
- wxInputFTPStream *in_stream;
-
if ( ( m_currentTransfermode == NONE ) && !SetTransferMode(BINARY) )
+ {
+ m_lastError = wxPROTO_CONNERR;
return NULL;
+ }
- wxSocketClient *sock = GetPort();
+ wxSocketBase *sock = GetPort();
if ( !sock )
{
return NULL;
}
- wxString tmp_str = wxT("RETR ") + wxURL::ConvertFromURI(path);
+ wxString tmp_str = wxT("RETR ") + wxURI::Unescape(path);
if ( !CheckCommand(tmp_str, '1') )
return NULL;
- m_streaming = TRUE;
-
- in_stream = new wxInputFTPStream(this, sock);
-
- pos_size = m_lastResult.Index(wxT('('));
- if ( pos_size != wxNOT_FOUND )
+ sock = AcceptIfActive(sock);
+ if ( !sock )
{
- wxString str_size = m_lastResult(pos_size+1, m_lastResult.Index(wxT(')'))-1);
-
- in_stream->m_ftpsize = wxAtoi(WXSTRINGCAST str_size);
+ m_lastError = wxPROTO_CONNERR;
+ return NULL;
}
sock->SetFlags(wxSOCKET_WAITALL);
+ m_streaming = true;
+
+ wxInputFTPStream *in_stream = new wxInputFTPStream(this, sock);
+
+ m_lastError = wxPROTO_NOERR;
return in_stream;
}
wxOutputStream *wxFTP::GetOutputStream(const wxString& path)
{
if ( ( m_currentTransfermode == NONE ) && !SetTransferMode(BINARY) )
+ {
+ m_lastError = wxPROTO_CONNERR;
return NULL;
+ }
- wxSocketClient *sock = GetPort();
+ wxSocketBase *sock = GetPort();
wxString tmp_str = wxT("STOR ") + path;
if ( !CheckCommand(tmp_str, '1') )
- return FALSE;
+ return NULL;
+
+ sock = AcceptIfActive(sock);
- m_streaming = TRUE;
+ m_streaming = true;
+ m_lastError = wxPROTO_NOERR;
return new wxOutputFTPStream(this, sock);
}
bool details)
{
wxSocketBase *sock = GetPort();
- if (!sock)
- return FALSE;
+ if (!sock) {
+ m_lastError = wxPROTO_NETERR;
+ return false;
+ }
// NLST : List of Filenames (including Directory's !)
// LIST : depending on BS of FTP-Server
// - Unix : result like "ls" command
// - Windows : like "dir" command
// - others : ?
- wxString line(details ? _T("LIST") : _T("NLST"));
- if ( !!wildcard )
+ wxString line(details ? wxT("LIST") : wxT("NLST"));
+ if ( !wildcard.empty() )
{
- line << _T(' ') << wildcard;
+ line << wxT(' ') << wildcard;
}
- if (!CheckCommand(line, '1'))
+ if ( !CheckCommand(line, '1') )
{
- return FALSE;
+ m_lastError = wxPROTO_PROTERR;
+ wxLogDebug(wxT("FTP 'LIST' command returned unexpected result from server"));
+ delete sock;
+ return false;
+ }
+
+ sock = AcceptIfActive(sock);
+ if ( !sock ) {
+ m_lastError = wxPROTO_CONNERR;
+ return false;
}
+
files.Empty();
- while ( ReadLine(sock, line) == wxPROTO_NOERR )
+ while (ReadLine(sock, line) == wxPROTO_NOERR )
{
files.Add(line);
}
+
delete sock;
// the file list should be terminated by "226 Transfer complete""
- if ( !CheckResult('2') )
- return FALSE;
-
- return TRUE;
+ m_lastError = wxPROTO_NOERR;
+ return CheckResult('2');
}
bool wxFTP::FileExists(const wxString& fileName)
// current dir. It does so by simply doing an NLST (via GetList).
// If this succeeds (and the list is not empty) the file exists.
- bool retval = FALSE;
+ bool retval = false;
wxArrayString fileList;
- if ( GetList(fileList, fileName, FALSE) )
+ if ( GetList(fileList, fileName, false) )
{
// Some ftp-servers (Ipswitch WS_FTP Server 1.0.5 does this)
- // displays this behaviour when queried on a non-existing file:
+ // displays this behaviour when queried on a nonexistent file:
// NLST this_file_does_not_exist
// 150 Opening ASCII data connection for directory listing
// (no data transferred)
// 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');
// 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.
- ok = TRUE;
+ ok = true;
}
else
{
// Something bad happened.. A "2yz" reply with no size
// Fallback
- ok = FALSE;
+ ok = false;
}
}
SetTransferMode(oldTransfermode);
}
- if ( !ok ) // this is not a direct else clause.. The size command might return an invalid "2yz" reply
+ // this is not a direct else clause.. The size command might return an
+ // invalid "2yz" reply
+ if ( !ok )
{
// The server didn't understand the "SIZE"-command or it
// returned an invalid reply.
// We now try to get details for the file with a "LIST"-command
// and then parse the output from there..
wxArrayString fileList;
- if ( GetList(fileList, fileName, TRUE) )
+ if ( GetList(fileList, fileName, true) )
{
if ( !fileList.IsEmpty() )
{
// 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.Count(); 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
// 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(),
- _("%*s %*s %*s %*s %i %*s %*s %*s %*s"),
- &filesize) == 9 )
- {
- // We've gotten a good response
- ok = TRUE;
- }
- else
+ 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"),
- &filesize) == 4 )
- {
- // valid response
- ok = TRUE;
- }
- else
+ 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"));
}
}
}
return filesize;
}
+#endif // wxUSE_PROTOCOL_FTP
-#if WXWIN_COMPATIBILITY_2
-// deprecated
-wxList *wxFTP::GetList(const wxString& wildcard, bool details)
-{
- wxSocketBase *sock = GetPort();
- if (!sock)
- return FALSE;
- wxList *file_list = new wxList;
- wxString line;
- // NLST : List of Filenames (including Directory's !)
- // LIST : depending on BS of FTP-Server
- // - Unix : result like "ls" command
- // - Windows : like "dir" command
- // - others : ?
- if (!details)
- line = _T("NLST"); // Default
- else
- line = _T("LIST");
- if (!wildcard.IsNull())
- line += wildcard;
- if (!CheckCommand(line, '1'))
- {
- delete sock;
- delete file_list;
- return NULL;
- }
- while (GetLine(sock, line) == wxPROTO_NOERR)
- {
- file_list->Append((wxObject *)(new wxString(line)));
- }
- if (!CheckResult('2'))
- {
- delete sock;
- file_list->DeleteContents(TRUE);
- delete file_list;
- return NULL;
- }
- return file_list;
-}
-#endif // WXWIN_COMPATIBILITY_2
-
-#endif
- // wxUSE_SOCKETS
projects / wxWidgets.git / blobdiff