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

many changes; major ones:

Browse Source 
1. start of !wxUSE_GUI support
2. _T() macro renamed to T()
3. wxConvertWX2MB and MB2WX macro added


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-10-04 20:15:38 +00:00
parent 9841339c74
commit e90c1d2a19
298 changed files with 5153 additions and 4672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/common/ftp.cpp
View File

@@ -50,7 +50,7 @@
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxFTP, wxProtocol)
IMPLEMENT_PROTOCOL(wxFTP, _T("ftp"), _T("ftp"), TRUE)
IMPLEMENT_PROTOCOL(wxFTP, T("ftp"), T("ftp"), TRUE)
#endif
////////////////////////////////////////////////////////////////
@@ -63,7 +63,7 @@ wxFTP::wxFTP()
m_lastError = wxPROTO_NOERR;
m_streaming = FALSE;
m_user = _T("anonymous");
m_user = T("anonymous");
m_passwd = wxGetUserId();
m_passwd += '@';
m_passwd += wxGetHostName();
@@ -74,7 +74,7 @@ wxFTP::wxFTP()
wxFTP::~wxFTP()
{
SendCommand("QUIT", '2');
SendCommand("QUIT(", '2');
}
////////////////////////////////////////////////////////////////
@@ -99,13 +99,13 @@ bool wxFTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
return FALSE;
}
command.sprintf(_T("USER %s"), (const wxChar *)m_user);
command.sprintf(T("USER %s"), (const wxChar *)m_user);
if (!SendCommand(command, '3')) {
Close();
return FALSE;
}
command.sprintf(_T("PASS %s"), (const wxChar *)m_passwd);
command.sprintf(T("PASS %s"), (const wxChar *)m_passwd);
if (!SendCommand(command, '2')) {
Close();
return FALSE;
@@ -120,7 +120,7 @@ bool wxFTP::Connect(const wxString& host)
wxString my_host = host;
addr.Hostname(my_host);
addr.Service(_T("ftp"));
addr.Service(T("ftp"));
return Connect(addr);
}
@@ -132,7 +132,7 @@ bool wxFTP::Close()
return FALSE;
}
if (m_connected)
SendCommand(wxString(_T("QUIT")), '2');
SendCommand(wxString(T("QUIT(")), '2');
return wxSocketClient::Close();
}
@@ -147,9 +147,9 @@ bool wxFTP::SendCommand(const wxString& command, char exp_ret)
m_lastError = wxPROTO_STREAMING;
return FALSE;
}
tmp_str = command + _T("\r\n");
tmp_str = command + T("\r\n");
const wxWX2MBbuf tmp_buf = tmp_str.mb_str();
if (Write(MBSTRINGCAST tmp_buf, strlen(tmp_buf)).Error()) {
if (Write(wxMBSTRINGCAST tmp_buf, strlen(tmp_buf)).Error()) {
m_lastError = wxPROTO_NETERR;
return FALSE;
}
@@ -169,7 +169,7 @@ bool wxFTP::GetResult(char exp)
if (m_lastResult.GetChar(3) == '-') {
wxString key = m_lastResult.Left((size_t)3);
key += _T(' ');
key += T(' ');
while (m_lastResult.Index(key) != 0) {
m_lastError = GetLine(this, m_lastResult);
@@ -187,14 +187,14 @@ bool wxFTP::ChDir(const wxString& dir)
{
wxString str = dir;
str.Prepend(_T("CWD "));
str.Prepend(T("CWD "));
return SendCommand(str, '2');
}
bool wxFTP::MkDir(const wxString& dir)
{
wxString str = dir;
str.Prepend(_T("MKD "));
str.Prepend(T("MKD "));
return SendCommand(str, '2');
}
@@ -202,7 +202,7 @@ bool wxFTP::RmDir(const wxString& dir)
{
wxString str = dir;
str.Prepend(_T("PWD "));
str.Prepend(T("PWD "));
return SendCommand(str, '2');
}
@@ -210,11 +210,11 @@ wxString wxFTP::Pwd()
{
int beg, end;
if (!SendCommand(_T("PWD"), '2'))
if (!SendCommand(T("PWD"), '2'))
return wxString((char *)NULL);
beg = m_lastResult.Find(_T('\"'),FALSE);
end = m_lastResult.Find(_T('\"'),TRUE);
beg = m_lastResult.Find(T('\"'),FALSE);
end = m_lastResult.Find(T('\"'),TRUE);
return wxString(beg+1, end);
}
@@ -223,11 +223,11 @@ bool wxFTP::Rename(const wxString& src, const wxString& dst)
{
wxString str;
str = _T("RNFR ") + src;
str = T("RNFR ") + src;
if (!SendCommand(str, '3'))
return FALSE;
str = _T("RNTO ") + dst;
str = T("RNTO ") + dst;
return SendCommand(str, '2');
}
@@ -235,7 +235,7 @@ bool wxFTP::RmFile(const wxString& path)
{
wxString str;
str = _T("DELE ");
str = T("DELE ");
str += path;
return SendCommand(str, '2');
}
@@ -288,16 +288,16 @@ wxSocketClient *wxFTP::GetPort()
wxUint16 port;
wxUint32 hostaddr;
if (!SendCommand(_T("PASV"), '2'))
if (!SendCommand(T("PASV"), '2'))
return NULL;
addr_pos = m_lastResult.Find(_T('('));
addr_pos = m_lastResult.Find(T('('));
if (addr_pos == -1) {
m_lastError = wxPROTO_PROTERR;
return NULL;
}
straddr = m_lastResult(addr_pos+1, m_lastResult.Length());
wxSscanf((const wxChar *)straddr,_T("%d,%d,%d,%d,%d,%d"),&a[2],&a[3],&a[4],&a[5],&a[0],&a[1]);
wxSscanf((const wxChar *)straddr,T("%d,%d,%d,%d,%d,%d"),&a[2],&a[3],&a[4],&a[5],&a[0],&a[1]);
hostaddr = (wxUint16)a[5] << 24 | (wxUint16)a[4] << 16 |
(wxUint16)a[3] << 8 | a[2];
@@ -319,7 +319,7 @@ wxSocketClient *wxFTP::GetPort()
bool wxFTP::Abort(void)
{
m_streaming = FALSE;
if (!SendCommand(_T("ABOR"), '4'))
if (!SendCommand(T("ABOR"), '4'))
return FALSE;
return GetResult('2');
}
@@ -330,7 +330,7 @@ wxInputStream *wxFTP::GetInputStream(const wxString& path)
int pos_size;
wxInputFTPStream *in_stream;
if (!SendCommand(_T("TYPE I"), '2'))
if (!SendCommand(T("TYPE I"), '2'))
return NULL;
wxSocketClient *sock = GetPort();
@@ -340,15 +340,15 @@ wxInputStream *wxFTP::GetInputStream(const wxString& path)
return NULL;
}
tmp_str = _T("RETR ") + wxURL::ConvertFromURI(path);
tmp_str = T("RETR ") + wxURL::ConvertFromURI(path);
if (!SendCommand(tmp_str, '1'))
return NULL;
in_stream = new wxInputFTPStream(this, sock);
pos_size = m_lastResult.Index(_T('('));
pos_size = m_lastResult.Index(T('('));
if (pos_size != wxNOT_FOUND) {
wxString str_size = m_lastResult(pos_size+1, m_lastResult.Index(_T(')'))-1);
wxString str_size = m_lastResult(pos_size+1, m_lastResult.Index(T(')'))-1);
in_stream->m_ftpsize = wxAtoi(WXSTRINGCAST str_size);
}
@@ -361,12 +361,12 @@ wxOutputStream *wxFTP::GetOutputStream(const wxString& path)
{
wxString tmp_str;
if (!SendCommand(_T("TYPE I"), '2'))
if (!SendCommand(T("TYPE I"), '2'))
return NULL;
wxSocketClient *sock = GetPort();
tmp_str = _T("STOR ") + path;
tmp_str = T("STOR ") + path;
if (!SendCommand(tmp_str, '1'))
return FALSE;
@@ -377,7 +377,7 @@ wxList *wxFTP::GetList(const wxString& wildcard)
{
wxList *file_list = new wxList;
wxSocketBase *sock = GetPort();
wxString tmp_str = _T("NLST");
wxString tmp_str = T("NLST(");
if (!wildcard.IsNull())
tmp_str += wildcard;