attempt to fix crash in tree ctrl

[wxWidgets.git] / src / common / ftp.cpp

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index ee2ac234d569f2f333a3f8c3758252079f266226..1d5e8019650be839ac0464e0dcd43b6559d3540a 100644 (file)
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -10,79 +10,82 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #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__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #endif
 

+#include "wx/setup.h"
+
+#if wxUSE_SOCKETS && wxUSE_STREAMS
+

 #ifndef __MWERKS__
 #include <memory.h>
 #endif
 #ifndef __MWERKS__
 #include <memory.h>
 #endif

+#if defined(__WXMAC__)
+#include "/wx/mac/macsock.h"
+#endif
+

 #include <stdlib.h>
 #include "wx/string.h"
 #include "wx/utils.h"
 #include <stdlib.h>
 #include "wx/string.h"
 #include "wx/utils.h"

-// #include "wx/data.h"
-#define WXSOCK_INTERNAL

 #include "wx/sckaddr.h"
 #include "wx/sckaddr.h"

-#undef WXSOCK_INTERNAL

 #include "wx/socket.h"
 #include "wx/url.h"
 #include "wx/sckstrm.h"
 #include "wx/protocol/protocol.h"
 #include "wx/protocol/ftp.h"
 #include "wx/socket.h"
 #include "wx/url.h"
 #include "wx/sckstrm.h"
 #include "wx/protocol/protocol.h"
 #include "wx/protocol/ftp.h"

+#include "wx/log.h"

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
 
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 

+// the length of FTP status code (3 digits)
+static const size_t LEN_CODE = 3;
+

 #define FTP_BSIZE 1024
 
 #define FTP_BSIZE 1024
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxFTP, wxProtocol)
 IMPLEMENT_DYNAMIC_CLASS(wxFTP, wxProtocol)

-IMPLEMENT_PROTOCOL(wxFTP, "ftp", "ftp", TRUE)
-#endif
+IMPLEMENT_PROTOCOL(wxFTP, wxT("ftp"), wxT("ftp"), TRUE)

 
 ////////////////////////////////////////////////////////////////
 ////// wxFTP constructor and destructor ////////////////////////
 ////////////////////////////////////////////////////////////////
 
 wxFTP::wxFTP()
 
 ////////////////////////////////////////////////////////////////
 ////// wxFTP constructor and destructor ////////////////////////
 ////////////////////////////////////////////////////////////////
 
 wxFTP::wxFTP()

-  : wxProtocol()
+     : wxProtocol()

 {
 {

-  char tmp[256];
-
-  m_lastError = wxPROTO_NOERR;
-  m_streaming = FALSE;
+    m_lastError = wxPROTO_NOERR;
+    m_streaming = FALSE;

 
 

-  m_user = "anonymous";
-  wxGetUserName(tmp, 256);
-  m_passwd.sprintf("%s@",tmp);
-  wxGetHostName(tmp, 256);
-  m_passwd += tmp;
+    m_user = wxT("anonymous");
+    m_passwd << wxGetUserId() << wxT('@') << wxGetFullHostName();

 
 

-  SetNotify(0);
+    SetNotify(0);
+    SetFlags(wxSOCKET_NONE);

 }
 
 wxFTP::~wxFTP()
 {
 }
 
 wxFTP::~wxFTP()
 {

-  SendCommand("QUIT", '2');
+    if ( m_streaming )
+    {
+        (void)Abort();
+    }
+
+    Close();

 }
 
 ////////////////////////////////////////////////////////////////
 ////// wxFTP connect and login methods /////////////////////////
 ////////////////////////////////////////////////////////////////
 }
 
 ////////////////////////////////////////////////////////////////
 ////// wxFTP connect and login methods /////////////////////////
 ////////////////////////////////////////////////////////////////

-bool wxFTP::Connect(wxSockAddress& addr)
+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;
   if (!wxProtocol::Connect(addr)) {
     m_lastError = wxPROTO_NETERR;
     return FALSE;


@@ -100,13 +103,13 @@ bool wxFTP::Connect(wxSockAddress& addr)
     return FALSE;
   }
 
     return FALSE;
   }
 

-  command.sprintf("USER %s", (const char *)m_user);
+  command.sprintf(wxT("USER %s"), (const wxChar *)m_user);

   if (!SendCommand(command, '3')) {
     Close();
     return FALSE;
   }
 
   if (!SendCommand(command, '3')) {
     Close();
     return FALSE;
   }
 

