rewrote wxFileName::Normalize(), added a few methods, general clean up,

added some tests


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/filefn.h

@@ -252,6 +252,7 @@ WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
 #define wxFILE_SEP_DSK        wxT(':')
 #define wxFILE_SEP_PATH_DOS   wxT('\\')
 #define wxFILE_SEP_PATH_UNIX  wxT('/')
+#define wxFILE_SEP_PATH_MAC   wxT(':')
 
 // separator in the path list (as in PATH environment variable)
 // NB: these are strings and not characters on purpose!
@@ -262,6 +263,8 @@ WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
 #ifdef  __UNIX__
   #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_UNIX
   #define wxPATH_SEP          wxPATH_SEP_UNIX
+#elif defined(__MAC__)
+  #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_MAC
 #else   // Windows and OS/2
   #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_DOS
   #define wxPATH_SEP          wxPATH_SEP_DOS

include/wx/filename.h

@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/filename.h
 // Purpose:     wxFileName - encapsulates a file path
-// Author:      Robert Roebling
+// Author:      Robert Roebling, Vadim Zeitlin
 // Modified by:
 // Created:     28.12.00
 // RCS-ID:      $Id$
@@ -32,7 +32,7 @@
 // Windows)
 enum wxPathFormat
 {
-    wxPATH_NATIVE = 0,
+    wxPATH_NATIVE = 0,      // the path format for the current platform
     wxPATH_UNIX,
     wxPATH_MAC,
     wxPATH_DOS,
@@ -47,9 +47,11 @@ enum wxPathFormat
 enum wxPathNormalize
 {
     wxPATH_NORM_ENV_VARS = 0x0001,  // replace env vars with their values
-    wxPATH_NORM_ABSOLUTE = 0x0002,  // squeeze all .. and . and prepend cwd
+    wxPATH_NORM_DOTS     = 0x0002,  // squeeze all .. and . and prepend cwd
     wxPATH_NORM_TILDE    = 0x0004,  // Unix only: replace ~ and ~user
-    wxPATH_NORM_ALL      = 0x0007
+    wxPATH_NORM_CASE     = 0x0008,  // if case insensitive => tolower
+    wxPATH_NORM_ABSOLUTE = 0x0010,  // make the path absolute
+    wxPATH_NORM_ALL      = 0x001f
 };
 
 // ----------------------------------------------------------------------------
@@ -60,48 +62,136 @@ class WXDLLEXPORT wxFileName
 {
 public:
     // constructors and assignment
-    wxFileName()
-        { }
-    wxFileName( const wxFileName &filepath );
-    wxFileName( const wxString &path, bool dir_only = FALSE, wxPathFormat format = wxPATH_NATIVE )
-        { Assign( path, dir_only, format ); }
-    void Assign( const wxString &path, bool dir_only = FALSE, wxPathFormat format = wxPATH_NATIVE );
-    void Assign( const wxFileName &filepath );
 
-    // Only native form
+        // the usual stuff
+    wxFileName() { }
+    wxFileName( const wxFileName &filepath ) { Assign(filepath); }
+
+        // from a full filename: if it terminates with a '/', a directory path
+        // is contructed (the name will be empty), otherwise a file name and
+        // extension are extracted from it
+    wxFileName( const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE )
+        { Assign( fullpath, format ); }
+
+        // from a directory name and a file name
+    wxFileName(const wxString& path,
+               const wxString& name,
+               wxPathFormat format = wxPATH_NATIVE)
+        { Assign(path, name, format); }
+
+        // from a directory name, file base name and extension
+    wxFileName(const wxString& path,
+               const wxString& name,
+               const wxString& ext,
+               wxPathFormat format = wxPATH_NATIVE)
+        { Assign(path, name, ext, format); }
+
+        // assorted assignment operators
+
+    wxFileName& operator=(const wxFileName& filename)
+        { Assign(filename); return *this; }
+
+    wxFileName& operator=(const wxString& filename)
+        { Assign(filename); return *this; }
+
+        // the same for delayed initialization
+
+        // VZ: wouldn't it be better to call this Create() for consistency with
+        //     all GUI classes? Personally, I like Set() more than Assign() too
+
+    void Assign(const wxFileName& filepath);
+    void Assign(const wxString& fullpath,
+                wxPathFormat format = wxPATH_NATIVE);
+    void Assign(const wxString& path,
+                const wxString& name,
+                wxPathFormat format = wxPATH_NATIVE);
+    void Assign(const wxString& path,
+                const wxString& name,
+                const wxString& ext,
+                wxPathFormat format = wxPATH_NATIVE);
+    void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE)
+        { Assign(dir, _T(""), format); }
+
+        // reset all components to default, uninitialized state
+    void Clear();
+
+        // static pseudo constructors
+    static wxFileName FileName(const wxString& file);
+    static wxFileName DirName(const wxString& dir);
+
+    // test for existence
+
+        // is the filename valid at all?
+    bool IsOk() const { return !m_dirs.IsEmpty() || !m_name.IsEmpty(); }
+
+        // does the file with this name exists?
     bool FileExists();
     static bool FileExists( const wxString &file );
 
+        // does the directory with this name exists?
     bool DirExists();
     static bool DirExists( const wxString &dir );
 
+        // VZ: also need: IsDirWritable(), IsFileExecutable() &c (TODO)
+
+    // various file/dir operations
+
+        // retrieve the value of the current working directory
     void AssignCwd();
     static wxString GetCwd();
 
+        // change the current working directory
     bool SetCwd();
     static bool SetCwd( const wxString &cwd );
 
+        // get the value of user home (Unix only mainly)
     void AssignHomeDir();
     static wxString GetHomeDir();
 
+        // get a temp file name starting with thespecified prefix
     void AssignTempFileName( const wxString &prefix );
 
+    // directory creation and removal
     bool Mkdir( int perm = 0777 );
     static bool Mkdir( const wxString &dir, int perm = 0777 );
 
     bool Rmdir();
     static bool Rmdir( const wxString &dir );
 
-    // Remove . and .. (under Unix ~ as well)
+    // operations on the path
-    bool Normalize( const wxString &cwd = wxEmptyString, const wxString &home = wxEmptyString );
+
+        // normalize the path: with the default flags value, the path will be
+        // made absolute, without any ".." and "." and all environment
+        // variables will be expanded in it
+        //
+        // this may be done using another (than current) value of cwd
+    bool Normalize(wxPathNormalize flags = wxPATH_NORM_ALL,
+                   const wxString& cwd = wxEmptyString,
+                   wxPathFormat format = wxPATH_NATIVE);
 
     // Comparison
-    bool SameAs( const wxFileName &filepath, bool upper_case = TRUE );
+
+        // uses the current platform settings
+    bool operator==(const wxFileName& filename) { return SameAs(filename); }
+    bool operator==(const wxString& filename)
+        { return *this == wxFileName(filename); }
+
+        // compares with the rules of this platform
+    bool SameAs(const wxFileName &filepath,
+                wxPathFormat format = wxPATH_NATIVE);
 
     // Tests
-    bool IsCaseSensitive( wxPathFormat format = wxPATH_NATIVE );
+    static bool IsCaseSensitive( wxPathFormat format = wxPATH_NATIVE );
     bool IsRelative( wxPathFormat format = wxPATH_NATIVE );
     bool IsAbsolute( wxPathFormat format = wxPATH_NATIVE );
+
+    // get the string of path separators for this format
+    static wxString GetPathSeparators(wxPathFormat format = wxPATH_NATIVE);
+
+    // is the char a path separator for this format?
+    static bool IsPathSeparator(wxChar ch, wxPathFormat format = wxPATH_NATIVE);
+
+    // FIXME: what exactly does this do?
     bool IsWild( wxPathFormat format = wxPATH_NATIVE );
 
     // Dir accessors
@@ -120,25 +210,29 @@ public:
     wxString GetName() const                    { return m_name; }
     bool HasName() const                        { return !m_name.IsEmpty(); }
 
-    // name and ext
+    wxString GetFullName() const;
-    void SetFullName( const wxString name, wxPathFormat format = wxPATH_NATIVE );
-    wxString GetFullName();
 
     const wxArrayString &GetDirs() const        { return m_dirs; }
 
-    // Construct path only
+    // Construct path only - possibly with the trailing separator
     wxString GetPath( bool add_separator = FALSE, wxPathFormat format = wxPATH_NATIVE ) const;
 
+    // more readable synonym
+    wxString GetPathWithSep(wxPathFormat format = wxPATH_NATIVE ) const
+        { return GetPath(TRUE /* add separator */, format); }
+
     // Construct full path with name and ext
     wxString GetFullPath( wxPathFormat format = wxPATH_NATIVE ) const;
 
-
     static wxPathFormat GetFormat( wxPathFormat format = wxPATH_NATIVE );
 
 private:
+    // the path components of the file
     wxArrayString   m_dirs;
-    wxString        m_name;
+
-    wxString        m_ext;
+    // the file name and extension (empty for directories)
+    wxString        m_name,
+                    m_ext;
 };
 
 #endif // _WX_FILENAME_H_

