In SetProxy, add 1 to pos when parsing port since otherwise we include the colon.

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

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index 1579342ca58ab63ec7f75be95635880a74bc1912..f3126b2f333b5120b7b3056e51665c62a594de8c 100644 (file)
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -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>


@@ -672,7 +672,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 +844,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,7 +884,7 @@ int wxFTP::GetFileSize(const wxString& fileName)
 }
 
 
 }
 
 

-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2

 // deprecated
 wxList *wxFTP::GetList(const wxString& wildcard, bool details)
 {
 // deprecated
 wxList *wxFTP::GetList(const wxString& wildcard, bool details)
 {


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

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