fixed bug with redoing the command when there was nothing to redo

[wxWidgets.git] / src / common / filename.cpp

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 9495f6f929b1ea4107c466226ab6d853c0ef7c93..38f20fee49fd8de3840fbf243ddf0d65607349b3 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -38,6 +38,118 @@
 #include "wx/config.h"          // for wxExpandEnvVars
 #include "wx/utils.h"
 
 #include "wx/config.h"          // for wxExpandEnvVars
 #include "wx/utils.h"
 

+#if wxUSE_DYNLIB_CLASS
+    #include "wx/dynlib.h"
+#endif
+
+// For GetShort/LongPathName
+#ifdef __WIN32__
+    #include <windows.h>
+
+    #include "wx/msw/winundef.h"
+#endif
+
+// utime() is POSIX so should normally be available on all Unices
+#ifdef __UNIX_LIKE__
+    #include <sys/types.h>
+    #include <utime.h>
+    #include <sys/stat.h>
+    #include <unistd.h>
+#endif
+
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+// small helper class which opens and closes the file - we use it just to get
+// a file handle for the given file name to pass it to some Win32 API function
+#ifdef __WIN32__
+
+class wxFileHandle
+{
+public:
+    wxFileHandle(const wxString& filename)
+    {
+        m_hFile = ::CreateFile
+                    (
+                     filename,          // name
+                     GENERIC_READ,      // access mask
+                     0,                 // no sharing
+                     NULL,              // no secutity attr
+                     OPEN_EXISTING,     // creation disposition
+                     0,                 // no flags
+                     NULL               // no template file
+                    );
+
+        if ( m_hFile == INVALID_HANDLE_VALUE )
+        {
+            wxLogSysError(_("Failed to open '%s' for reading"),
+                          filename.c_str());
+        }
+    }
+
+    ~wxFileHandle()
+    {
+        if ( m_hFile != INVALID_HANDLE_VALUE )
+        {
+            if ( !::CloseHandle(m_hFile) )
+            {
+                wxLogSysError(_("Failed to close file handle"));
+            }
+        }
+    }
+
+    // return TRUE only if the file could be opened successfully
+    bool IsOk() const { return m_hFile != INVALID_HANDLE_VALUE; }
+
+    // get the handle
+    operator HANDLE() const { return m_hFile; }
+
+private:
+    HANDLE m_hFile;
+};
+
+#endif // __WIN32__
+
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+#ifdef __WIN32__
+
+// convert between wxDateTime and FILETIME which is a 64-bit value representing
+// the number of 100-nanosecond intervals since January 1, 1601.
+
+// the number of milliseconds between the Unix Epoch (January 1, 1970) and the
+// FILETIME reference point (January 1, 1601)
+static const wxLongLong FILETIME_EPOCH_OFFSET = wxLongLong(0xa97, 0x30b66800);
+
+static void ConvertFileTimeToWx(wxDateTime *dt, const FILETIME &ft)
+{
+    wxLongLong ll(ft.dwHighDateTime, ft.dwLowDateTime);
+
+    // convert 100ns to ms
+    ll /= 10000;
+
+    // move it to our Epoch
+    ll -= FILETIME_EPOCH_OFFSET;
+
+    *dt = wxDateTime(ll);
+}
+
+static void ConvertWxToFileTime(FILETIME *ft, const wxDateTime& dt)
+{
+    // do the reverse of ConvertFileTimeToWx()
+    wxLongLong ll = dt.GetValue();
+    ll *= 10000;
+    ll += FILETIME_EPOCH_OFFSET;
+
+    ft->dwHighDateTime = ll.GetHi();
+    ft->dwLowDateTime = ll.GetLo();
+}
+
+#endif // __WIN32__
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -60,18 +172,18 @@ void wxFileName::Assign( const wxString& path,
 {
     wxStringTokenizer tn(path, GetPathSeparators(format),
                          wxTOKEN_RET_EMPTY_ALL);
 {
     wxStringTokenizer tn(path, GetPathSeparators(format),
                          wxTOKEN_RET_EMPTY_ALL);

-    bool first = TRUE;
+    int i = 0;

     m_dirs.Clear();
     while ( tn.HasMoreTokens() )
     {
         wxString token = tn.GetNextToken();
 
     m_dirs.Clear();
     while ( tn.HasMoreTokens() )
     {
         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())
+        // If the path starts with a slash (or two for a network path),
+        // we need the first dir entry to be an empty for later reassembly.
+        if ((i < 2) || !token.IsEmpty())

             m_dirs.Add( token );
 
             m_dirs.Add( token );
 

-        first = FALSE;
+        i ++;

     }
 
     m_ext = ext;
     }
 
     m_ext = ext;


@@ -194,14 +306,47 @@ void wxFileName::AssignTempFileName( const wxString &prefix )
 // directory operations
 // ----------------------------------------------------------------------------
 
 // directory operations
 // ----------------------------------------------------------------------------
 

-bool wxFileName::Mkdir( int perm )
+bool wxFileName::Mkdir( int perm, bool full )

 {
 {

-    return wxFileName::Mkdir( GetFullPath(), perm );
+    return wxFileName::Mkdir( GetFullPath(), perm, full );

 }
 
 }
 

-bool wxFileName::Mkdir( const wxString &dir, int perm )
+bool wxFileName::Mkdir( const wxString &dir, int perm, bool full )

 {
 {

-    return ::wxMkdir( dir, perm );
+    if (full)
+    {
+        wxFileName filename(dir);
+        wxArrayString dirs = filename.GetDirs();
+        dirs.Add(filename.GetName());
+
+        size_t count = dirs.GetCount();
+        size_t i;
+        wxString currPath;
+        int noErrors = 0;
+        for ( i = 0; i < count; i++ )
+        {
+            currPath += dirs[i];
+
+            if (currPath.Last() == wxT(':'))
+            {
+                // Can't create a root directory so continue to next dir
+                currPath += wxFILE_SEP_PATH;
+                continue;
+            }
+
+            if (!DirExists(currPath))
+                if (!wxMkdir(currPath, perm))
+                    noErrors ++;
+
+            if ( (i < (count-1)) )
+                currPath += wxFILE_SEP_PATH;
+        }
+
+        return (noErrors == 0);
+
+    }
+    else
+        return ::wxMkdir( dir, perm );

 }
 
 bool wxFileName::Rmdir()
 }
 
 bool wxFileName::Rmdir()


@@ -316,6 +461,13 @@ bool wxFileName::Normalize(wxPathNormalize flags,
         m_ext.MakeLower();
     }
 
         m_ext.MakeLower();
     }
 

+#if defined(__WXMSW__) && defined(__WIN32__)
+    if (flags & wxPATH_NORM_LONG)
+    {
+        Assign(GetLongPath());
+    }
+#endif
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -358,9 +510,15 @@ bool wxFileName::IsAbsolute( wxPathFormat format )
 {
     wxChar ch = m_dirs.IsEmpty() ? _T('\0') : m_dirs[0u][0u];
 
 {
     wxChar ch = m_dirs.IsEmpty() ? _T('\0') : m_dirs[0u][0u];
 

+    // Hack to cope with e.g. c:\thing - need something better
+    wxChar driveSep = _T('\0');
+    if (!m_dirs.IsEmpty() && m_dirs[0].Length() > 1)
+        driveSep = m_dirs[0u][1u];
+

     // the path is absolute if it starts with a path separator or, only for
     // Unix filenames, with "~" or "~user"
     return IsPathSeparator(ch, format) ||
     // the path is absolute if it starts with a path separator or, only for
     // Unix filenames, with "~" or "~user"
     return IsPathSeparator(ch, format) ||

+           driveSep == _T(':') ||

            (GetFormat(format) == wxPATH_UNIX && ch == _T('~') );
 }
 
            (GetFormat(format) == wxPATH_UNIX && ch == _T('~') );
 }
 


@@ -401,6 +559,7 @@ bool wxFileName::IsWild( wxPathFormat format )
 {
     // FIXME: this is probably false for Mac and this is surely wrong for most
     //        of Unix shells (think about "[...]")
 {
     // FIXME: this is probably false for Mac and this is surely wrong for most
     //        of Unix shells (think about "[...]")

+       (void)format;

     return m_name.find_first_of(_T("*?")) != wxString::npos;
 }
 
     return m_name.find_first_of(_T("*?")) != wxString::npos;
 }
 


@@ -466,7 +625,184 @@ wxString wxFileName::GetPath( bool add_separator, wxPathFormat format ) const
 
 wxString wxFileName::GetFullPath( wxPathFormat format ) const
 {
 
 wxString wxFileName::GetFullPath( wxPathFormat format ) const
 {

-    return GetPathWithSep() + GetFullName();
+    format = GetFormat( format );
+    
+    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;
+}
+
+// Return the short form of the path (returns identity on non-Windows platforms)
+wxString wxFileName::GetShortPath() const
+{
+#if defined(__WXMSW__) && defined(__WIN32__) && !defined(__WXMICROWIN__)
+    wxString path(GetFullPath());
+    wxString pathOut;
+    DWORD sz = ::GetShortPathName(path, NULL, 0);
+    bool ok = sz != 0;
+    if ( ok )
+    {
+        ok = ::GetShortPathName
+               (
+                path,
+                pathOut.GetWriteBuf(sz),
+                sz
+               ) != 0;
+        pathOut.UngetWriteBuf();
+    }
+    if (ok)
+        return pathOut;
+
+    return path;
+#else
+    return GetFullPath();
+#endif
+}
+
+// Return the long form of the path (returns identity on non-Windows platforms)
+wxString wxFileName::GetLongPath() const
+{
+#if defined(__WXMSW__) && defined(__WIN32__) && !defined(__WXMICROWIN__)
+    wxString path(GetFullPath());
+    wxString pathOut;
+    bool success = FALSE;
+
+    // VZ: this code was disabled, why?
+#if 0 // wxUSE_DYNLIB_CLASS
+    typedef DWORD (*GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD);
+
+    static bool s_triedToLoad = FALSE;
+
+    if ( !s_triedToLoad )
+    {
+        s_triedToLoad = TRUE;
+        wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));
+        if ( dllKernel )
+        {
+            // may succeed or fail depending on the Windows version
+                       static GET_LONG_PATH_NAME s_pfnGetLongPathName = NULL;
+#ifdef _UNICODE
+            s_pfnGetLongPathName = (GET_LONG_PATH_NAME) wxDllLoader::GetSymbol(dllKernel, _T("GetLongPathNameW"));
+#else
+            s_pfnGetLongPathName = (GET_LONG_PATH_NAME) wxDllLoader::GetSymbol(dllKernel, _T("GetLongPathNameA"));
+#endif
+
+            wxDllLoader::UnloadLibrary(dllKernel);
+
+            if ( s_pfnGetLongPathName )
+            {
+                DWORD dwSize = (*s_pfnGetLongPathName)(path, NULL, 0);
+                bool ok = dwSize > 0;
+
+                if ( ok )
+                {
+                    DWORD sz = (*s_pfnGetLongPathName)(path, NULL, 0);
+                    ok = sz != 0;
+                    if ( ok )
+                    {
+                        ok = (*s_pfnGetLongPathName)
+                                (
+                                path,
+                                pathOut.GetWriteBuf(sz),
+                                sz
+                                ) != 0;
+                        pathOut.UngetWriteBuf();
+
+                        success = TRUE;
+                    }
+                }
+            }
+        }
+    }
+    if (success)
+        return pathOut;
+#endif // wxUSE_DYNLIB_CLASS
+
+    if (!success)
+    {
+        // The OS didn't support GetLongPathName, or some other error.
+        // We need to call FindFirstFile on each component in turn.
+
+        WIN32_FIND_DATA findFileData;
+        HANDLE hFind;
+        pathOut = wxEmptyString;
+
+        wxArrayString dirs = GetDirs();
+        dirs.Add(GetFullName());
+
+        size_t count = dirs.GetCount();
+        size_t i;
+        wxString tmpPath;
+
+        for ( i = 0; i < count; i++ )
+        {
+            // We're using pathOut to collect the long-name path,
+            // but using a temporary for appending the last path component which may be short-name
+            tmpPath = pathOut + dirs[i];
+
+            if (tmpPath.Last() == wxT(':'))
+            {
+                // Can't pass a drive and root dir to FindFirstFile,
+                // so continue to next dir
+                tmpPath += wxFILE_SEP_PATH;
+                pathOut = tmpPath;
+                continue;
+            }
+
+            hFind = ::FindFirstFile(tmpPath, &findFileData);
+            if (hFind == INVALID_HANDLE_VALUE)
+            {
+                // Error: return immediately with the original path
+                return path;
+            }
+            else
+            {
+                pathOut += findFileData.cFileName;
+                if ( (i < (count-1)) )
+                    pathOut += wxFILE_SEP_PATH;
+
+                ::FindClose(hFind);
+            }
+        }
+    }
+
+    return pathOut;
+#else
+    return GetFullPath();
+#endif

 }
 
 wxPathFormat wxFileName::GetFormat( wxPathFormat format )
 }
 
 wxPathFormat wxFileName::GetFormat( wxPathFormat format )


