X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e23102435cb5c97a71548232ae37978a6755e8d..02fd8b9b6186623ed61019ac7e69ed9a4ef16773:/samples/console/console.cpp?ds=sidebyside diff --git a/samples/console/console.cpp b/samples/console/console.cpp index 8fb03b87d1..8a9a0705c6 100644 --- a/samples/console/console.cpp +++ b/samples/console/console.cpp @@ -9,6 +9,57 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +// IMPORTANT NOTE FOR WXWIDGETS USERS: +// If you're a wxWidgets user and you're looking at this file to learn how to +// structure a wxWidgets console application, then you don't have much to learn. +// This application is used more for testing rather than as sample but +// basically the following simple block is enough for you to start your +// own console application: + +/* + int main(int argc, char **argv) + { + wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, "program"); + + wxInitializer initializer; + if ( !initializer ) + { + fprintf(stderr, "Failed to initialize the wxWidgets library, aborting."); + return -1; + } + + static const wxCmdLineEntryDesc cmdLineDesc[] = + { + { wxCMD_LINE_SWITCH, "h", "help", "show this help message", + wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP }, + // ... your other command line options here... + + { wxCMD_LINE_NONE } + }; + + wxCmdLineParser parser(cmdLineDesc, argc, wxArgv); + switch ( parser.Parse() ) + { + case -1: + wxLogMessage(_T("Help was given, terminating.")); + break; + + case 0: + // everything is ok; proceed + break; + + default: + wxLogMessage(_T("Syntax error detected, aborting.")); + break; + } + + // do something useful here + + return 0; + } +*/ + + // ============================================================================ // declarations // ============================================================================ @@ -23,6 +74,7 @@ #include "wx/string.h" #include "wx/file.h" +#include "wx/filename.h" #include "wx/app.h" #include "wx/log.h" #include "wx/apptrait.h" @@ -63,7 +115,7 @@ #define TEST_FILECONF #define TEST_FILENAME #define TEST_FILETIME - // #define TEST_FTP --FIXME! (RN) + #define TEST_FTP #define TEST_INFO_FUNCTIONS #define TEST_LOCALE #define TEST_LOG @@ -88,7 +140,7 @@ #define TEST_WCHAR #define TEST_ZIP #else // #if TEST_ALL - #define TEST_EXECUTE + #define TEST_FTP #endif // some tests are interactive, define this to run them @@ -304,7 +356,7 @@ public: virtual wxDirTraverseResult OnDir(const wxString& dirname) { wxString path, name, ext; - wxSplitPath(dirname, &path, &name, &ext); + wxFileName::SplitPath(dirname, &path, &name, &ext); if ( !ext.empty() ) name << _T('.') << ext; @@ -1631,7 +1683,7 @@ static void TestPathList() // regular expressions // ---------------------------------------------------------------------------- -#ifdef TEST_REGEX +#if defined TEST_REGEX && TEST_INTERACTIVE #include "wx/regex.h" @@ -2404,10 +2456,10 @@ static void TestSocketClient() #include "wx/protocol/ftp.h" -static wxFTP ftp; - #define FTP_ANONYMOUS +static wxFTP *ftp; + #ifdef FTP_ANONYMOUS static const wxChar *directory = _T("/pub"); static const wxChar *filename = _T("welcome.msg"); @@ -2430,18 +2482,18 @@ static bool TestFtpConnect() wxChar user[256]; wxFgets(user, WXSIZEOF(user), stdin); user[wxStrlen(user) - 1] = '\0'; // chop off '\n' - ftp.SetUser(user); + ftp->SetUser(user); wxChar password[256]; wxPrintf(_T("Password for %s: "), password); wxFgets(password, WXSIZEOF(password), stdin); password[wxStrlen(password) - 1] = '\0'; // chop off '\n' - ftp.SetPassword(password); + ftp->SetPassword(password); wxPrintf(_T("--- Attempting to connect to %s:21 as %s...\n"), hostname, user); #endif // FTP_ANONYMOUS/!FTP_ANONYMOUS - if ( !ftp.Connect(hostname) ) + if ( !ftp->Connect(hostname) ) { wxPrintf(_T("ERROR: failed to connect to %s\n"), hostname); @@ -2450,72 +2502,34 @@ static bool TestFtpConnect() else { wxPrintf(_T("--- Connected to %s, current directory is '%s'\n"), - hostname, ftp.Pwd().c_str()); - ftp.Close(); + hostname, ftp->Pwd().c_str()); + ftp->Close(); } return true; } -// test (fixed?) wxFTP bug with wu-ftpd >= 2.6.0? -static void TestFtpWuFtpd() -{ - wxFTP ftp; - static const wxChar *hostname = _T("ftp.eudora.com"); - if ( !ftp.Connect(hostname) ) - { - wxPrintf(_T("ERROR: failed to connect to %s\n"), hostname); - } - else - { - static const wxChar *filename = _T("eudora/pubs/draft-gellens-submit-09.txt"); - wxInputStream *in = ftp.GetInputStream(filename); - if ( !in ) - { - wxPrintf(_T("ERROR: couldn't get input stream for %s\n"), filename); - } - else - { - size_t size = in->GetSize(); - wxPrintf(_T("Reading file %s (%u bytes)..."), filename, size); - - wxChar *data = new wxChar[size]; - if ( !in->Read(data, size) ) - { - wxPuts(_T("ERROR: read error")); - } - else - { - wxPrintf(_T("Successfully retrieved the file.\n")); - } - - delete [] data; - delete in; - } - } -} - static void TestFtpList() { wxPuts(_T("*** Testing wxFTP file listing ***\n")); // test CWD - if ( !ftp.ChDir(directory) ) + if ( !ftp->ChDir(directory) ) { wxPrintf(_T("ERROR: failed to cd to %s\n"), directory); } - wxPrintf(_T("Current directory is '%s'\n"), ftp.Pwd().c_str()); + wxPrintf(_T("Current directory is '%s'\n"), ftp->Pwd().c_str()); // test NLIST and LIST wxArrayString files; - if ( !ftp.GetFilesList(files) ) + if ( !ftp->GetFilesList(files) ) { wxPuts(_T("ERROR: failed to get NLIST of files")); } else { - wxPrintf(_T("Brief list of files under '%s':\n"), ftp.Pwd().c_str()); + wxPrintf(_T("Brief list of files under '%s':\n"), ftp->Pwd().c_str()); size_t count = files.GetCount(); for ( size_t n = 0; n < count; n++ ) { @@ -2524,13 +2538,13 @@ static void TestFtpList() wxPuts(_T("End of the file list")); } - if ( !ftp.GetDirList(files) ) + if ( !ftp->GetDirList(files) ) { wxPuts(_T("ERROR: failed to get LIST of files")); } else { - wxPrintf(_T("Detailed list of files under '%s':\n"), ftp.Pwd().c_str()); + wxPrintf(_T("Detailed list of files under '%s':\n"), ftp->Pwd().c_str()); size_t count = files.GetCount(); for ( size_t n = 0; n < count; n++ ) { @@ -2539,12 +2553,12 @@ static void TestFtpList() wxPuts(_T("End of the file list")); } - if ( !ftp.ChDir(_T("..")) ) + if ( !ftp->ChDir(_T("..")) ) { wxPuts(_T("ERROR: failed to cd to ..")); } - wxPrintf(_T("Current directory is '%s'\n"), ftp.Pwd().c_str()); + wxPrintf(_T("Current directory is '%s'\n"), ftp->Pwd().c_str()); } static void TestFtpDownload() @@ -2552,7 +2566,7 @@ static void TestFtpDownload() wxPuts(_T("*** Testing wxFTP download ***\n")); // test RETR - wxInputStream *in = ftp.GetInputStream(filename); + wxInputStream *in = ftp->GetInputStream(filename); if ( !in ) { wxPrintf(_T("ERROR: couldn't get input stream for %s\n"), filename); @@ -2582,16 +2596,16 @@ static void TestFtpFileSize() { wxPuts(_T("*** Testing FTP SIZE command ***")); - if ( !ftp.ChDir(directory) ) + if ( !ftp->ChDir(directory) ) { wxPrintf(_T("ERROR: failed to cd to %s\n"), directory); } - wxPrintf(_T("Current directory is '%s'\n"), ftp.Pwd().c_str()); + wxPrintf(_T("Current directory is '%s'\n"), ftp->Pwd().c_str()); - if ( ftp.FileExists(filename) ) + if ( ftp->FileExists(filename) ) { - int size = ftp.GetFileSize(filename); + int size = ftp->GetFileSize(filename); if ( size == -1 ) wxPrintf(_T("ERROR: couldn't get size of '%s'\n"), filename); else @@ -2607,26 +2621,28 @@ static void TestFtpMisc() { wxPuts(_T("*** Testing miscellaneous wxFTP functions ***")); - if ( ftp.SendCommand(_T("STAT")) != '2' ) + if ( ftp->SendCommand(_T("STAT")) != '2' ) { wxPuts(_T("ERROR: STAT failed")); } else { - wxPrintf(_T("STAT returned:\n\n%s\n"), ftp.GetLastResult().c_str()); + wxPrintf(_T("STAT returned:\n\n%s\n"), ftp->GetLastResult().c_str()); } - if ( ftp.SendCommand(_T("HELP SITE")) != '2' ) + if ( ftp->SendCommand(_T("HELP SITE")) != '2' ) { wxPuts(_T("ERROR: HELP SITE failed")); } else { wxPrintf(_T("The list of site-specific commands:\n\n%s\n"), - ftp.GetLastResult().c_str()); + ftp->GetLastResult().c_str()); } } +#if TEST_INTERACTIVE + static void TestFtpInteractive() { wxPuts(_T("\n*** Interactive wxFTP test ***")); @@ -2652,14 +2668,14 @@ static void TestFtpInteractive() wildcard = buf + 5; wxArrayString files; - if ( !ftp.GetList(files, wildcard, start == _T("LIST")) ) + if ( !ftp->GetList(files, wildcard, start == _T("LIST")) ) { wxPrintf(_T("ERROR: failed to get %s of files\n"), start.c_str()); } else { wxPrintf(_T("--- %s of '%s' under '%s':\n"), - start.c_str(), wildcard.c_str(), ftp.Pwd().c_str()); + start.c_str(), wildcard.c_str(), ftp->Pwd().c_str()); size_t count = files.GetCount(); for ( size_t n = 0; n < count; n++ ) { @@ -2670,20 +2686,22 @@ static void TestFtpInteractive() } else // !list { - wxChar ch = ftp.SendCommand(buf); + wxChar ch = ftp->SendCommand(buf); wxPrintf(_T("Command %s"), ch ? _T("succeeded") : _T("failed")); if ( ch ) { wxPrintf(_T(" (return code %c)"), ch); } - wxPrintf(_T(", server reply:\n%s\n\n"), ftp.GetLastResult().c_str()); + wxPrintf(_T(", server reply:\n%s\n\n"), ftp->GetLastResult().c_str()); } } wxPuts(_T("\n*** done ***")); } +#endif // TEST_INTERACTIVE + static void TestFtpUpload() { wxPuts(_T("*** Testing wxFTP uploading ***\n")); @@ -2691,7 +2709,7 @@ static void TestFtpUpload() // upload a file static const wxChar *file1 = _T("test1"); static const wxChar *file2 = _T("test2"); - wxOutputStream *out = ftp.GetOutputStream(file1); + wxOutputStream *out = ftp->GetOutputStream(file1); if ( out ) { wxPrintf(_T("--- Uploading to %s ---\n"), file1); @@ -2700,17 +2718,17 @@ static void TestFtpUpload() } // send a command to check the remote file - if ( ftp.SendCommand(wxString(_T("STAT ")) + file1) != '2' ) + if ( ftp->SendCommand(wxString(_T("STAT ")) + file1) != '2' ) { wxPrintf(_T("ERROR: STAT %s failed\n"), file1); } else { wxPrintf(_T("STAT %s returned:\n\n%s\n"), - file1, ftp.GetLastResult().c_str()); + file1, ftp->GetLastResult().c_str()); } - out = ftp.GetOutputStream(file2); + out = ftp->GetOutputStream(file2); if ( out ) { wxPrintf(_T("--- Uploading to %s ---\n"), file1); @@ -2739,11 +2757,11 @@ public: { } - virtual void Walk(size_t skip = 1) + virtual void Walk(size_t skip = 1, size_t maxdepth = wxSTACKWALKER_MAX_DEPTH) { wxPuts(_T("Stack dump:")); - wxStackWalker::Walk(skip); + wxStackWalker::Walk(skip, maxdepth); } protected: @@ -2852,9 +2870,10 @@ static void TestFileStream() { wxFileInputStream fsIn(filename); wxPrintf(_T("File stream size: %u\n"), fsIn.GetSize()); - while ( !fsIn.Eof() ) + int c; + while ( (c=fsIn.GetC()) != wxEOF ) { - wxPutchar(fsIn.GetC()); + wxPutchar(c); } } @@ -2889,9 +2908,10 @@ static void TestMemoryStream() wxMemoryInputStream memInpStream(buf, len); wxPrintf(_T("Memory stream size: %u\n"), memInpStream.GetSize()); - while ( !memInpStream.Eof() ) + int c; + while ( (c=memInpStream.GetC()) != wxEOF ) { - wxPutchar(memInpStream.GetC()); + wxPutchar(c); } wxPuts(_T("\n*** wxMemoryInputStream test done ***")); @@ -3448,9 +3468,10 @@ static void TestZipStreamRead() wxPrintf(_T("Archive size: %u\n"), istr.GetSize()); wxPrintf(_T("Dumping the file '%s':\n"), filename.c_str()); - while ( !istr.Eof() ) + int c; + while ( (c=istr.GetC()) != wxEOF ) { - wxPutchar(istr.GetC()); + wxPutchar(c); fflush(stdout); } @@ -4127,39 +4148,6 @@ static void TestThreadConditions() wxThread::Sleep(500); } -#include "wx/utils.h" - -class MyExecThread : public wxThread -{ -public: - MyExecThread(const wxString& command) : wxThread(wxTHREAD_JOINABLE), - m_command(command) - { - Create(); - } - - virtual ExitCode Entry() - { - return (ExitCode)wxExecute(m_command, wxEXEC_SYNC); - } - -private: - wxString m_command; -}; - -static void TestThreadExec() -{ - wxPuts(_T("*** Testing wxExecute interaction with threads ***\n")); - - MyExecThread thread(_T("true")); - thread.Run(); - - wxPrintf(_T("Main program exit code: %ld.\n"), - wxExecute(_T("false"), wxEXEC_SYNC)); - - wxPrintf(_T("Thread exit code: %ld.\n"), (long)thread.Wait()); -} - // semaphore tests #include "wx/datetime.h" @@ -4411,6 +4399,11 @@ int main(int argc, char **argv) #ifdef TEST_FTP wxLog::AddTraceMask(FTP_TRACE_MASK); + + // wxFTP cannot be a static variable as its ctor needs to access + // wxWidgets internals after it has been initialized + ftp = new wxFTP; + if ( TestFtpConnect() ) { #if TEST_ALL @@ -4422,14 +4415,12 @@ int main(int argc, char **argv) #endif // TEST_ALL #if TEST_INTERACTIVE - TestFtpInteractive(); + //TestFtpInteractive(); #endif } //else: connecting to the FTP server failed - #if 0 - TestFtpWuFtpd(); - #endif + delete ftp; #endif // TEST_FTP #ifdef TEST_MIME @@ -4506,7 +4497,6 @@ int main(int argc, char **argv) TestThreadSuspend(); TestThreadDelete(); TestThreadConditions(); - TestThreadExec(); TestSemaphore(); #endif #endif // TEST_THREADS