samples/console/console.cpp

@@ -42,8 +42,9 @@
 //#define TEST_DLLLOADER
 //#define TEST_ENVIRON
 //#define TEST_EXECUTE
-#define TEST_FILE
+//#define TEST_FILE
 //#define TEST_FILECONF
+#define TEST_FILENAME
 //#define TEST_FTP
 //#define TEST_HASH
 //#define TEST_LIST
@@ -587,6 +588,61 @@ static void TestFileConfRead()
 
 #endif // TEST_FILECONF
 
+// ----------------------------------------------------------------------------
+// wxFileName
+// ----------------------------------------------------------------------------
+
+#ifdef TEST_FILENAME
+
+#include <wx/filename.h>
+
+static void TestFileNameConstruction()
+{
+    puts("*** testing wxFileName construction ***");
+
+    static const wxChar *filenames[] =
+    {
+        _T("/usr/bin/ls"),
+        _T("/usr/bin/"),
+        _T("~/.zshrc"),
+        _T("../../foo"),
+    };
+
+    for ( size_t n = 0; n < WXSIZEOF(filenames); n++ )
+    {
+        wxFileName fn(filenames[n]);
+
+        printf("Filename: '%s'\t", fn.GetFullPath().c_str());
+        if ( !fn.Normalize() )
+        {
+            puts("ERROR (couldn't be normalized)");
+        }
+        else
+        {
+            printf("normalized: '%s'\n", fn.GetFullPath().c_str());
+        }
+    }
+
+    puts("");
+}
+
+static void TestFileNameComparison()
+{
+    // TODO!
+}
+
+static void TestFileNameOperations()
+{
+    // TODO!
+}
+
+static void TestFileNameCwd()
+{
+    // TODO!
+}
+
+#endif // TEST_FILENAME
+
 // ----------------------------------------------------------------------------
 // wxHashTable
 // ----------------------------------------------------------------------------
