fixed gcc warnings and reformatted some pieces of code to be a bit readable

[wxWidgets.git] / include / wx / protocol / ftp.h

diff --git a/include/wx/protocol/ftp.h b/include/wx/protocol/ftp.h
index 0e7e59531552006af509d11840e7e91ec5327a62..4fee213c9ac6461df4265d2a143700ed8657aa57 100644 (file)
--- a/include/wx/protocol/ftp.h
+++ b/include/wx/protocol/ftp.h
@@ -2,80 +2,163 @@
 // Name:        ftp.h
 // Purpose:     FTP protocol
 // Author:      Vadim Zeitlin
 // Name:        ftp.h
 // Purpose:     FTP protocol
 // Author:      Vadim Zeitlin

-// Modified by:
+// Modified by: Mark Johnson, wxWindows@mj10777.de 
+//              20000917 : RmDir, GetLastResult, GetList 

 // Created:     07/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Created:     07/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_FTP_H__
 #define __WX_FTP_H__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_FTP_H__
 #define __WX_FTP_H__
 

-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "ftp.h"

 #endif
 
 #endif
 

-#include "wx/object.h"
+#include "wx/defs.h"
+
+#if wxUSE_PROTOCOL_FTP
+

 #include "wx/sckaddr.h"
 #include "wx/protocol/protocol.h"
 #include "wx/url.h"
 
 #include "wx/sckaddr.h"
 #include "wx/protocol/protocol.h"
 #include "wx/url.h"
 

