no message

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

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index 461dd934177e1eb9d2887e9e5ae20d6d048f90e7..28aad19f7f4b274cfdd30f18962c4f2c504cb379 100644 (file)
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -12,7 +12,21 @@
 #ifdef __GNUG__
 #pragma implementation "ftp.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "ftp.h"
 #endif

+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef __MWERKS__

 #include <memory.h>
 #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"


@@ -66,7 +80,7 @@ wxFTP::~wxFTP()
 ////////////////////////////////////////////////////////////////
 ////// 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;
 {
   if (!m_handler) {
     m_lastError = wxPROTO_NOHNDLR;


@@ -150,12 +164,12 @@ bool wxFTP::GetResult(char exp)
 {
   if ((m_lastError = GetLine(this, m_lastResult)))
     return FALSE;
 {
   if ((m_lastError = GetLine(this, m_lastResult)))
     return FALSE;

-  if (m_lastResult[0UL] != exp) {
+  if (m_lastResult.GetChar(0) != exp) {

     m_lastError = wxPROTO_PROTERR;
     return FALSE;
   }
 
     m_lastError = wxPROTO_PROTERR;
     return FALSE;
   }
 

-  if (m_lastResult[3UL] == '-') {
+  if (m_lastResult.GetChar(3) == '-') {

     wxString key = m_lastResult.Left((size_t)3);
 
     key += ' ';
     wxString key = m_lastResult.Left((size_t)3);
 
     key += ' ';


@@ -240,7 +254,7 @@ public:
     : wxSocketInputStream(*sock), m_ftp(ftp_clt) {}
   virtual ~wxInputFTPStream(void)
   { 
     : wxSocketInputStream(*sock), m_ftp(ftp_clt) {}
   virtual ~wxInputFTPStream(void)
   { 

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

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


@@ -256,7 +270,7 @@ public:
     : wxSocketOutputStream(*sock), m_ftp(ftp_clt) {}
   virtual ~wxOutputFTPStream(void)
   {
     : wxSocketOutputStream(*sock), m_ftp(ftp_clt) {}
   virtual ~wxOutputFTPStream(void)
   {

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

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