Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

detabified

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-04-22 12:24:51 +00:00
parent 1f3943e027
commit 3f2bcf3437
3 changed files with 107 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/protocol/ftp.h
View File

@@ -78,15 +78,15 @@ public:
bool Rename(const wxString& src, const wxString& dst); bool Rename(const wxString& src, const wxString& dst);
bool RmFile(const wxString& path); bool RmFile(const wxString& path);
// Get the size of a file in the current dir. // Get the size of a file in the current dir.
// this function tries its best to deliver the size in bytes using BINARY // this function tries its best to deliver the size in bytes using BINARY
// (the SIZE command reports different sizes depending on whether // (the SIZE command reports different sizes depending on whether
// type is set to ASCII or BINARY) // type is set to ASCII or BINARY)
// returns -1 if file is non-existant or size could not be found // returns -1 if file is non-existant or size could not be found
int GetFileSize(const wxString& fileName); int GetFileSize(const wxString& fileName);
// Check to see if a file exists in the current dir // Check to see if a file exists in the current dir
bool FileExists(const wxString& fileName); bool FileExists(const wxString& fileName);
// Download methods // Download methods
bool Abort(); bool Abort();

13
src/common/cmdline.cpp
View File

@@ -478,12 +478,11 @@ wxString wxCmdLineParser::GetParam(size_t n) const
// Resets switches and options // Resets switches and options
void wxCmdLineParser::Reset() void wxCmdLineParser::Reset()
{ {
unsigned int i; for ( size_t i = 0; i < m_data->m_options.Count(); i++ )
for (i = 0; i < m_data->m_options.Count(); i++) {
{ wxCmdLineOption& opt = m_data->m_options[i];
wxCmdLineOption& opt = m_data->m_options[(size_t)i]; opt.SetHasValue(FALSE);
opt.SetHasValue(FALSE); }
}
} }
@@ -502,7 +501,7 @@ int wxCmdLineParser::Parse()
size_t countParam = m_data->m_paramDesc.GetCount(); size_t countParam = m_data->m_paramDesc.GetCount();
Reset(); Reset();
// parse everything // parse everything
wxString arg; wxString arg;

188
src/common/ftp.cpp
View File

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