X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3cf545c76c1b72d420064bd1d21ebb43e28d75a7..6493aacaeb7b22b9fa35c559f7753e9fec0da71f:/src/common/filefn.cpp

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index d1d0efe243..3d1fa6c33e 100644
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -251,7 +251,7 @@ wxString wxPathList::FindValidPath (const wxString& file)
 
   for (wxStringList::compatibility_iterator node = GetFirst(); node; node = node->GetNext())
     {
-      const wxChar *path = node->GetData();
+      const wxString path(node->GetData());
       wxStrcpy (wxFileFunctionsBuffer, path);
       wxChar ch = wxFileFunctionsBuffer[wxStrlen(wxFileFunctionsBuffer)-1];
       if (ch != wxT('\\') && ch != wxT('/'))
@@ -1106,8 +1106,19 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
 }
 
 bool
-wxRenameFile (const wxString& file1, const wxString& file2)
+wxRenameFile(const wxString& file1, const wxString& file2, bool overwrite)
 {
+    if ( !overwrite && wxFileExists(file2) )
+    {
+        wxLogSysError
+        (
+            _("Failed to rename the file '%s' to '%s' because the destination file already exists."),
+            file1.c_str(), file2.c_str()
+        );
+
+        return false;
+    }
+
 #if !defined(__WXWINCE__) && !defined(__WXPALMOS__)
     // Normal system call
   if ( wxRename (file1, file2) == 0 )
@@ -1115,7 +1126,7 @@ wxRenameFile (const wxString& file1, const wxString& file2)
 #endif
 
   // Try to copy
-  if (wxCopyFile(file1, file2)) {
+  if (wxCopyFile(file1, file2, overwrite)) {
     wxRemoveFile(file1);
     return true;
   }
@@ -1623,44 +1634,11 @@ void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName,
 
 time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
 {
-#if defined(__WXPALMOS__)
-    return 0;
-#elif defined(__WXWINCE__)
-    FILETIME ftLastWrite;
-    AutoHANDLE hFile(::CreateFile(filename, GENERIC_READ, FILE_SHARE_READ,
-                                    NULL, 0, FILE_ATTRIBUTE_NORMAL, 0));
-
-    if ( !hFile.IsOk() )
-        return 0;
-
-    if ( !::GetFileTime(hFile, NULL, NULL, &ftLastWrite) )
-        return 0;
-
-    // sure we want to translate to local time here?
-    FILETIME ftLocal;
-    if ( !::FileTimeToLocalFileTime(&ftLastWrite, &ftLocal) )
-    {
-        wxLogLastError(_T("FileTimeToLocalFileTime"));
-    }
-
-    // FILETIME is a counted in 100-ns since 1601-01-01, convert it to
-    // number of seconds since 1970-01-01
-    ULARGE_INTEGER uli;
-    uli.LowPart = ftLocal.dwLowDateTime;
-    uli.HighPart = ftLocal.dwHighDateTime;
-
-    ULONGLONG ull = uli.QuadPart;
-    ull /= wxULL(10000000);     // number of 100ns intervals in 1s
-    ull -= wxULL(11644473600);  // 1970-01-01 - 1601-01-01 in seconds
+    wxDateTime mtime;
+    if ( !wxFileName(filename).GetTimes(NULL, &mtime, NULL) )
+        return (time_t)-1;
 
-    return wx_static_cast(time_t, ull);
-#else
-    wxStructStat buf;
-    if ( wxStat( filename, &buf) != 0 )
-        return 0;
-
-    return buf.st_mtime;
-#endif
+    return mtime.GetTicks();
 }
 
 
@@ -1802,6 +1780,7 @@ bool wxIsWild( const wxString& pattern )
 * Written By Douglas A. Lewis <dalewis@cs.Buffalo.EDU>
 *
 * The match procedure is public domain code (from ircII's reg.c)
+* but modified to suit our tastes (RN: No "%" syntax I guess)
 */
 
 bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
@@ -1815,11 +1794,8 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
     const wxChar *m = pat.c_str(),
     *n = text.c_str(),
     *ma = NULL,
-    *na = NULL,
-    *mp = NULL,
-    *np = NULL;
+    *na = NULL;
     int just = 0,
-    pcount = 0,
     acount = 0,
     count = 0;
 
@@ -1837,7 +1813,6 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
             ma = ++m;
             na = n;
             just = 1;
-            mp = NULL;
             acount = count;
         }
         else if (*m == wxT('?'))
@@ -1880,8 +1855,6 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
             if (*m == *n)
             {
                 m++;
-                if (*n == wxT(' '))
-                    mp = NULL;
                 count++;
                 n++;
             }
@@ -1898,19 +1871,6 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
                 */
                 if (!*n)
                     return false;
-                if (mp)
-                {
-                    m = mp;
-                    if (*np == wxT(' '))
-                    {
-                        mp = NULL;
-                        goto check_percent;
-                    }
-                    n = ++np;
-                    count = pcount;
-                }
-                else
-                check_percent:
 
                 if (ma)
                 {