X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/26eef30437813056c86e5c7516995ff05e65cae3..cc4d5638c66a409e421420ed7110917755a66788:/src/common/dircmn.cpp

diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp
index 02ebf4edf1..11856868f8 100644
--- a/src/common/dircmn.cpp
+++ b/src/common/dircmn.cpp
@@ -4,9 +4,8 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     19.05.01
-// RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -62,7 +61,7 @@ bool wxDir::HasFiles(const wxString& spec) const
 }
 
 // we have a (much) faster version for Unix
-#if (defined(__CYGWIN__) && defined(__WINDOWS__)) || !defined(__UNIX_LIKE__) || ( defined(__WXMAC__) && !wxOSX_USE_IPHONE) || defined(__EMX__) || defined(__WINE__)
+#if (defined(__CYGWIN__) && defined(__WINDOWS__)) || !defined(__UNIX_LIKE__) || defined(__EMX__) || defined(__WINE__)
 
 bool wxDir::HasSubDirs(const wxString& spec) const
 {
@@ -72,6 +71,28 @@ bool wxDir::HasSubDirs(const wxString& spec) const
 
 #endif // !Unix
 
+// ----------------------------------------------------------------------------
+// wxDir::GetNameWithSep()
+// ----------------------------------------------------------------------------
+
+wxString wxDir::GetNameWithSep() const
+{
+    // Note that for historical reasons (i.e. because GetName() was there
+    // first) we implement this one in terms of GetName() even though it might
+    // actually make more sense to reverse this logic.
+
+    wxString name = GetName();
+    if ( !name.empty() )
+    {
+        // Notice that even though GetName() isn't supposed to return the
+        // separator, it can still be present for the root directory name.
+        if ( name.Last() != wxFILE_SEP_PATH )
+            name += wxFILE_SEP_PATH;
+    }
+
+    return name;
+}
+
 // ----------------------------------------------------------------------------
 // wxDir::Traverse()
 // ----------------------------------------------------------------------------
@@ -81,20 +102,21 @@ size_t wxDir::Traverse(wxDirTraverser& sink,
                        int flags) const
 {
     wxCHECK_MSG( IsOpened(), (size_t)-1,
-                 _T("dir must be opened before traversing it") );
+                 wxT("dir must be opened before traversing it") );
 
     // the total number of files found
     size_t nFiles = 0;
 
     // the name of this dir with path delimiter at the end
-    wxString prefix = GetName();
-    prefix += wxFILE_SEP_PATH;
+    const wxString prefix = GetNameWithSep();
 
     // first, recurse into subdirs
     if ( flags & wxDIR_DIRS )
     {
         wxString dirname;
-        for ( bool cont = GetFirst(&dirname, wxEmptyString, wxDIR_DIRS | (flags & wxDIR_HIDDEN) );
+        for ( bool cont = GetFirst(&dirname, wxEmptyString,
+                                   (flags & ~(wxDIR_FILES | wxDIR_DOTDOT))
+                                   | wxDIR_DIRS);
               cont;
               cont = cont && GetNext(&dirname) )
         {
@@ -103,7 +125,7 @@ size_t wxDir::Traverse(wxDirTraverser& sink,
             switch ( sink.OnDir(fulldirname) )
             {
                 default:
-                    wxFAIL_MSG(_T("unexpected OnDir() return value") );
+                    wxFAIL_MSG(wxT("unexpected OnDir() return value") );
                     // fall through
 
                 case wxDIR_STOP:
@@ -131,7 +153,7 @@ size_t wxDir::Traverse(wxDirTraverser& sink,
                                 switch ( sink.OnOpenError(fulldirname) )
                                 {
                                     default:
-                                        wxFAIL_MSG(_T("unexpected OnOpenError() return value") );
+                                        wxFAIL_MSG(wxT("unexpected OnOpenError() return value") );
                                         // fall through
 
                                     case wxDIR_STOP:
@@ -180,7 +202,7 @@ size_t wxDir::Traverse(wxDirTraverser& sink,
                 break;
 
             wxASSERT_MSG( res == wxDIR_CONTINUE,
-                          _T("unexpected OnFile() return value") );
+                          wxT("unexpected OnFile() return value") );
 
             nFiles++;
 
@@ -214,7 +236,7 @@ public:
 private:
     wxArrayString& m_files;
 
-    DECLARE_NO_COPY_CLASS(wxDirTraverserSimple)
+    wxDECLARE_NO_COPY_CLASS(wxDirTraverserSimple);
 };
 
 /* static */
@@ -223,7 +245,7 @@ size_t wxDir::GetAllFiles(const wxString& dirname,
                           const wxString& filespec,
                           int flags)
 {
-    wxCHECK_MSG( files, (size_t)-1, _T("NULL pointer in wxDir::GetAllFiles") );
+    wxCHECK_MSG( files, (size_t)-1, wxT("NULL pointer in wxDir::GetAllFiles") );
 
     size_t nFiles = 0;
 
@@ -266,7 +288,7 @@ public:
 private:
     wxString m_file;
 
-    DECLARE_NO_COPY_CLASS(wxDirTraverserFindFirst)
+    wxDECLARE_NO_COPY_CLASS(wxDirTraverserFindFirst);
 };
 
 /* static */
@@ -300,11 +322,11 @@ public:
 
     virtual wxDirTraverseResult OnFile(const wxString& filename)
     {
-        wxULongLong sz = wxFileName::GetSize(filename);
-
         // wxFileName::GetSize won't use this class again as
         // we're passing it a file and not a directory;
         // thus we are sure to avoid an endless loop
+        wxULongLong sz = wxFileName::GetSize(filename);
+
         if (sz == wxInvalidSize)
         {
             // if the GetSize() failed (this can happen because e.g. a
@@ -327,7 +349,7 @@ public:
 
     wxULongLong GetTotalSize() const
         { return m_sz; }
-    wxArrayString &FilesSkipped()
+    const wxArrayString& GetSkippedFiles() const
         { return m_skippedFiles; }
 
 protected:
@@ -347,14 +369,36 @@ wxULongLong wxDir::GetTotalSize(const wxString &dirname, wxArrayString *filesSki
         return wxInvalidSize;
 
     wxDirTraverserSumSize traverser;
-    if (dir.Traverse(traverser) == (size_t)-1 ||
-        traverser.GetTotalSize() == 0)
+    if (dir.Traverse(traverser) == (size_t)-1 )
         return wxInvalidSize;
 
     if (filesSkipped)
-        *filesSkipped = traverser.FilesSkipped();
+        *filesSkipped = traverser.GetSkippedFiles();
 
     return traverser.GetTotalSize();
 }
 
 #endif // wxUSE_LONGLONG
+
+// ----------------------------------------------------------------------------
+// wxDir helpers
+// ----------------------------------------------------------------------------
+
+/* static */
+bool wxDir::Exists(const wxString& dir)
+{
+    return wxFileName::DirExists(dir);
+}
+
+/* static */
+bool wxDir::Make(const wxString &dir, int perm, int flags)
+{
+    return wxFileName::Mkdir(dir, perm, flags);
+}
+
+/* static */
+bool wxDir::Remove(const wxString &dir, int flags)
+{
+    return wxFileName::Rmdir(dir, flags);
+}
+