@@ -475,8 +811,8 @@ wxPathFormat wxFileName::GetFormat( wxPathFormat format )
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         format = wxPATH_DOS;
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         format = wxPATH_DOS;

-#elif defined(__WXMAC__)
-        format = wxPATH_UNIX; // that's the way the rest of wx' code works right now
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
+        format = wxPATH_MAC; 

 #else
         format = wxPATH_UNIX;
 #endif
 #else
         format = wxPATH_UNIX;
 #endif


@@ -573,3 +909,124 @@ void wxFileName::SplitPath(const wxString& fullpath,
         }
     }
 }
         }
     }
 }

+
+// ----------------------------------------------------------------------------
+// time functions
+// ----------------------------------------------------------------------------
+
+bool wxFileName::SetTimes(const wxDateTime *dtCreate,
+                          const wxDateTime *dtAccess,
+                          const wxDateTime *dtMod)
+{
+#if defined(__UNIX_LIKE__)
+    if ( !dtAccess && !dtMod )
+    {
+        // can't modify the creation time anyhow, don't try
+        return TRUE;
+    }
+
+    // if dtAccess or dtMod is not specified, use the other one (which must be
+    // non NULL because of the test above) for both times
+    utimbuf utm;
+    utm.actime = dtAccess ? dtAccess->GetTicks() : dtMod->GetTicks();
+    utm.modtime = dtMod ? dtMod->GetTicks() : dtAccess->GetTicks();
+    if ( utime(GetFullPath(), &utm) == 0 )
+    {
+        return TRUE;
+    }
+#elif defined(__WIN32__)
+    wxFileHandle fh(GetFullPath());
+    if ( fh.IsOk() )
+    {
+        FILETIME ftAccess, ftCreate, ftWrite;
+
+        if ( dtCreate )
+            ConvertWxToFileTime(&ftCreate, *dtCreate);
+        if ( dtAccess )
+            ConvertWxToFileTime(&ftAccess, *dtAccess);
+        if ( dtMod )
+            ConvertWxToFileTime(&ftWrite, *dtMod);
+
+        if ( ::SetFileTime(fh,
+                           dtCreate ? &ftCreate : NULL,
+                           dtAccess ? &ftAccess : NULL,
+                           dtMod ? &ftWrite : NULL) )
+        {
+            return TRUE;
+        }
+    }
+#else // other platform
+#endif // platforms
+
+    wxLogSysError(_("Failed to modify file times for '%s'"),
+                  GetFullPath().c_str());
+
+    return FALSE;
+}
+
+bool wxFileName::Touch()
+{
+#if defined(__UNIX_LIKE__)
+    // under Unix touching file is simple: just pass NULL to utime()
+    if ( utime(GetFullPath(), NULL) == 0 )
+    {
+        return TRUE;
+    }
+
+    wxLogSysError(_("Failed to touch the file '%s'"), GetFullPath().c_str());
+
+    return FALSE;
+#else // other platform
+    wxDateTime dtNow = wxDateTime::Now();
+
+    return SetTimes(NULL /* don't change create time */, &dtNow, &dtNow);
+#endif // platforms
+}
+
+bool wxFileName::GetTimes(wxDateTime *dtAccess,
+                          wxDateTime *dtMod,
+                          wxDateTime *dtChange) const
+{
+#if defined(__UNIX_LIKE__)
+    wxStructStat stBuf;
+    if ( wxStat(GetFullPath(), &stBuf) == 0 )
+    {
+        if ( dtAccess )
+            dtAccess->Set(stBuf.st_atime);
+        if ( dtMod )
+            dtMod->Set(stBuf.st_mtime);
+        if ( dtChange )
+            dtChange->Set(stBuf.st_ctime);
+
+        return TRUE;
+    }
+#elif defined(__WIN32__)
+    wxFileHandle fh(GetFullPath());
+    if ( fh.IsOk() )
+    {
+        FILETIME ftAccess, ftCreate, ftWrite;
+
+        if ( ::GetFileTime(fh,
+                           dtMod ? &ftCreate : NULL,
+                           dtAccess ? &ftAccess : NULL,
+                           dtChange ? &ftWrite : NULL) )
+        {
+            if ( dtMod )
+                ConvertFileTimeToWx(dtMod, ftCreate);
+            if ( dtAccess )
+                ConvertFileTimeToWx(dtAccess, ftAccess);
+            if ( dtChange )
+                ConvertFileTimeToWx(dtChange, ftWrite);
+
+            return TRUE;
+        }
+    }
+#else // other platform
+#endif // platforms
+
+    wxLogSysError(_("Failed to retrieve file times for '%s'"),
+                  GetFullPath().c_str());
+
+    return FALSE;
+}
+