-  command.sprintf("PASS %s", (const char *)m_passwd);
+  command.sprintf(wxT("PASS %s"), (const wxChar *)m_passwd);

   if (!SendCommand(command, '2')) {
     Close();
     return FALSE;
   if (!SendCommand(command, '2')) {
     Close();
     return FALSE;


@@ -121,61 +124,160 @@ bool wxFTP::Connect(const wxString& host)
   wxString my_host = host;
 
   addr.Hostname(my_host);
   wxString my_host = host;
 
   addr.Hostname(my_host);

-  addr.Service("ftp");
+  addr.Service(wxT("ftp"));

 
   return Connect(addr);
 }
 
 bool wxFTP::Close()
 {
 
   return Connect(addr);
 }
 
 bool wxFTP::Close()
 {

-  if (m_streaming) {
-    m_lastError = wxPROTO_STREAMING;
-    return FALSE;
-  }
-  if (m_connected)
-    SendCommand(wxString("QUIT"), '2');
-  return wxSocketClient::Close();
+    if ( m_streaming )
+    {
+        m_lastError = wxPROTO_STREAMING;
+        return FALSE;
+    }
+
+    if ( IsConnected() )
+        SendCommand(wxT("QUIT"), '2');
+
+    return wxSocketClient::Close();

 }
 
 }
 

