X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/86435b1a7d159cb413a1827efd3ae0d00df2322b..bb80bb5b30d7b16f39e6c1c63637f98fdf4ff63a:/src/common/ftp.cpp?ds=inline

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index 95d0d739d5..f3126b2f33 100644
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -32,7 +32,7 @@
   #pragma hdrstop
 #endif
 
-#if wxUSE_SOCKETS && wxUSE_STREAMS
+#if wxUSE_PROTOCOL_FTP
 
 #ifndef WX_PRECOMP
     #include <stdlib.h>
@@ -83,7 +83,7 @@ wxFTP::wxFTP()
 {
     m_lastError = wxPROTO_NOERR;
     m_streaming = FALSE;
-	m_currentTransfermode = NONE;
+    m_currentTransfermode = NONE;
 
     m_user = wxT("anonymous");
     m_passwd << wxGetUserId() << wxT('@') << wxGetFullHostName();
@@ -371,9 +371,9 @@ bool wxFTP::SetTransferMode(TransferMode transferMode)
         return FALSE;
     }
 
-	// If we get here the operation has been succesfully completed
-	// Set the status-member
-	m_currentTransfermode = transferMode;
+    // If we get here the operation has been succesfully completed
+    // Set the status-member
+    m_currentTransfermode = transferMode;
 
     return TRUE;
 }
@@ -631,7 +631,7 @@ wxInputStream *wxFTP::GetInputStream(const wxString& path)
     int pos_size;
     wxInputFTPStream *in_stream;
 
-	if ( ( m_currentTransfermode == NONE ) && !SetTransferMode(BINARY) )
+    if ( ( m_currentTransfermode == NONE ) && !SetTransferMode(BINARY) )
         return NULL;
 
     wxSocketClient *sock = GetPort();
