added support for POST method and alternate ports (part of patch 649438)

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

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index 1579342ca58ab63ec7f75be95635880a74bc1912..baac336f08fa1b03643e4847f20bcad77978a788 100644 (file)
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -10,7 +10,7 @@
 // Created:     07/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Created:     07/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -32,7 +32,7 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

-#if wxUSE_SOCKETS && wxUSE_STREAMS
+#if wxUSE_PROTOCOL_FTP

 
 #ifndef WX_PRECOMP
     #include <stdlib.h>
 
 #ifndef WX_PRECOMP
     #include <stdlib.h>


@@ -507,7 +507,7 @@ public:
     {
         delete m_i_socket;
 
     {
         delete m_i_socket;
 

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

         {
             // wait for "226 transfer completed"
             m_ftp->CheckResult('2');
         {
             // wait for "226 transfer completed"
             m_ftp->CheckResult('2');


@@ -524,6 +524,8 @@ public:
 
     wxFTP *m_ftp;
     size_t m_ftpsize;
 
     wxFTP *m_ftp;
     size_t m_ftpsize;

+
+    DECLARE_NO_COPY_CLASS(wxInputFTPStream)

 };
 
 class wxOutputFTPStream : public wxSocketOutputStream
 };
 
 class wxOutputFTPStream : public wxSocketOutputStream


@@ -558,6 +560,8 @@ public:
     }
 
     wxFTP *m_ftp;
     }
 
     wxFTP *m_ftp;

+
+    DECLARE_NO_COPY_CLASS(wxOutputFTPStream)

 };
 
 wxSocketClient *wxFTP::GetPort()
 };
 
 wxSocketClient *wxFTP::GetPort()


@@ -672,7 +676,7 @@ wxOutputStream *wxFTP::GetOutputStream(const wxString& path)
 
     wxString tmp_str = wxT("STOR ") + path;
     if ( !CheckCommand(tmp_str, '1') )
 
     wxString tmp_str = wxT("STOR ") + path;
     if ( !CheckCommand(tmp_str, '1') )

-        return FALSE;
+        return NULL;

 
     m_streaming = TRUE;
 
 
     m_streaming = TRUE;
 


@@ -844,7 +848,7 @@ int wxFTP::GetFileSize(const wxString& fileName)
                         {
 
                             if ( wxSscanf(fileList[i].c_str(),
                         {
 
                             if ( wxSscanf(fileList[i].c_str(),

-                                          _("%*s %*s %*s %*s %i %*s %*s %*s %*s"),
+                                          _T("%*s %*s %*s %*s %i %*s %*s %*s %*s"),

                                           &filesize) == 9 )
                             {
                                 // We've gotten a good response
                                           &filesize) == 9 )
                             {
                                 // We've gotten a good response


@@ -884,13 +888,13 @@ int wxFTP::GetFileSize(const wxString& fileName)
 }
 
 
 }
 
 

-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2

 // deprecated
 wxList *wxFTP::GetList(const wxString& wildcard, bool details)
 {
  wxSocketBase *sock = GetPort();
  if (!sock)
 // deprecated
 wxList *wxFTP::GetList(const wxString& wildcard, bool details)
 {
  wxSocketBase *sock = GetPort();
  if (!sock)

-  return FALSE;
+  return NULL;

  wxList *file_list = new wxList;
  wxString line;
  // NLST : List of Filenames (including Directory's !)
  wxList *file_list = new wxList;
  wxString line;
  // NLST : List of Filenames (including Directory's !)


@@ -925,5 +929,5 @@ wxList *wxFTP::GetList(const wxString& wildcard, bool details)
 }
 #endif // WXWIN_COMPATIBILITY_2
 
 }
 #endif // WXWIN_COMPATIBILITY_2
 

-#endif
-  // wxUSE_SOCKETS
+#endif // wxUSE_PROTOCOL_FTP
+