#include "wx/tokenzr.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__
{
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;
return ::wxDirExists( dir );
}
+wxDateTime wxFileName::GetModificationTime()
+{
+ wxDateTime ret( wxFileModificationTime( GetFullPath() ) );
+
+ return ret;
+}
+
// ----------------------------------------------------------------------------
// CWD and HOME stuff
// ----------------------------------------------------------------------------
// 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()
{
// 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;
}
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__)
+#if defined(__WXMSW__) && defined(__WIN32__) && !defined(__WXMICROWIN__)
wxString path(GetFullPath());
wxString pathOut;
DWORD sz = ::GetShortPathName(path, NULL, 0);
}
if (ok)
return pathOut;
- else
- return path;
+
+ 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__)
+#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;
- static GET_LONG_PATH_NAME s_pfnGetLongPathName = NULL;
if ( !s_triedToLoad )
{
s_triedToLoad = TRUE;
-
wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));
if ( dllKernel )
{
// may succeed or fail depending on the Windows version
- s_pfnGetLongPathName = (GET_LONG_PATH_NAME) wxDllLoader::GetSymbol(dllKernel, _T("GetLongPathName"));
+ 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 (success)
return pathOut;
+#endif // wxUSE_DYNLIB_CLASS
if (!success)
{
HANDLE hFind;
pathOut = wxEmptyString;
- size_t count = m_dirs.GetCount();
+ 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 + m_dirs[i];
+ 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)
else
{
pathOut += findFileData.cFileName;
- if ( (i < count) )
+ if ( (i < (count-1)) )
pathOut += wxFILE_SEP_PATH;
::FindClose(hFind);
}
}
}
+
return pathOut;
#else
return GetFullPath();
#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
+ format = wxPATH_MAC;
#else
format = wxPATH_UNIX;
#endif
projects / wxWidgets.git / blobdiff