@@ -3906,6 +3962,10 @@ int main(int argc, char **argv)
     TestFileCopy();
 #endif // TEST_FILE
 
+#ifdef TEST_FILENAME
+    TestFileNameConstruction();
+#endif // TEST_FILENAME
+
 #ifdef TEST_THREADS
     int nCPUs = wxThread::GetCPUCount();
     printf("This system has %d CPUs\n", nCPUs);

src/common/filefn.cpp

@@ -988,7 +988,6 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil
 
   fclose (fp3);
   bool result = wxRenameFile(outfile, file3);
-  delete outfile;
   return result;
 }
 

src/common/filename.cpp

@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/common/filename.cpp
 // Purpose:     wxFileName - encapsulates a file path
-// Author:      Robert Roebling
+// Author:      Robert Roebling, Vadim Zeitlin
 // Modified by:
 // Created:     28.12.2000
 // RCS-ID:      $Id$
@@ -35,117 +35,100 @@
 
 #include "wx/filename.h"
 #include "wx/tokenzr.h"
+#include "wx/config.h"          // for wxExpandEnvVars
 #include "wx/utils.h"
 
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// the character separating the extension from the base name
+#define EXT_SEP _T('.')
+
 // ============================================================================
 // implementation
 // ============================================================================
 
 // ----------------------------------------------------------------------------