-////////////////////////////////////////////////////////////////
-////// wxFTP low-level methods /////////////////////////////////
-////////////////////////////////////////////////////////////////
+// ============================================================================
+// low level methods
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// Send command to FTP server
+// ----------------------------------------------------------------------------
+

 bool wxFTP::SendCommand(const wxString& command, char exp_ret)
 {
 bool wxFTP::SendCommand(const wxString& command, char exp_ret)
 {

-  wxString tmp_str;
+    wxString tmp_str;

 
 

-  if (m_streaming) {
-    m_lastError = wxPROTO_STREAMING;
-    return FALSE;
-  }
-  tmp_str = command + "\r\n";
-  if (Write((char *)tmp_str.GetData(), tmp_str.Length()).Error()) {
-    m_lastError = wxPROTO_NETERR;
-    return FALSE;
-  }
-  return GetResult(exp_ret);
+    if (m_streaming)
+    {
+        m_lastError = wxPROTO_STREAMING;
+        return FALSE;
+    }
+
+    tmp_str = command + wxT("\r\n");
+    const wxWX2MBbuf tmp_buf = tmp_str.mb_str();
+    if ( Write(wxMBSTRINGCAST tmp_buf, strlen(tmp_buf)).Error())
+    {
+        m_lastError = wxPROTO_NETERR;
+        return FALSE;
+    }
+
+    wxLogTrace(_T("ftp"), _T("==> %s"), command.c_str());
+
+    return GetResult(exp_ret);

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// Recieve servers reply
+// ----------------------------------------------------------------------------
+

 bool wxFTP::GetResult(char exp)
 {
 bool wxFTP::GetResult(char exp)
 {

-  if ((m_lastError = GetLine(this, m_lastResult)))
-    return FALSE;
-  if (m_lastResult.GetChar(0) != exp) {
-    m_lastError = wxPROTO_PROTERR;
-    return FALSE;
-  }
+    wxString code;
+
+    // we handle multiline replies here according to RFC 959: it says that a
+    // reply may either be on 1 line of the form "xyz ..." or on several lines
+    // in whuch case it looks like
+    //      xyz-...
+    //      ...
+    //      xyz ...
+    // and the intermeidate lines may start with xyz or not
+    bool badReply = FALSE;
+    bool firstLine = TRUE;
+    bool endOfReply = FALSE;
+    while ( !endOfReply && !badReply )
+    {
+        m_lastError = ReadLine(m_lastResult);
+        if ( m_lastError )
+            return FALSE;
+
+        // unless this is an intermediate line of a multiline reply, it must
+        // contain the code in the beginning and '-' or ' ' following it
+        if ( m_lastResult.Len() < LEN_CODE + 1 )
+        {
+            if ( firstLine )
+            {
+                badReply = TRUE;
+            }
+            else
+            {
+                wxLogTrace(_T("ftp"), _T("<== %s %s"),
+                           code.c_str(), m_lastResult.c_str());
+            }
+        }
+        else // line has at least 4 chars
+        {
+            // this is the char which tells us what we're dealing with
+            wxChar chMarker = m_lastResult.GetChar(LEN_CODE);
+
+            if ( firstLine )
+            {
+                code = wxString(m_lastResult, LEN_CODE);
+                wxLogTrace(_T("ftp"), _T("<== %s %s"),
+                           code.c_str(), m_lastResult.c_str() + LEN_CODE + 1);
+
+                switch ( chMarker )
+                {
+                    case _T(' '):
+                        endOfReply = TRUE;
+                        break;
+
+                    case _T('-'):
+                        firstLine = FALSE;
+                        break;
+
+                    default:
+                        // unexpected
+                        badReply = TRUE;
+                }
+            }
+            else // subsequent line of multiline reply
+            {
+                if ( wxStrncmp(m_lastResult, code, LEN_CODE) == 0 )
+                {
+                    if ( chMarker == _T(' ') )
+                    {
+                        endOfReply = TRUE;
+                    }
+
+                    wxLogTrace(_T("ftp"), _T("<== %s %s"),
+                               code.c_str(), m_lastResult.c_str() + LEN_CODE + 1);
+                }
+                else
+                {
+                    // just part of reply
+                    wxLogTrace(_T("ftp"), _T("<== %s %s"),
+                               code.c_str(), m_lastResult.c_str());
+                }
+            }
+        }
+    }

 
 

-  if (m_lastResult.GetChar(3) == '-') {
-    wxString key = m_lastResult.Left((size_t)3);
+    if ( badReply )
+    {
+        wxLogDebug(_T("Broken FTP server: '%s' is not a valid reply."),
+                   m_lastResult.c_str());

 
 

-    key += ' ';
+        m_lastError = wxPROTO_PROTERR;

 
 

-    while (m_lastResult.Index(key) != 0) {
-      if ((m_lastError = GetLine(this, m_lastResult)))

         return FALSE;
     }
         return FALSE;
     }

-  }
-  return TRUE;
+
+    if ( code.GetChar(0) != exp )
+    {
+        m_lastError = wxPROTO_PROTERR;
+
+        return FALSE;
+    }
+
+    return TRUE;

 }
 
 ////////////////////////////////////////////////////////////////
 }
 
 ////////////////////////////////////////////////////////////////


@@ -185,14 +287,14 @@ bool wxFTP::ChDir(const wxString& dir)
 {
   wxString str = dir;
 
 {
   wxString str = dir;
 

-  str.Prepend("CWD ");
+  str.Prepend(wxT("CWD "));

   return SendCommand(str, '2');
 }
 
 bool wxFTP::MkDir(const wxString& dir)
 {
   wxString str = dir;
   return SendCommand(str, '2');
 }
 
 bool wxFTP::MkDir(const wxString& dir)
 {
   wxString str = dir;

-  str.Prepend("MKD ");
+  str.Prepend(wxT("MKD "));

   return SendCommand(str, '2');
 }
 
   return SendCommand(str, '2');
 }
 


@@ -200,32 +302,62 @@ bool wxFTP::RmDir(const wxString& dir)
 {
   wxString str = dir;
   
 {
   wxString str = dir;
   

-  str.Prepend("PWD ");
+  str.Prepend(wxT("PWD "));

   return SendCommand(str, '2');
 }
 
 wxString wxFTP::Pwd()
 {
   return SendCommand(str, '2');
 }
 
 wxString wxFTP::Pwd()
 {

-  int beg, end;
-
-  if (!SendCommand("PWD", '2'))
-    return wxString((char *)NULL);
-  
-  beg = m_lastResult.Find('\"',FALSE);
-  end = m_lastResult.Find('\"',TRUE);
+    wxString path;
+
+    if ( SendCommand(wxT("PWD"), '2') )
+    {
+        // the result is at least that long if SendCommand() succeeded
+        const wxChar *p = m_lastResult.c_str() + LEN_CODE + 1;
+        if ( *p != _T('"') )
+        {
+            wxLogDebug(_T("Missing starting quote in reply for PWD: %s"), p);
+        }
+        else
+        {
+            for ( p++; *p; p++ )
+            {
+                if ( *p == _T('"') )
+                {
+                    // check if the quote is doubled
+                    p++;
+                    if ( !*p || *p != _T('"') )
+                    {
+                        // no, this is the end
+                        break;
+                    }
+                    //else: yes, it is: this is an embedded quote in the
+                    //      filename, treat as normal char
+                }
+
+                path += *p;
+            }
+
+            if ( !*p )
+            {
+                wxLogDebug(_T("Missing ending quote in reply for PWD: %s"),
+                           m_lastResult.c_str() + LEN_CODE + 1);
+            }
+        }
+    }

 
 

-  return wxString(beg+1, end);
+    return path;

 }
 
 bool wxFTP::Rename(const wxString& src, const wxString& dst)
 {
   wxString str;
 
 }
 
 bool wxFTP::Rename(const wxString& src, const wxString& dst)
 {
   wxString str;
 

-  str = "RNFR " + src;
+  str = wxT("RNFR ") + src;

   if (!SendCommand(str, '3'))
     return FALSE;
 
   if (!SendCommand(str, '3'))
     return FALSE;
 

-  str = "RNTO " + dst;
+  str = wxT("RNTO ") + dst;

   return SendCommand(str, '2');
 }
 
   return SendCommand(str, '2');
 }
 


@@ -233,7 +365,7 @@ bool wxFTP::RmFile(const wxString& path)
 {
   wxString str;
 
 {
   wxString str;
 

-  str = "DELE ";
+  str = wxT("DELE ");

   str += path;
   return SendCommand(str, '2');
 }
   str += path;
   return SendCommand(str, '2');
 }


@@ -245,12 +377,14 @@ bool wxFTP::RmFile(const wxString& path)
 class wxInputFTPStream : public wxSocketInputStream {
 public:
   wxFTP *m_ftp;
 class wxInputFTPStream : public wxSocketInputStream {
 public:
   wxFTP *m_ftp;

+  size_t m_ftpsize;

 
   wxInputFTPStream(wxFTP *ftp_clt, wxSocketBase *sock)
     : wxSocketInputStream(*sock), m_ftp(ftp_clt) {}
 
   wxInputFTPStream(wxFTP *ftp_clt, wxSocketBase *sock)
     : wxSocketInputStream(*sock), m_ftp(ftp_clt) {}

+  size_t GetSize() const { return m_ftpsize; }

   virtual ~wxInputFTPStream(void)
   { 
   virtual ~wxInputFTPStream(void)
   { 

-     if (LastError() != wxStream_NOERROR)
+     if (LastError() == wxStream_NOERROR)

        m_ftp->GetResult('2');
      else
        m_ftp->Abort();
        m_ftp->GetResult('2');
      else
        m_ftp->Abort();


@@ -266,11 +400,23 @@ public:
     : wxSocketOutputStream(*sock), m_ftp(ftp_clt) {}
   virtual ~wxOutputFTPStream(void)
   {
     : wxSocketOutputStream(*sock), m_ftp(ftp_clt) {}
   virtual ~wxOutputFTPStream(void)
   {

-     if (LastError() != wxStream_NOERROR)
-       m_ftp->GetResult('2');
-     else
-       m_ftp->Abort();
-     delete m_o_socket;
+      if ( IsOk() )
+      {
+          // close data connection first, this will generate "transfer
+          // completed" reply
+          delete m_o_socket;
+
+          // read this reply
+          m_ftp->GetResult('2');
+      }
+      else
+      {
+          // abort data connection first
+          m_ftp->Abort();
+
+          // and close it after
+          delete m_o_socket;
+      }

   }
 };
 
   }
 };
 


@@ -278,32 +424,31 @@ wxSocketClient *wxFTP::GetPort()
 {
   wxIPV4address addr;
   wxSocketClient *client;
 {
   wxIPV4address addr;
   wxSocketClient *client;

-  struct sockaddr sin;

   int a[6];
   wxString straddr;
   int addr_pos;
   int a[6];
   wxString straddr;
   int addr_pos;

+  wxUint16 port;
+  wxUint32 hostaddr;

 
 

-  if (!SendCommand("PASV", '2'))
+  if (!SendCommand(wxT("PASV"), '2'))

     return NULL;
 
     return NULL;
 

-  sin.sa_family = AF_INET;
-  addr_pos = m_lastResult.Find('(');
+  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());
   if (addr_pos == -1) {
     m_lastError = wxPROTO_PROTERR;
     return NULL;
   }
   straddr = m_lastResult(addr_pos+1, m_lastResult.Length());

-  sscanf((const char *)straddr,"%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]);
+
+  hostaddr = (wxUint16)a[5] << 24 | (wxUint16)a[4] << 16 |
+             (wxUint16)a[3] << 8 | a[2]; 
+  addr.Hostname(hostaddr);

 
 

-  addr.Disassemble(&sin, sizeof(sin));
+  port = (wxUint16)a[0] << 8 | a[1];
+  addr.Service(port);

 
 

-  client = m_handler->CreateClient();
+  client = new wxSocketClient();

   if (!client->Connect(addr)) {
     delete client;
     return NULL;
   if (!client->Connect(addr)) {
     delete client;
     return NULL;


@@ -313,19 +458,25 @@ wxSocketClient *wxFTP::GetPort()
   return client;
 }
 
   return client;
 }
 

-bool wxFTP::Abort(void)
+bool wxFTP::Abort()

 {
 {

-  m_streaming = FALSE;
-  if (!SendCommand("ABOR", '4'))
-    return FALSE;
-  return GetResult('2');
+    if ( !m_streaming )
+        return TRUE;
+        
+    m_streaming = FALSE;
+    if ( !SendCommand(wxT("ABOR"), '4') )
+        return FALSE;
+
+    return GetResult('2');

 }
 
 wxInputStream *wxFTP::GetInputStream(const wxString& path)
 {
   wxString tmp_str;
 }
 
 wxInputStream *wxFTP::GetInputStream(const wxString& path)
 {
   wxString tmp_str;

+  int pos_size;
+  wxInputFTPStream *in_stream;

 
 

-  if (!SendCommand("TYPE I", '2'))
+  if (!SendCommand(wxT("TYPE I"), '2'))

     return NULL;
 
   wxSocketClient *sock = GetPort();
     return NULL;
 
   wxSocketClient *sock = GetPort();


@@ -335,34 +486,80 @@ wxInputStream *wxFTP::GetInputStream(const wxString& path)
     return NULL;
   }
 
     return NULL;
   }
 

-  tmp_str = "RETR " + path;
+  tmp_str = wxT("RETR ") + wxURL::ConvertFromURI(path);

   if (!SendCommand(tmp_str, '1'))
     return NULL;
 
   if (!SendCommand(tmp_str, '1'))
     return NULL;
 

-  return new wxInputFTPStream(this, sock);
+  in_stream = new wxInputFTPStream(this, sock);
+
+  pos_size = m_lastResult.Index(wxT('('));
+  if (pos_size != wxNOT_FOUND) {
+    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;

 }
 
 wxOutputStream *wxFTP::GetOutputStream(const wxString& path)
 {
   wxString tmp_str;
 
 }
 
 wxOutputStream *wxFTP::GetOutputStream(const wxString& path)
 {
   wxString tmp_str;
 

-  if (!SendCommand("TYPE I", '2'))
+  if (!SendCommand(wxT("TYPE I"), '2'))

     return NULL;
 
   wxSocketClient *sock = GetPort();
 
     return NULL;
 
   wxSocketClient *sock = GetPort();
 

-  tmp_str = "STOR " + path;
+  tmp_str = wxT("STOR ") + path;

   if (!SendCommand(tmp_str, '1'))
     return FALSE;
 
   return new wxOutputFTPStream(this, sock);
 }
 
   if (!SendCommand(tmp_str, '1'))
     return FALSE;
 
   return new wxOutputFTPStream(this, sock);
 }
 

+bool wxFTP::GetList(wxArrayString& files, const wxString& wildcard)
+{
+    wxSocketBase *sock = GetPort();
+    if ( !sock )
+    {
+        return FALSE;
+    }
+
+    wxString line = _T("NLST");
+    if ( !!wildcard )
+    {
+        // notice that there is no space here
+        line += wildcard;
+    }
+
+    if ( !SendCommand(line, '1') )
+    {
+        return FALSE;
+    }
+
+    files.Empty();
+
+    while ( ReadLine(sock, line) == wxPROTO_NOERR )
+    {
+        files.Add(line);
+    }
+
+    delete sock;
+
+    // the file list should be terminated by "226 Transfer complete""
+    if ( !GetResult('2') )
+        return FALSE;
+
+    return TRUE;
+}
+

 wxList *wxFTP::GetList(const wxString& wildcard)
 {
   wxList *file_list = new wxList;
   wxSocketBase *sock = GetPort();
 wxList *wxFTP::GetList(const wxString& wildcard)
 {
   wxList *file_list = new wxList;
   wxSocketBase *sock = GetPort();

-  wxString tmp_str = "NLST";
+  wxString tmp_str = wxT("NLST");

 
   if (!wildcard.IsNull())
     tmp_str += wildcard;
 
   if (!wildcard.IsNull())
     tmp_str += wildcard;


@@ -386,3 +583,5 @@ wxList *wxFTP::GetList(const wxString& wildcard)
 
   return file_list;
 }
 
   return file_list;
 }

+#endif
+  // wxUSE_SOCKETS