X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7124df9b59f2627c083b1fecaaa3e93c7088e3d0..594f0f5bf1355fb8d58f403d3ebacc1c1767c429:/src/common/filename.cpp diff --git a/src/common/filename.cpp b/src/common/filename.cpp index ef07caccef..d30a7f8ba1 100644 --- a/src/common/filename.cpp +++ b/src/common/filename.cpp @@ -38,6 +38,16 @@ #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 +#include "wx/msw/winundef.h" +#endif + // ============================================================================ // implementation // ============================================================================ @@ -60,18 +70,18 @@ void wxFileName::Assign( const wxString& path, { 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(); - // 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 ); - first = FALSE; + i ++; } m_ext = ext; @@ -142,6 +152,13 @@ bool wxFileName::DirExists( const wxString &dir ) return ::wxDirExists( dir ); } +wxDateTime wxFileName::GetModificationTime() +{ + wxDateTime ret( wxFileModificationTime( GetFullPath() ) ); + + return ret; +} + // ---------------------------------------------------------------------------- // CWD and HOME stuff // ---------------------------------------------------------------------------- @@ -194,14 +211,47 @@ void wxFileName::AssignTempFileName( const wxString &prefix ) // 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() @@ -249,7 +299,7 @@ bool wxFileName::Normalize(wxPathNormalize flags, { curDir.AssignDir(wxGetUserHome(dir.c_str() + 1)); - dirs.Remove(0u); + dirs.RemoveAt(0u); } } } @@ -316,6 +366,13 @@ bool wxFileName::Normalize(wxPathNormalize flags, m_ext.MakeLower(); } +#if defined(__WXMSW__) && defined(__WIN32__) + if (flags & wxPATH_NORM_LONG) + { + Assign(GetLongPath()); + } +#endif + return TRUE; } @@ -358,9 +415,15 @@ bool wxFileName::IsAbsolute( wxPathFormat format ) { 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) || + driveSep == _T(':') || (GetFormat(format) == wxPATH_UNIX && ch == _T('~') ); } @@ -401,6 +464,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 "[...]") + (void)format; return m_name.find_first_of(_T("*?")) != wxString::npos; } @@ -466,7 +530,184 @@ wxString wxFileName::GetPath( bool add_separator, 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 ) @@ -476,7 +717,7 @@ wxPathFormat wxFileName::GetFormat( wxPathFormat format ) #if defined(__WXMSW__) || defined(__WXPM__) format = wxPATH_DOS; #elif defined(__WXMAC__) - format = wxPATH_MAC; + format = wxPATH_MAC; #else format = wxPATH_UNIX; #endif @@ -512,7 +753,10 @@ void wxFileName::SplitPath(const wxString& fullpath, } } - if ( (posLastDot != wxString::npos) && (posLastDot < posLastSlash) ) + // if we do have a dot and a slash, check that the dot is in the name part + if ( (posLastDot != wxString::npos) && + (posLastSlash != wxString::npos) && + (posLastDot < posLastSlash) ) { // the dot is part of the path, not the start of the extension posLastDot = wxString::npos; @@ -535,9 +779,23 @@ void wxFileName::SplitPath(const wxString& fullpath, if ( pstrName ) { + // take all characters starting from the one after the last slash and + // up to, but excluding, the last dot size_t nStart = posLastSlash == wxString::npos ? 0 : posLastSlash + 1; - size_t count = posLastDot == wxString::npos ? wxString::npos - : posLastDot - posLastSlash; + size_t count; + if ( posLastDot == wxString::npos ) + { + // take all until the end + count = wxString::npos; + } + else if ( posLastSlash == wxString::npos ) + { + count = posLastDot; + } + else // have both dot and slash + { + count = posLastDot - posLastSlash - 1; + } *pstrName = fullpath.Mid(nStart, count); }