-// wxFileName
+// wxFileName construction
 // ----------------------------------------------------------------------------
 
-wxFileName::wxFileName( const wxFileName &filepath )
-{
-    m_ext = filepath.GetExt();
-    m_name = filepath.GetName();
-    const wxArrayString &dirs = filepath.GetDirs();
-    for (size_t i = 0; i < dirs.GetCount(); i++)
-        m_dirs.Add( dirs[i] );
-}
-
 void wxFileName::Assign( const wxFileName &filepath )
 {
-    m_dirs.Clear();
     m_ext = filepath.GetExt();
     m_name = filepath.GetName();
-    const wxArrayString &dirs = filepath.GetDirs();
+    m_dirs = filepath.GetDirs();
-    for (size_t i = 0; i < dirs.GetCount(); i++)
-        m_dirs.Add( dirs[i] );
 }
 
-void wxFileName::Assign( const wxString &path, bool dir_only, wxPathFormat format )
+void wxFileName::Assign( const wxString& path,
+                         const wxString& name,
+                         const wxString& ext,
+                         wxPathFormat format )
 {
-    m_ext = wxEmptyString;
+    wxStringTokenizer tn(path, GetPathSeparators(format),
-    m_name = wxEmptyString;
+                         wxTOKEN_RET_EMPTY_ALL);
-    m_dirs.Clear();
-
-    format = GetFormat( format );
-
-    wxString seps;
-    if (format == wxPATH_DOS)
-    {
-        seps = _T("/\\");
-    }
-    else
-    if (format == wxPATH_UNIX)
-    {
-        seps = _T("/");
-    }
-    else
-    {
-        seps = _T(":");
-    }
-    
-    wxStringTokenizer tn( path, seps, wxTOKEN_RET_EMPTY_ALL );
     bool first = TRUE;
-    while (tn.HasMoreTokens())
+    m_dirs.Clear();
+    while ( tn.HasMoreTokens() )
     {
-        wxString token( tn.GetNextToken() );
+        wxString token = tn.GetNextToken();
-        
+
         // If the path starts with a slash, we need the first
         // dir entry to be an empty for later reassembly.
-        
         if (first || !token.IsEmpty())
             m_dirs.Add( token );
+
         first = FALSE;
     }
-    
+
-    if (!dir_only)
+    m_ext = ext;
-    {
+    m_name = name;
-        // make last m_dir -> m_name 
-        size_t last = m_dirs.GetCount();
-        if (last == 0) return;
-        last--;
-        m_name = m_dirs[last];
-        m_dirs.Remove( last );
-        
-        if (m_name == wxT(".")) return;
-        if (m_name == wxT("..")) return;
-        
-        // ext?
-        int pos = m_name.Find( wxT('.') );
-        if (pos == -1) return;
-        
-        bool has_starting_dot = (pos == 0);
-        if (has_starting_dot && (format == wxPATH_UNIX))
-        {
-            // remove dot
-            m_name.Remove(0,1);  
-            
-            // search again
-            pos = m_name.Find( wxT('.') );
-            if (pos == -1)
-            {
-                // add dot back
-                m_name.Prepend( _T(".") );
-                return;
-            }
-        }
-        m_ext = m_name;
-        m_ext.Remove( 0, pos+1 );
-        
-        m_name.Remove( pos, m_name.Len()-pos );
-        
-        if (has_starting_dot && (format == wxPATH_UNIX))
-        {
-            // add dot back
-            m_name.Prepend( _T(".") );
-            return;
-        }
-    }
 }
 