-class WXDLLEXPORT wxFTP : public wxProtocol
+class WXDLLIMPEXP_NET wxFTP : public wxProtocol

 {
 public:
 {
 public:

-  typedef enum { ASCII, BINARY } wxFTPmode;
+    enum TransferMode
+    {
+        NONE,       // not set by user explicitly
+        ASCII,
+        BINARY
+    };
+
+    wxFTP();
+    virtual ~wxFTP();
+
+    // Connecting and disconnecting
+    void SetUser(const wxString& user) { m_user = user; }
+    void SetPassword(const wxString& passwd) { m_passwd = passwd; }
+
+    bool Connect(wxSockAddress& addr, bool wait = TRUE);
+    bool Connect(const wxString& host);
+
+    // disconnect
+    virtual bool Close();
+
+    // Parameters set up
+
+    // set transfer mode now
+    bool SetBinary() { return SetTransferMode(BINARY); }
+    bool SetAscii() { return SetTransferMode(ASCII); }
+    bool SetTransferMode(TransferMode mode);
+
+    // Generic FTP interface
+
+    // the error code
+    virtual wxProtocolError GetError() { return m_lastError; }
+
+    // the last FTP server reply
+    const wxString& GetLastResult() { return m_lastResult; }
+
+    // send any FTP command (should be full FTP command line but without
+    // trailing "\r\n") and return its return code
+    char SendCommand(const wxString& command);
+
+    // check that the command returned the given code
+    bool CheckCommand(const wxString& command, char expectedReturn)
+    {
+        return SendCommand(command) == expectedReturn;
+    }
+
+    // Filesystem commands
+    bool ChDir(const wxString& dir);
+    bool MkDir(const wxString& dir);
+    bool RmDir(const wxString& dir);
+    wxString Pwd();
+    bool Rename(const wxString& src, const wxString& dst);
+    bool RmFile(const wxString& path);
+
+    // Get the size of a file in the current dir.
+    // this function tries its best to deliver the size in bytes using BINARY
+    // (the SIZE command reports different sizes depending on whether 
+    // type is set to ASCII or BINARY)
+    // returns -1 if file is non-existant or size could not be found
+    int GetFileSize(const wxString& fileName);
+
+       // Check to see if a file exists in the current dir
+    bool FileExists(const wxString& fileName);
+
+    // Download methods
+    bool Abort();
+
+    virtual wxInputStream *GetInputStream(const wxString& path);
+    virtual wxOutputStream *GetOutputStream(const wxString& path);
+
+    // Directory listing
+
+    // get the list of full filenames, the format is fixed: one file name per
+    // line
+    bool GetFilesList(wxArrayString& files,
+                      const wxString& wildcard = wxEmptyString)
+    {
+        return GetList(files, wildcard, FALSE);
+    }
+
+    // get a directory list in server dependent format - this can be shown
+    // directly to the user
+    bool GetDirList(wxArrayString& files,
+                    const wxString& wildcard = wxEmptyString)
+    {
+        return GetList(files, wildcard, TRUE);
+    }
+
+    // equivalent to either GetFilesList() (default) or GetDirList()
+    bool GetList(wxArrayString& files,
+                 const wxString& wildcard = wxEmptyString,
+                 bool details = FALSE);

 
 

-  wxFTP();
-  virtual ~wxFTP();
+protected:
+    // this executes a simple ftp command with the given argument and returns
+    // TRUE if it its return code starts with '2'
+    bool DoSimpleCommand(const wxChar *command,
+                         const wxString& arg = wxEmptyString);

 
 

-  bool Connect(wxSockAddress& addr, bool wait = TRUE);
-  bool Connect(const wxString& host);
+    // get the server reply, return the first character of the reply code,
+    // '1'..'5' for normal FTP replies, 0 (*not* '0') if an error occured
+    char GetResult();

 
 

-  // close the connection
-  virtual bool Close();
+    // check that the result is equal to expected value
+    bool CheckResult(char ch) { return GetResult() == ch; }

 
 

-  void SetUser(const wxString& user) { m_user = user; }
-  void SetPassword(const wxString& passwd) { m_passwd = passwd; }
+    wxSocketClient *GetPort();

 
 

-  // Filesystem commands
-  bool ChDir(const wxString& dir);
-  bool MkDir(const wxString& dir);
-  bool RmDir(const wxString& dir);
-  wxString Pwd();
-  bool Rename(const wxString& src, const wxString& dst);
-  bool RmFile(const wxString& path);
+    wxString m_user,
+             m_passwd;

 
 

-  // Download methods
-  bool Abort();
-  wxInputStream *GetInputStream(const wxString& path);
-  wxOutputStream *GetOutputStream(const wxString& path);
+    wxString m_lastResult;
+    wxProtocolError m_lastError;

 
 

-  // List method
-  bool GetList(wxArrayString& files, const wxString& wildcard = wxEmptyString);
+    // true if there is an FTP transfer going on
+    bool m_streaming;

 
 

-  // Low-level methods
-  bool SendCommand(const wxString& command, char exp_ret);
-  virtual wxProtocolError GetError() { return m_lastError; }
-  const wxString& GetLastResult();             // Get the complete return 
+    // although this should be set to ASCII by default according to STD9,
+    // we will use BINARY transfer mode by default for backwards compatibility
+    TransferMode m_currentTransfermode;

 
 

-  // deprecated
-  wxList *GetList(const wxString& wildcard);
+    friend class wxInputFTPStream;
+    friend class wxOutputFTPStream;

 
 

-protected:
-  wxString m_user, m_passwd;
-  wxString m_lastResult;
-  wxProtocolError m_lastError;
-  bool m_streaming;
-
-  friend class wxInputFTPStream;
-  friend class wxOutputFTPStream;
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxFTP)
+    DECLARE_PROTOCOL(wxFTP)
+};

 
 

-  wxSocketClient *GetPort();
-  bool GetResult(char exp);
+// the trace mask used by assorted wxLogTrace() in ftp code, do
+// wxLog::AddTraceMask(FTP_TRACE_MASK) to see them in output
+#define FTP_TRACE_MASK _T("ftp")

 
 

-  DECLARE_DYNAMIC_CLASS(wxFTP)
-  DECLARE_PROTOCOL(wxFTP)
-};
+#endif // wxUSE_PROTOCOL_FTP

 
 #endif // __WX_FTP_H__
 
 #endif // __WX_FTP_H__