/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
-#pragma implementation "ftp.h"
+ #pragma implementation "ftp.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
#if wxUSE_SOCKETS
#include <stdlib.h>
#include "wx/string.h"
#include "wx/utils.h"
-// #include "wx/data.h"
-#define WXSOCK_INTERNAL
#include "wx/sckaddr.h"
-#undef WXSOCK_INTERNAL
#include "wx/socket.h"
#include "wx/url.h"
#include "wx/sckstrm.h"
#define FTP_BSIZE 1024
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxFTP, wxProtocol)
-IMPLEMENT_PROTOCOL(wxFTP, _T("ftp"), _T("ftp"), TRUE)
-#endif
+IMPLEMENT_PROTOCOL(wxFTP, wxT("ftp"), wxT("ftp"), TRUE)
////////////////////////////////////////////////////////////////
////// wxFTP constructor and destructor ////////////////////////
wxFTP::wxFTP()
: wxProtocol()
{
- wxChar tmp[256];
-
m_lastError = wxPROTO_NOERR;
m_streaming = FALSE;
- m_user = _T("anonymous");
- wxGetUserName(tmp, 256);
- m_passwd.sprintf(_T("%s@"),tmp);
- wxGetHostName(tmp, 256);
- m_passwd += tmp;
+ m_user = wxT("anonymous");
+ m_passwd = wxGetUserId();
+ m_passwd += wxT('@');
+ m_passwd += wxGetHostName();
SetNotify(0);
+ SetFlags(wxSOCKET_NONE);
}
wxFTP::~wxFTP()
////////////////////////////////////////////////////////////////
bool wxFTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
{
- if (!m_handler) {
- m_lastError = wxPROTO_NOHNDLR;
- return FALSE;
- }
-
if (!wxProtocol::Connect(addr)) {
m_lastError = wxPROTO_NETERR;
return FALSE;
return FALSE;
}
- command.sprintf(_T("USER %s"), (const wxChar *)m_user);
+ command.sprintf(wxT("USER %s"), (const wxChar *)m_user);
if (!SendCommand(command, '3')) {
Close();
return FALSE;
}
- command.sprintf(_T("PASS %s"), (const wxChar *)m_passwd);
+ command.sprintf(wxT("PASS %s"), (const wxChar *)m_passwd);
if (!SendCommand(command, '2')) {
Close();
return FALSE;
wxString my_host = host;
addr.Hostname(my_host);
- addr.Service(_T("ftp"));
+ addr.Service(wxT("ftp"));
return Connect(addr);
}
m_lastError = wxPROTO_STREAMING;
return FALSE;
}
- if (m_connected)
- SendCommand(wxString(_T("QUIT")), '2');
+ if (IsConnected())
+ SendCommand(wxString(wxT("QUIT")), '2');
+
return wxSocketClient::Close();
}
m_lastError = wxPROTO_STREAMING;
return FALSE;
}
- tmp_str = command + _T("\r\n");
+ tmp_str = command + wxT("\r\n");
const wxWX2MBbuf tmp_buf = tmp_str.mb_str();
- if (Write(MBSTRINGCAST tmp_buf, strlen(tmp_buf)).Error()) {
+ if (Write(wxMBSTRINGCAST tmp_buf, strlen(tmp_buf)).Error()) {
m_lastError = wxPROTO_NETERR;
return FALSE;
}
bool wxFTP::GetResult(char exp)
{
- if ((m_lastError = GetLine(this, m_lastResult)))
+ m_lastError = GetLine(this, m_lastResult);
+ if ( m_lastError )
return FALSE;
if (m_lastResult.GetChar(0) != exp) {
m_lastError = wxPROTO_PROTERR;
if (m_lastResult.GetChar(3) == '-') {
wxString key = m_lastResult.Left((size_t)3);
- key += _T(' ');
+ key += wxT(' ');
while (m_lastResult.Index(key) != 0) {
- if ((m_lastError = GetLine(this, m_lastResult)))
+ m_lastError = GetLine(this, m_lastResult);
+ if ( m_lastError )
return FALSE;
}
}
{
wxString str = dir;
- str.Prepend(_T("CWD "));
+ str.Prepend(wxT("CWD "));
return SendCommand(str, '2');
}
bool wxFTP::MkDir(const wxString& dir)
{
wxString str = dir;
- str.Prepend(_T("MKD "));
+ str.Prepend(wxT("MKD "));
return SendCommand(str, '2');
}
{
wxString str = dir;
- str.Prepend(_T("PWD "));
+ str.Prepend(wxT("PWD "));
return SendCommand(str, '2');
}
{
int beg, end;
- if (!SendCommand(_T("PWD"), '2'))
+ if (!SendCommand(wxT("PWD"), '2'))
return wxString((char *)NULL);
- beg = m_lastResult.Find(_T('\"'),FALSE);
- end = m_lastResult.Find(_T('\"'),TRUE);
+ beg = m_lastResult.Find(wxT('\"'),FALSE);
+ end = m_lastResult.Find(wxT('\"'),TRUE);
return wxString(beg+1, end);
}
{
wxString str;
- str = _T("RNFR ") + src;
+ str = wxT("RNFR ") + src;
if (!SendCommand(str, '3'))
return FALSE;
- str = _T("RNTO ") + dst;
+ str = wxT("RNTO ") + dst;
return SendCommand(str, '2');
}
{
wxString str;
- str = _T("DELE ");
+ str = wxT("DELE ");
str += path;
return SendCommand(str, '2');
}
wxInputFTPStream(wxFTP *ftp_clt, wxSocketBase *sock)
: wxSocketInputStream(*sock), m_ftp(ftp_clt) {}
- size_t StreamSize() const { return m_ftpsize; }
+ size_t GetSize() const { return m_ftpsize; }
virtual ~wxInputFTPStream(void)
{
- if (LastError() != wxStream_NOERROR)
+ if (LastError() == wxStream_NOERROR)
m_ftp->GetResult('2');
else
m_ftp->Abort();
{
wxIPV4address addr;
wxSocketClient *client;
- struct sockaddr sin;
int a[6];
wxString straddr;
int addr_pos;
+ wxUint16 port;
+ wxUint32 hostaddr;
- if (!SendCommand(_T("PASV"), '2'))
+ if (!SendCommand(wxT("PASV"), '2'))
return NULL;
- sin.sa_family = AF_INET;
- addr_pos = m_lastResult.Find(_T('('));
+ addr_pos = m_lastResult.Find(wxT('('));
if (addr_pos == -1) {
m_lastError = wxPROTO_PROTERR;
return NULL;
}
straddr = m_lastResult(addr_pos+1, m_lastResult.Length());
- wxSscanf((const wxChar *)straddr,_T("%d,%d,%d,%d,%d,%d"),&a[2],&a[3],&a[4],&a[5],&a[0],&a[1]);
- sin.sa_data[2] = (char)a[2];
- sin.sa_data[3] = (char)a[3];
- sin.sa_data[4] = (char)a[4];
- sin.sa_data[5] = (char)a[5];
- sin.sa_data[0] = (char)a[0];
- sin.sa_data[1] = (char)a[1];
+ wxSscanf((const wxChar *)straddr,wxT("%d,%d,%d,%d,%d,%d"),&a[2],&a[3],&a[4],&a[5],&a[0],&a[1]);
- addr.Disassemble(&sin, sizeof(sin));
+ hostaddr = (wxUint16)a[5] << 24 | (wxUint16)a[4] << 16 |
+ (wxUint16)a[3] << 8 | a[2];
+ addr.Hostname(hostaddr);
- client = m_handler->CreateClient();
+ port = (wxUint16)a[0] << 8 | a[1];
+ addr.Service(port);
+
+ client = new wxSocketClient();
if (!client->Connect(addr)) {
delete client;
return NULL;
bool wxFTP::Abort(void)
{
m_streaming = FALSE;
- if (!SendCommand(_T("ABOR"), '4'))
+ if (!SendCommand(wxT("ABOR"), '4'))
return FALSE;
return GetResult('2');
}
int pos_size;
wxInputFTPStream *in_stream;
- if (!SendCommand(_T("TYPE I"), '2'))
+ if (!SendCommand(wxT("TYPE I"), '2'))
return NULL;
wxSocketClient *sock = GetPort();
return NULL;
}
- tmp_str = _T("RETR ") + path;
+ tmp_str = wxT("RETR ") + wxURL::ConvertFromURI(path);
if (!SendCommand(tmp_str, '1'))
return NULL;
in_stream = new wxInputFTPStream(this, sock);
- pos_size = m_lastResult.Index(_T('('));
+ pos_size = m_lastResult.Index(wxT('('));
if (pos_size != wxNOT_FOUND) {
- wxString str_size = m_lastResult(pos_size+1, m_lastResult.Index(_T(')'))-1);
+ wxString str_size = m_lastResult(pos_size+1, m_lastResult.Index(wxT(')'))-1);
in_stream->m_ftpsize = wxAtoi(WXSTRINGCAST str_size);
}
+ sock->SetFlags(wxSOCKET_WAITALL);
return in_stream;
}
{
wxString tmp_str;
- if (!SendCommand(_T("TYPE I"), '2'))
+ if (!SendCommand(wxT("TYPE I"), '2'))
return NULL;
wxSocketClient *sock = GetPort();
- tmp_str = _T("STOR ") + path;
+ tmp_str = wxT("STOR ") + path;
if (!SendCommand(tmp_str, '1'))
return FALSE;
{
wxList *file_list = new wxList;
wxSocketBase *sock = GetPort();
- wxString tmp_str = _T("NLST");
+ wxString tmp_str = wxT("NLST");
if (!wildcard.IsNull())
tmp_str += wildcard;
return NULL;
}
- sock->SetEventHandler(*GetNextHandler(), m_id);
- sock->Notify(m_notifyme);
- sock->SetNotify(m_neededreq);
-
return file_list;
}
#endif
projects / wxWidgets.git / blobdiff