+void wxFileName::Assign(const wxString& fullpath,
+                        wxPathFormat format)
+{
+    wxString path, name, ext;
+    wxSplitPath(fullpath, &path, &name, &ext);
+
+    Assign(path, name, ext, format);
+}
+
+void wxFileName::Assign(const wxString& path,
+                        const wxString& fullname,
+                        wxPathFormat format)
+{
+    wxString name, ext;
+    wxSplitPath(fullname, NULL /* no path */, &name, &ext);
+
+    Assign(path, name, ext, format);
+}
+
+void wxFileName::Clear()
+{
+    m_dirs.Clear();
+    m_name =
+    m_ext = wxEmptyString;
+}
+
+/* static */
+wxFileName wxFileName::FileName(const wxString& file)
+{
+    return wxFileName(file);
+}
+
+/* static */
+wxFileName wxFileName::DirName(const wxString& dir)
+{
+    wxFileName fn;
+    fn.AssignDir(dir);
+    return fn;
+}
+
+// ----------------------------------------------------------------------------
+// existence tests
+// ----------------------------------------------------------------------------
+
 bool wxFileName::FileExists()
 {
     return wxFileName::FileExists( GetFullPath() );
@@ -166,11 +149,16 @@ bool wxFileName::DirExists( const wxString &dir )
     return ::wxDirExists( dir );
 }
 
+// ----------------------------------------------------------------------------
+// CWD and HOME stuff
+// ----------------------------------------------------------------------------
+
 void wxFileName::AssignCwd()
 {
-    Assign( wxFileName::GetCwd(), TRUE );
+    AssignDir(wxFileName::GetCwd());
 }
 
