X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ba8c1601448fa16d64c4e75a095f1cb037909c5b..86351e4a9d12822b31f2052fe299fc6be6d5f44d:/src/common/filename.cpp?ds=sidebyside diff --git a/src/common/filename.cpp b/src/common/filename.cpp index 77d2f2fcab..5a125fcd3f 100644 --- a/src/common/filename.cpp +++ b/src/common/filename.cpp @@ -60,7 +60,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "filename.h" #endif @@ -86,8 +86,11 @@ // For GetShort/LongPathName #ifdef __WIN32__ -#include -#include "wx/msw/winundef.h" +#include "wx/msw/wrapwin.h" +#endif + +#ifdef __WXWINCE__ +#include "wx/msw/private.h" #endif #if defined(__WXMAC__) @@ -132,6 +135,7 @@ #endif #ifdef __EMX__ +#include #define MAX_PATH _MAX_PATH #endif @@ -185,7 +189,7 @@ public: } } - // return TRUE only if the file could be opened successfully + // return true only if the file could be opened successfully bool IsOk() const { return m_hFile != INVALID_HANDLE_VALUE; } // get the handle @@ -340,9 +344,13 @@ void wxFileName::SetPath( const wxString &path, wxPathFormat format ) case wxPATH_VMS: // TODO: what is the relative path format here? - m_relative = FALSE; + m_relative = false; break; + default: + wxFAIL_MSG( _T("Unknown path format") ); + // !! Fall through !! + case wxPATH_UNIX: // the paths of the form "~" or "~username" are absolute m_relative = leadingChar != wxT('/') && leadingChar != _T('~'); @@ -352,9 +360,6 @@ void wxFileName::SetPath( const wxString &path, wxPathFormat format ) m_relative = !IsPathSeparator(leadingChar, my_format); break; - default: - wxFAIL_MSG( wxT("error") ); - break; } // 2) Break up the path into its members. If the original path @@ -383,7 +388,7 @@ void wxFileName::SetPath( const wxString &path, wxPathFormat format ) } else // no path at all { - m_relative = TRUE; + m_relative = true; } } @@ -447,20 +452,20 @@ void wxFileName::Clear() m_ext = wxEmptyString; // we don't have any absolute path for now - m_relative = TRUE; + m_relative = true; } /* static */ -wxFileName wxFileName::FileName(const wxString& file) +wxFileName wxFileName::FileName(const wxString& file, wxPathFormat format) { - return wxFileName(file); + return wxFileName(file, format); } /* static */ -wxFileName wxFileName::DirName(const wxString& dir) +wxFileName wxFileName::DirName(const wxString& dir, wxPathFormat format) { wxFileName fn; - fn.AssignDir(dir); + fn.AssignDir(dir, format); return fn; } @@ -564,8 +569,22 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp) // use the directory specified by the prefix SplitPath(prefix, &dir, &name, NULL /* extension */); -#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) +#if defined(__WXWINCE__) + if (dir.empty()) + { + // FIXME. Create \temp dir? + dir = wxT("\\"); + } + path = dir + wxT("\\") + prefix; + int i = 1; + while (wxFileExists(path)) + { + path = dir + wxT("\\") + prefix ; + path << i; + i ++; + } +#elif defined(__WINDOWS__) && !defined(__WXMICROWIN__) #ifdef __WIN32__ if ( dir.empty() ) { @@ -694,7 +713,7 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp) } #else // !HAVE_MKTEMP (includes __DOS__) // generate the unique file name ourselves - #ifndef __DOS__ + #if !defined(__DOS__) && (!defined(__MWERKS__) || defined(__DARWIN__) ) path << (unsigned int)getpid(); #endif @@ -799,12 +818,12 @@ bool wxFileName::Mkdir( const wxString& dir, int perm, int flags ) if (!wxMkdir(currPath, perm)) { // no need to try creating further directories - return FALSE; + return false; } } } - return TRUE; + return true; } @@ -913,7 +932,7 @@ bool wxFileName::Normalize(int flags, { wxLogError(_("The path '%s' contains too many \"..\"!"), GetFullPath().c_str()); - return FALSE; + return false; } m_dirs.RemoveAt(m_dirs.GetCount() - 1); @@ -945,7 +964,7 @@ bool wxFileName::Normalize(int flags, // we do have the path now // // NB: need to do this before (maybe) calling Assign() below - m_relative = FALSE; + m_relative = false; #if defined(__WIN32__) if ( (flags & wxPATH_NORM_LONG) && (format == wxPATH_DOS) ) @@ -954,7 +973,7 @@ bool wxFileName::Normalize(int flags, } #endif // Win32 - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -966,22 +985,22 @@ bool wxFileName::IsAbsolute(wxPathFormat format) const // if our path doesn't start with a path separator, it's not an absolute // path if ( m_relative ) - return FALSE; + return false; if ( !GetVolumeSeparator(format).empty() ) { // this format has volumes and an absolute path must have one, it's not // enough to have the full path to bean absolute file under Windows if ( GetVolume().empty() ) - return FALSE; + return false; } - return TRUE; + return true; } bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format) { - wxFileName fnBase(pathBase, format); + wxFileName fnBase = wxFileName::DirName(pathBase, format); // get cwd only once - small time saving wxString cwd = wxGetCwd(); @@ -994,7 +1013,7 @@ bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format) if ( !GetVolume().IsSameAs(fnBase.GetVolume(), withCase) ) { // nothing done - return FALSE; + return false; } // same drive, so we don't need our volume @@ -1026,10 +1045,10 @@ bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format) } } - m_relative = TRUE; + m_relative = true; // we were modified - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -1047,12 +1066,12 @@ bool wxFileName::SameAs(const wxFileName& filepath, wxPathFormat format) const fn2.Normalize(wxPATH_NORM_ALL & ~wxPATH_NORM_CASE, cwd, format); if ( fn1.GetFullPath() == fn2.GetFullPath() ) - return TRUE; + return true; // TODO: compare inodes for Unix, this works even when filenames are // different but files are the same (symlinks) (VZ) - return FALSE; + return false; } /* static */ @@ -1062,6 +1081,41 @@ bool wxFileName::IsCaseSensitive( wxPathFormat format ) return GetFormat(format) == wxPATH_UNIX; } +/* static */ +wxString wxFileName::GetForbiddenChars(wxPathFormat format) +{ + // Inits to forbidden characters that are common to (almost) all platforms. + wxString strForbiddenChars = wxT("*?"); + + // If asserts, wxPathFormat has been changed. In case of a new path format + // addition, the following code might have to be updated. + wxCOMPILE_TIME_ASSERT(wxPATH_MAX == 5, wxPathFormatChanged); + switch ( GetFormat(format) ) + { + default : + wxFAIL_MSG( wxT("Unknown path format") ); + // !! Fall through !! + + case wxPATH_UNIX: + break; + + case wxPATH_MAC: + // On a Mac even names with * and ? are allowed (Tested with OS + // 9.2.1 and OS X 10.2.5) + strForbiddenChars = wxEmptyString; + break; + + case wxPATH_DOS: + strForbiddenChars += wxT("\\/:\"<>|"); + break; + + case wxPATH_VMS: + break; + } + + return strForbiddenChars; +} + /* static */ wxString wxFileName::GetVolumeSeparator(wxPathFormat format) { @@ -1090,7 +1144,7 @@ wxString wxFileName::GetPathSeparators(wxPathFormat format) break; default: - wxFAIL_MSG( _T("unknown wxPATH_XXX style") ); + wxFAIL_MSG( _T("Unknown wxPATH_XXX style") ); // fall through case wxPATH_UNIX: @@ -1189,7 +1243,7 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const break; default: - wxFAIL_MSG( _T("unknown path format") ); + wxFAIL_MSG( wxT("Unknown path format") ); // fall through case wxPATH_UNIX: @@ -1239,7 +1293,7 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const break; default: - wxFAIL_MSG( wxT("unexpected path format") ); + wxFAIL_MSG( wxT("Unexpected path format") ); // still fall through case wxPATH_DOS: @@ -1284,7 +1338,7 @@ wxString wxFileName::GetFullPath( wxPathFormat format ) const // Return the short form of the path (returns identity on non-Windows platforms) wxString wxFileName::GetShortPath() const { -#if defined(__WXMSW__) && defined(__WIN32__) && !defined(__WXMICROWIN__) +#if defined(__WXMSW__) && defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) wxString path(GetFullPath()); wxString pathOut; DWORD sz = ::GetShortPathName(path, NULL, 0); @@ -1294,10 +1348,9 @@ wxString wxFileName::GetShortPath() const ok = ::GetShortPathName ( path, - pathOut.GetWriteBuf(sz), + wxStringBuffer(pathOut, sz), sz ) != 0; - pathOut.UngetWriteBuf(); } if (ok) return pathOut; @@ -1315,19 +1368,19 @@ wxString wxFileName::GetLongPath() const path = GetFullPath(); #if defined(__WIN32__) && !defined(__WXMICROWIN__) - bool success = FALSE; + bool success = false; #if wxUSE_DYNAMIC_LOADER typedef DWORD (WINAPI *GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD); - static bool s_triedToLoad = FALSE; + static bool s_triedToLoad = false; if ( !s_triedToLoad ) { // suppress the errors about missing GetLongPathName[AW] wxLogNull noLog; - s_triedToLoad = TRUE; + s_triedToLoad = true; wxDynamicLibrary dllKernel(_T("kernel32")); if ( dllKernel.IsLoaded() ) { @@ -1353,12 +1406,10 @@ wxString wxFileName::GetLongPath() const ok = (*s_pfnGetLongPathName) ( path, - pathOut.GetWriteBuf(sz), + wxStringBuffer(pathOut, sz), sz ) != 0; - pathOut.UngetWriteBuf(); - - success = TRUE; + success = true; } } } @@ -1488,7 +1539,7 @@ void wxFileName::SplitPath(const wxString& fullpathWithVolume, fullpath[posFirstSlash] = wxFILE_SEP_DSK; // UNC paths are always absolute, right? (FIXME) - fullpath.insert(posFirstSlash + 1, wxFILE_SEP_PATH_DOS); + fullpath.insert(posFirstSlash + 1, 1, wxFILE_SEP_PATH_DOS); } } } @@ -1657,7 +1708,7 @@ bool wxFileName::SetTimes(const wxDateTime *dtAccess, dtAccess ? &ftAccess : NULL, dtMod ? &ftWrite : NULL) ) { - return TRUE; + return true; } } } @@ -1665,7 +1716,7 @@ bool wxFileName::SetTimes(const wxDateTime *dtAccess, if ( !dtAccess && !dtMod ) { // can't modify the creation time anyhow, don't try - return TRUE; + return true; } // if dtAccess or dtMod is not specified, use the other one (which must be @@ -1675,7 +1726,7 @@ bool wxFileName::SetTimes(const wxDateTime *dtAccess, utm.modtime = dtMod ? dtMod->GetTicks() : dtAccess->GetTicks(); if ( utime(GetFullPath().fn_str(), &utm) == 0 ) { - return TRUE; + return true; } #else // other platform #endif // platforms @@ -1683,7 +1734,7 @@ bool wxFileName::SetTimes(const wxDateTime *dtAccess, wxLogSysError(_("Failed to modify file times for '%s'"), GetFullPath().c_str()); - return FALSE; + return false; } bool wxFileName::Touch() @@ -1692,12 +1743,12 @@ bool wxFileName::Touch() // under Unix touching file is simple: just pass NULL to utime() if ( utime(GetFullPath().fn_str(), NULL) == 0 ) { - return TRUE; + return true; } wxLogSysError(_("Failed to touch the file '%s'"), GetFullPath().c_str()); - return FALSE; + return false; #else // other platform wxDateTime dtNow = wxDateTime::Now(); @@ -1739,7 +1790,7 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess, } else { - ok = FALSE; + ok = false; } } @@ -1752,7 +1803,7 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess, if ( dtMod ) ConvertFileTimeToWx(dtMod, ftWrite); - return TRUE; + return true; } #elif defined(__UNIX_LIKE__) || defined(__WXMAC__) || (defined(__DOS__) && defined(__WATCOMC__)) wxStructStat stBuf; @@ -1765,7 +1816,7 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess, if ( dtCreate ) dtCreate->Set(stBuf.st_ctime); - return TRUE; + return true; } #else // other platform #endif // platforms @@ -1773,7 +1824,7 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess, wxLogSysError(_("Failed to retrieve file times for '%s'"), GetFullPath().c_str()); - return FALSE; + return false; } #endif // wxUSE_DATETIME