@@ -665,14 +665,14 @@ wxInputStream *wxFTP::GetInputStream(const wxString& path)
 
 wxOutputStream *wxFTP::GetOutputStream(const wxString& path)
 {
-	if ( ( m_currentTransfermode == NONE ) && !SetTransferMode(BINARY) )
+    if ( ( m_currentTransfermode == NONE ) && !SetTransferMode(BINARY) )
         return NULL;
 
     wxSocketClient *sock = GetPort();
 
     wxString tmp_str = wxT("STOR ") + path;
     if ( !CheckCommand(tmp_str, '1') )
-        return FALSE;
+        return NULL;
 
     m_streaming = TRUE;
 
@@ -722,27 +722,27 @@ bool wxFTP::GetList(wxArrayString& files,
 
 bool wxFTP::FileExists(const wxString& fileName)
 {
-	// This function checks if the file specified in fileName exists in the 
-	// current dir. It does so by simply doing an NLST (via GetList).
-	// If this succeeds (and the list is not empty) the file exists.
-	
-	bool retval = FALSE;
-	wxArrayString fileList;
-
-	if ( GetList(fileList, fileName, FALSE) )
-	{
-		// Some ftp-servers (Ipswitch WS_FTP Server 1.0.5 does this)
-		// displays this behaviour when queried on a non-existing file:
-		// NLST this_file_does_not_exist
-		// 150 Opening ASCII data connection for directory listing
-		// (no data transferred)
-		// 226 Transfer complete
+    // This function checks if the file specified in fileName exists in the
+    // current dir. It does so by simply doing an NLST (via GetList).
+    // If this succeeds (and the list is not empty) the file exists.
+
+    bool retval = FALSE;
+    wxArrayString fileList;
+
+    if ( GetList(fileList, fileName, FALSE) )
+    {
+        // Some ftp-servers (Ipswitch WS_FTP Server 1.0.5 does this)
+        // displays this behaviour when queried on a non-existing file:
+        // NLST this_file_does_not_exist
+        // 150 Opening ASCII data connection for directory listing
+        // (no data transferred)
+        // 226 Transfer complete
         // Here wxFTP::GetList(...) will succeed but it will return an empty
         // list.
         retval = !fileList.IsEmpty();
-	}
+    }
 
-	return retval;
+    return retval;
 }
 
 // ----------------------------------------------------------------------------
@@ -751,13 +751,13 @@ bool wxFTP::FileExists(const wxString& fileName)
 
 int wxFTP::GetFileSize(const wxString& fileName)
 {
-	// return the filesize of the given file if possible
-	// return -1 otherwise (predominantly if file doesn't exist
-	// in current dir)
+    // return the filesize of the given file if possible
+    // return -1 otherwise (predominantly if file doesn't exist
+    // in current dir)
 
-	int filesize = -1;
-	
-	// Check for existance of file via wxFTP::FileExists(...)
+    int filesize = -1;
+
+    // Check for existance of file via wxFTP::FileExists(...)
     if ( FileExists(fileName) )
     {
         wxString command;
@@ -767,7 +767,7 @@ int wxFTP::GetFileSize(const wxString& fileName)
         // transfermodes and reports different filesizes accordingly.
         // The BINARY size is the interesting one: How much memory
         // will we need to hold this file?
-	    TransferMode oldTransfermode = m_currentTransfermode;
+        TransferMode oldTransfermode = m_currentTransfermode;
         SetTransferMode(BINARY);
         command << _T("SIZE ") << fileName;
 
@@ -777,55 +777,55 @@ int wxFTP::GetFileSize(const wxString& fileName)
         {
             // The answer should be one line: "213 <filesize>\n"
             // 213 is File Status (STD9)
-			// "SIZE" is not described anywhere..? It works on most servers
-			int statuscode;
-			if ( wxSscanf(GetLastResult().c_str(), _T("%i %i"),
+            // "SIZE" is not described anywhere..? It works on most servers
+            int statuscode;
+            if ( wxSscanf(GetLastResult().c_str(), _T("%i %i"),
                           &statuscode, &filesize) == 2 )
-			{
-				// We've gotten a good reply.
-				ok = TRUE; 
-			}
-			else
-			{
-				// Something bad happened.. A "2yz" reply with no size
-				// Fallback
-				ok = FALSE;
-			}
+            {
+                // We've gotten a good reply.
+                ok = TRUE;
+            }
+            else
+            {
+                // Something bad happened.. A "2yz" reply with no size
+                // Fallback
+                ok = FALSE;
+            }
         }
-		
-		// Set transfermode back to the original. Only the "SIZE"-command
-		// is dependant on transfermode
+
+        // Set transfermode back to the original. Only the "SIZE"-command
+        // is dependant on transfermode
         if ( oldTransfermode != NONE )
         {
             SetTransferMode(oldTransfermode);
         }
-		
-		if ( !ok ) // this is not a direct else clause.. The size command might return an invalid "2yz" reply
+
+        if ( !ok ) // this is not a direct else clause.. The size command might return an invalid "2yz" reply
         {
-			// The server didn't understand the "SIZE"-command or it
-			// returned an invalid reply.
-			// We now try to get details for the file with a "LIST"-command
-			// and then parse the output from there..
-			wxArrayString fileList;
-			if ( GetList(fileList, fileName, TRUE) )
-			{
-				if ( !fileList.IsEmpty() )
-				{
+            // The server didn't understand the "SIZE"-command or it
+            // returned an invalid reply.
+            // We now try to get details for the file with a "LIST"-command
+            // and then parse the output from there..
+            wxArrayString fileList;
+            if ( GetList(fileList, fileName, TRUE) )
+            {
+                if ( !fileList.IsEmpty() )
+                {
                     // We _should_ only get one line in return, but just to be
                     // safe we run through the line(s) returned and look for a
                     // substring containing the name we are looking for. We
                     // stop the iteration at the first occurrence of the
                     // filename. The search is not case-sensitive.
-					bool foundIt = FALSE;
+                    bool foundIt = FALSE;
 
                     size_t i;
-					for ( i = 0; !foundIt && i < fileList.Count(); i++ )
-					{
-						foundIt = fileList[i].Upper().Contains(fileName.Upper());
-					}
+                    for ( i = 0; !foundIt && i < fileList.Count(); i++ )
+                    {
+                        foundIt = fileList[i].Upper().Contains(fileName.Upper());
+                    }
 
-					if ( foundIt )
-					{
+                    if ( foundIt )
+                    {
                         // The index i points to the first occurrence of
                         // fileName in the array Now we have to find out what
                         // format the LIST has returned. There are two
@@ -841,50 +841,50 @@ int wxFTP::GetFileSize(const wxString& fileName)
                         // indicate Unix-style (this also limits this function
                         // to searching for files, not directories)
                         if ( fileList[i].Mid(0, 1) == _T("-") )
-						{
+                        {
 
-							if ( wxSscanf(fileList[i].c_str(),
-                                          _("%*s %*s %*s %*s %i %*s %*s %*s %*s"), 
+                            if ( wxSscanf(fileList[i].c_str(),
+                                          _T("%*s %*s %*s %*s %i %*s %*s %*s %*s"),
                                           &filesize) == 9 )
-							{
-								// We've gotten a good response
-								ok = TRUE;
-							}
-							else
-							{
-								// Hmm... Invalid response
-								wxLogTrace(FTP_TRACE_MASK,
+                            {
+                                // We've gotten a good response
+                                ok = TRUE;
+                            }
+                            else
+                            {
+                                // Hmm... Invalid response
+                                wxLogTrace(FTP_TRACE_MASK,
                                            _T("Invalid LIST response"));
-							}
-						}
-						else // Windows-style response (?)
-						{
-							if ( wxSscanf(fileList[i].c_str(),
+                            }
+                        }
+                        else // Windows-style response (?)
+                        {
+                            if ( wxSscanf(fileList[i].c_str(),
                                           _T("%*s %*s %i %*s"),
                                           &filesize) == 4 )
-							{
-								// valid response
-								ok = TRUE;
-							}
-							else
-							{
-								// something bad happened..?
-								wxLogTrace(FTP_TRACE_MASK,
+                            {
+                                // valid response
+                                ok = TRUE;
+                            }
+                            else
+                            {
+                                // something bad happened..?
+                                wxLogTrace(FTP_TRACE_MASK,
                                            _T("Invalid or unknown LIST response"));
-							}
-						}
-					}
-				}
-			}
+                            }
+                        }
+                    }
+                }
+            }
         }
     }
 
-	// filesize might still be -1 when exiting
-	return filesize;
+    // filesize might still be -1 when exiting
+    return filesize;
 }
 
 
-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2
 // 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
-  // wxUSE_SOCKETS
+#endif // wxUSE_PROTOCOL_FTP
+