+/* static */
 wxString wxFileName::GetCwd()
 {
     return ::wxGetCwd();
@@ -188,18 +176,31 @@ bool wxFileName::SetCwd( const wxString &cwd )
 
 void wxFileName::AssignHomeDir()
 {
-    Assign( wxFileName::GetHomeDir(), TRUE );
+    AssignDir(wxFileName::GetHomeDir());
 }
-    
+
 wxString wxFileName::GetHomeDir()
 {
     return ::wxGetHomeDir();
 }
-    
+
 void wxFileName::AssignTempFileName( const wxString &prefix )
 {
+    wxString fullname;
+    if ( wxGetTempFileName(prefix, fullname) )
+    {
+        Assign(fullname);
+    }
+    else // error
+    {
+        Clear();
+    }
 }
 
+// ----------------------------------------------------------------------------
+// directory operations
+// ----------------------------------------------------------------------------
+
 bool wxFileName::Mkdir( int perm )
 {
     return wxFileName::Mkdir( GetFullPath(), perm );
@@ -220,123 +221,200 @@ bool wxFileName::Rmdir( const wxString &dir )
     return ::wxRmdir( dir );
 }
 
-bool wxFileName::Normalize( const wxString &cwd, const wxString &home )
+// ----------------------------------------------------------------------------
+// path normalization
+// ----------------------------------------------------------------------------
+
+bool wxFileName::Normalize(wxPathNormalize flags,
+                           const wxString& cwd,
+                           wxPathFormat format)
 {
-    wxFileName tmp( *this );
+    // the existing path components
-    m_dirs.Clear();
+    wxArrayString dirs = GetDirs();
-    const wxArrayString &dirs = tmp.GetDirs();
+
-    
+    // the path to prepend in front to make the path absolute
-    if (dirs.GetCount() == 0) return FALSE;
+    wxFileName curDir;
-    
+
-    size_t start = 0;
+    format = GetFormat(format);
-    
+
-    if (dirs[0] == wxT("."))
+    // make the path absolute
+    if ( (flags & wxPATH_NORM_ABSOLUTE) && !IsAbsolute() )
     {
-        if (cwd == wxEmptyString)
+        if ( cwd.empty() )
-            Assign( wxFileName::GetCwd(), TRUE );
+            curDir.AssignCwd();
         else
-            Assign( cwd );
+            curDir.AssignDir(cwd);
-        start = 1;
     }
-    else
+
-    if (dirs[0] == wxT(".."))
+    // handle ~ stuff under Unix only
+    if ( (format == wxPATH_UNIX) && (flags & wxPATH_NORM_TILDE) )
     {
-        if (cwd == wxEmptyString)
+        if ( !dirs.IsEmpty() )
-            Assign( wxFileName::GetCwd(), TRUE );
-        else
-            Assign( cwd );
-        m_dirs.Remove( m_dirs.GetCount()-1 );
-        start = 1;
-    }
-    else
-    if (dirs[0] == wxT("~"))
-    {
-        if (home == wxEmptyString)
-            Assign( wxFileName::GetHomeDir(), TRUE );
-        else
-            Assign( home );
-        start = 1;
-    }
-    
-    for (size_t i = start; i < dirs.GetCount(); i++)
-    {
-        if (dirs[i] == wxT(".")) continue;
-        
-        if (dirs[i] == wxT(".."))
         {
-            m_dirs.Remove( m_dirs.GetCount()-1 );
+            wxString dir = dirs[0u];
-            continue;
+            if ( !dir.empty() && dir[0u] == _T('~') )
+            {
+                curDir.AssignDir(wxGetUserHome(dir.c_str() + 1));
+
+                dirs.Remove(0u);
+            }
         }
-        
-        // expand env vars here ?
-        
-        m_dirs.Add( dirs[i] );
     }
-    
+
-    m_name = tmp.GetName();
+    if ( curDir.IsOk() )
-    m_ext = tmp.GetExt();
+    {
-    
+        wxArrayString dirsNew = curDir.GetDirs();
+        size_t count = dirs.GetCount();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            dirsNew.Add(dirs[n]);
+        }
+
+        dirs = dirsNew;
+    }
+
+    // now deal with ".", ".." and the rest
+    m_dirs.Empty();
+    size_t count = dirs.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        wxString dir = dirs[n];
+
+        if ( flags && wxPATH_NORM_DOTS )
+        {
+            if ( dir == wxT(".") )
+            {
+                // just ignore
+                continue;
+            }
+
+            if ( dir == wxT("..") )
+            {
+                if ( m_dirs.IsEmpty() )
+                {
+                    wxLogError(_("The path '%s' contains too many \"..\"!"),
+                               GetFullPath().c_str());
+                    return FALSE;
+                }
+
+                m_dirs.Remove(m_dirs.GetCount() - 1);
+                continue;
+            }
+        }
+
+        if ( flags & wxPATH_NORM_ENV_VARS )
+        {
+            dir = wxExpandEnvVars(dir);
+        }
+
+        if ( (flags & wxPATH_NORM_CASE) && !IsCaseSensitive(format) )
+        {
+            dir.MakeLower();
+        }
+
+        m_dirs.Add(dir);
+    }
+
+    if ( (flags & wxPATH_NORM_CASE) && !IsCaseSensitive(format) )
+    {
+        // VZ: expand env vars here too?
+
+        m_name.MakeLower();
+        m_ext.MakeLower();
+    }
+
     return TRUE;
 }
 
-bool wxFileName::SameAs( const wxFileName &filepath, bool upper_case )
+// ----------------------------------------------------------------------------
+// filename kind tests
+// ----------------------------------------------------------------------------
+
+bool wxFileName::SameAs( const wxFileName &filepath, wxPathFormat format)
 {
-    wxString file1( GetFullPath() );
+    wxFileName fn1 = *this,
-    wxString file2( filepath.GetFullPath() );
+               fn2 = filepath;
-   
+
-    if (upper_case)
+    // get cwd only once - small time saving
-    {
+    wxString cwd = wxGetCwd();
-        file1.MakeUpper();  // what does MSW do to non-ascii chars etc? native funcs?
+    fn1.Normalize(wxPATH_NORM_ALL, cwd, format);
-        file2.MakeUpper();
+    fn2.Normalize(wxPATH_NORM_ALL, cwd, format);
-    }
+
-   
+    if ( fn1.GetFullPath() == fn2.GetFullPath() )
-    return (file1 == file2);
+        return TRUE;
+
+    // TODO: compare inodes for Unix, this works even when filenames are
+    //       different but files are the same (symlinks) (VZ)
+
+    return FALSE;
 }
 
+/* static */
 bool wxFileName::IsCaseSensitive( wxPathFormat format )
 {
-    format = GetFormat( format );
+    // only DOS filenames are case-sensitive
-    
+    return GetFormat(format) != wxPATH_DOS;
-    return (format != wxPATH_DOS);
 }
 
 bool wxFileName::IsRelative( wxPathFormat format )
 {
-    format = GetFormat( format );
+    return !IsAbsolute(format);
-    
-    for (size_t i = 0; i < m_dirs.GetCount(); i++)
-    {
-        if ((format == wxPATH_UNIX) && (i == 0) && (m_dirs[0] == wxT("~"))) return TRUE;
-    
-        if (m_dirs[i] == wxT(".")) return TRUE;
-        if (m_dirs[i] == wxT("..")) return TRUE;
-    }
-
-    return FALSE;
 }
 
 bool wxFileName::IsAbsolute( wxPathFormat format )
 {
-    return (!IsRelative(format));
+    wxChar ch = m_dirs.IsEmpty() ? _T('\0') : m_dirs[0u][0u];
+
+    // the path is absolute if it starts with a path separator or, only for
+    // Unix filenames, with "~" or "~user"
+    return IsPathSeparator(ch, format) ||
+           (GetFormat(format) == wxPATH_UNIX && ch == _T('~') );
+}
+
+/* static */
+wxString wxFileName::GetPathSeparators(wxPathFormat format)
+{
+    wxString seps;
+    switch ( GetFormat(format) )
+    {
+        case wxPATH_DOS:
+            // accept both as native APIs do
+            seps = _T("/\\");
+            break;
+
+        default:
+            wxFAIL_MSG( _T("unknown wxPATH_XXX style") );
+            // fall through
+
+        case wxPATH_UNIX:
+            seps = _T("/");
+            break;
+
+        case wxPATH_MAC:
+            seps = _T(":");
+            break;
+    }
+
+    return seps;
+}
+
+/* static */
+bool wxFileName::IsPathSeparator(wxChar ch, wxPathFormat format)
+{
+    return GetPathSeparators(format).Find(ch) != wxNOT_FOUND;
 }
 
 bool wxFileName::IsWild( wxPathFormat format )
 {
-    format = GetFormat( format );
+    // FIXME: this is probably false for Mac and this is surely wrong for most
-    
+    //        of Unix shells (think about "[...]")
-    if (format == wxPATH_DOS)
+    return m_name.find_first_of(_T("*?")) != wxString::npos;
-    {
-       if (m_name.Find( wxT('*') ) != -1) return TRUE;
-       if (m_name.Find( wxT('?') ) != -1) return TRUE;
-    }
-    else
-    {
-       if (m_name.Find( wxT('*') ) != -1) return TRUE;
-    }
-    
-    return FALSE;
 }
 
+// ----------------------------------------------------------------------------
+// path components manipulation
+// ----------------------------------------------------------------------------
+
 void wxFileName::AppendDir( const wxString &dir )
 {
     m_dirs.Add( dir );
@@ -357,137 +435,40 @@ void wxFileName::RemoveDir( int pos )
     m_dirs.Remove( (size_t)pos );
 }
 
-void wxFileName::SetFullName( const wxString name, wxPathFormat format )
+// ----------------------------------------------------------------------------
-{
+// accessors
-    format = GetFormat( format );
+// ----------------------------------------------------------------------------
-    
-    m_name = name;
-    m_ext = wxEmptyString;
-    
-    if (m_name == wxT(".")) return;
-    if (m_name == wxT("..")) return;
-        
-    // ext?
-    int pos = m_name.Find( wxT('.') );
-    if (pos == -1) return;
-        
-    bool has_starting_dot = (pos == 0);
-    if (has_starting_dot && (format == wxPATH_UNIX))
-    {
-            // remove dot
-            m_name.Remove(0,1);  
-            
-            // search again
-            pos = m_name.Find( wxT('.') );
-            if (pos == -1)
-            {
-                // add dot back
-                m_name.Prepend( _T(".") );
-                return;
-            }
-    }
-    
-    m_ext = m_name;
-    m_ext.Remove( 0, pos+1 );
-        
-    m_name.Remove( pos, m_name.Len()-pos );
-       
-    if (has_starting_dot && (format == wxPATH_UNIX))
-    {
-            // add dot back
-            m_name.Prepend( _T(".") );
-            return;
-    }
-}
 
-wxString wxFileName::GetFullName()
+wxString wxFileName::GetFullName() const
 {
-    wxString ret( m_name );
+    wxString fullname = m_name;
-    if (!m_ext.IsEmpty())
+    if ( !m_ext.empty() )
-    { 
+    {
-        ret += '.';
+        fullname << EXT_SEP << m_ext;
-        ret += m_ext;
     }
-    return ret;
+
+    return fullname;
 }
 
 wxString wxFileName::GetPath( bool add_separator, wxPathFormat format ) const
 {
     format = GetFormat( format );
-    
+
     wxString ret;
-    if (format == wxPATH_DOS)
+    size_t count = m_dirs.GetCount();
+    for ( size_t i = 0; i < count; i++ )
     {
-        for (size_t i = 0; i < m_dirs.GetCount(); i++)
+        ret += m_dirs[i];
-        {
+        if ( add_separator || (i < count) )
-            ret += m_dirs[i];
+            ret += wxFILE_SEP_PATH;
-            if (add_separator || (i != m_dirs.GetCount()-1))
-                ret += '\\';
-        }
     }
-    else
+
-    if (format == wxPATH_UNIX)
-    {
-        for (size_t i = 0; i < m_dirs.GetCount(); i++)
-        {
-            ret += m_dirs[i];
-            if (add_separator || (i != m_dirs.GetCount()-1))
-                ret += '/';
-        }
-    }
-    else
-    {
-        for (size_t i = 0; i < m_dirs.GetCount(); i++)
-        {
-            ret += m_dirs[i];
-            if (add_separator || (i != m_dirs.GetCount()-1))
-                ret += _T(":");
-        }
-    }
-    
     return ret;
 }
 
 wxString wxFileName::GetFullPath( wxPathFormat format ) const
 {
-    format = GetFormat( format );
+    return GetPathWithSep() + GetFullName();
-    
-    wxString ret;
-    if (format == wxPATH_DOS)
-    {
-        for (size_t i = 0; i < m_dirs.GetCount(); i++)
-        {
-            ret += m_dirs[i];
-            ret += '\\';
-        }
-    }
-    else
-    if (format == wxPATH_UNIX)
-    {
-        for (size_t i = 0; i < m_dirs.GetCount(); i++)
-        {
-            ret += m_dirs[i];
-            ret += '/';
-        }
-    }
-    else
-    {
-        for (size_t i = 0; i < m_dirs.GetCount(); i++)
-        {
-            ret += m_dirs[i];
-            ret += ':';
-        }
-    }
-    
-    ret += m_name;
-    
-    if (!m_ext.IsEmpty())
-    {
-        ret += '.';
-        ret += m_ext;
-    }
-    
-    return ret;
 }
 
 wxPathFormat wxFileName::GetFormat( wxPathFormat format )
@@ -496,11 +477,9 @@ wxPathFormat wxFileName::GetFormat( wxPathFormat format )
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         format = wxPATH_DOS;
-#endif
+#elif defined(__WXMAC__)
-#if defined(__WXMAC__)
         format = wxPATH_MAC;
-#endif
+#else
-#if !defined(__WXMSW__) && !defined(__WXPM__) && !defined(__WXMAC__)
         format = wxPATH_UNIX;
 #endif
     }