/////////////////////////////////////////////////////////////////////////////
-// Name: filename.cpp
-// Purpose: wxFileName - encapsulates candy
-// Author: Robert Roebling
+// Name: src/common/filename.cpp
+// Purpose: wxFileName - encapsulates a file path
+// Author: Robert Roebling, Vadim Zeitlin
// Modified by:
// Created: 28.12.2000
// RCS-ID: $Id$
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
#ifdef __GNUG__
#pragma implementation "filename.h"
#endif
#include "wx/filename.h"
#include "wx/tokenzr.h"
+#include "wx/config.h" // for wxExpandEnvVars
#include "wx/utils.h"
-//----------------------------------------------------------------------------
-// wxFileName
-//----------------------------------------------------------------------------
+#if wxUSE_DYNLIB_CLASS
+#include "wx/dynlib.h"
+#endif
+
+// For GetShort/LongPathName
+#ifdef __WIN32__
+#include <windows.h>
+#include "wx/msw/winundef.h"
+#endif
+
+// at least some of these are required for file mod time
+#ifdef __WXGTK__
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <dirent.h>
+#include <pwd.h>
+#ifndef __VMS
+# include <grp.h>
+#endif
+# include <time.h>
+#include <unistd.h>
+#endif
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxFileName construction
+// ----------------------------------------------------------------------------
-wxFileName::wxFileName( const wxFileName &filepath )
+void wxFileName::Assign( const wxFileName &filepath )
{
m_ext = filepath.GetExt();
m_name = filepath.GetName();
- const wxArrayString &dirs = filepath.GetDirs();
- for (size_t i = 0; i < dirs.GetCount(); i++)
- m_dirs.Add( dirs[i] );
+ m_dirs = filepath.GetDirs();
}
-void wxFileName::Assign( const wxFileName &filepath )
+void wxFileName::Assign( const wxString& path,
+ const wxString& name,
+ const wxString& ext,
+ wxPathFormat format )
{
+ wxStringTokenizer tn(path, GetPathSeparators(format),
+ wxTOKEN_RET_EMPTY_ALL);
+ bool first = TRUE;
m_dirs.Clear();
- m_ext = filepath.GetExt();
- m_name = filepath.GetName();
- const wxArrayString &dirs = filepath.GetDirs();
- for (size_t i = 0; i < dirs.GetCount(); i++)
- m_dirs.Add( dirs[i] );
+ 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())
+ m_dirs.Add( token );
+
+ first = FALSE;
+ }
+
+ m_ext = ext;
+ m_name = name;
}
-void wxFileName::Assign( const wxString &path, bool dir_only, wxPathFormat format )
+void wxFileName::Assign(const wxString& fullpath,
+ wxPathFormat format)
+{
+ wxString path, name, ext;
+ SplitPath(fullpath, &path, &name, &ext, format);
+
+ Assign(path, name, ext, format);
+}
+
+void wxFileName::Assign(const wxString& path,
+ const wxString& fullname,
+ wxPathFormat format)
+{
+ wxString name, ext;
+ SplitPath(fullname, NULL /* no path */, &name, &ext, format);
+
+ Assign(path, name, ext, format);
+}
+
+void wxFileName::Clear()
{
- m_ext = wxEmptyString;
- m_name = wxEmptyString;
m_dirs.Clear();
+ m_name =
+ m_ext = wxEmptyString;
+}
- format = GetFormat( format );
+/* static */
+wxFileName wxFileName::FileName(const wxString& file)
+{
+ return wxFileName(file);
+}
- wxString seps;
- if (format == wxPATH_DOS)
- {
- seps = "/\\";
- }
- else
- if (format == wxPATH_UNIX)
- {
- seps = "/";
- }
- else
- {
- seps = ":";
- }
-
- wxStringTokenizer tn( path, seps );
- while (tn.HasMoreTokens())
- {
- wxString token( tn.GetNextToken() );
- if (!token.IsEmpty())
- m_dirs.Add( token );
- }
-
- if (!dir_only)
- {
- // make last m_dir -> m_name
- size_t last = m_dirs.GetCount();
- if (last == 0) return;
- last--;
- m_name = m_dirs[last];
- m_dirs.Remove( last );
-
- if (m_name == wxT(".")) return;
- if (m_name == wxT("..")) return;
-
- // ext?
- int pos = m_name.Find( wxT('.') );
- if (pos == -1) return;
-
- bool has_starting_dot = (pos == 0);
- if (has_starting_dot && (format == wxPATH_UNIX))
- {
- // remove dot
- m_name.Remove(0,1);
-
- // search again
- pos = m_name.Find( wxT('.') );
- if (pos == -1)
- {
- // add dot back
- m_name.Prepend( "." );
- return;
- }
- }
- m_ext = m_name;
- m_ext.Remove( 0, pos+1 );
-
- m_name.Remove( pos, m_name.Len()-pos );
-
- if (has_starting_dot && (format == wxPATH_UNIX))
- {
- // add dot back
- m_name.Prepend( "." );
- return;
- }
- }
+/* static */
+wxFileName wxFileName::DirName(const wxString& dir)
+{
+ wxFileName fn;
+ fn.AssignDir(dir);
+ return fn;
}
+// ----------------------------------------------------------------------------
+// existence tests
+// ----------------------------------------------------------------------------
+
bool wxFileName::FileExists()
{
return wxFileName::FileExists( GetFullPath() );
return ::wxDirExists( dir );
}
+wxDateTime wxFileName::GetModificationTime()
+{
+#ifdef __WXGTK__
+ struct stat buff;
+ stat( GetFullName().fn_str(), &buff );
+
+#if !defined( __EMX__ ) && !defined(__VMS)
+ struct stat lbuff;
+ lstat( GetFullName().fn_str(), &lbuff );
+ struct tm *t = localtime( &lbuff.st_mtime );
+#else
+ struct tm *t = localtime( &buff.st_mtime );
+#endif
+
+ wxDateTime ret( t->tm_mday, (wxDateTime::Month)t->tm_mon, t->tm_year+1900, t->tm_hour, t->tm_min, t->tm_sec );
+#else
+
+ wxDateTime ret = wxDateTime::Now();
+
+#endif
+ return ret;
+}
+
+// ----------------------------------------------------------------------------
+// CWD and HOME stuff
+// ----------------------------------------------------------------------------
+
void wxFileName::AssignCwd()
{
- Assign( wxFileName::GetCwd(), TRUE );
+ AssignDir(wxFileName::GetCwd());
}
+/* static */
wxString wxFileName::GetCwd()
{
return ::wxGetCwd();
void wxFileName::AssignHomeDir()
{
- Assign( wxFileName::GetHomeDir(), TRUE );
+ AssignDir(wxFileName::GetHomeDir());
}
-
+
wxString wxFileName::GetHomeDir()
{
return ::wxGetHomeDir();
}
-
+
void wxFileName::AssignTempFileName( const wxString &prefix )
{
+ wxString fullname;
+ if ( wxGetTempFileName(prefix, fullname) )
+ {
+ Assign(fullname);
+ }
+ else // error
+ {
+ Clear();
+ }
}
-bool wxFileName::Mkdir( int perm )
+// ----------------------------------------------------------------------------
+// directory operations
+// ----------------------------------------------------------------------------
+
+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()
return ::wxRmdir( dir );
}
-bool wxFileName::Normalize( const wxString &cwd, const wxString &home )
+// ----------------------------------------------------------------------------
+// path normalization
+// ----------------------------------------------------------------------------
+
+bool wxFileName::Normalize(wxPathNormalize flags,
+ const wxString& cwd,
+ wxPathFormat format)
{
- wxFileName tmp( *this );
- m_dirs.Clear();
- const wxArrayString &dirs = tmp.GetDirs();
-
- if (dirs.GetCount() == 0) return FALSE;
-
- size_t start = 0;
-
- if (dirs[0] == wxT("."))
+ // the existing path components
+ wxArrayString dirs = GetDirs();
+
+ // the path to prepend in front to make the path absolute
+ wxFileName curDir;
+
+ format = GetFormat(format);
+
+ // make the path absolute
+ if ( (flags & wxPATH_NORM_ABSOLUTE) && !IsAbsolute() )
{
- if (cwd == wxEmptyString)
- Assign( wxFileName::GetCwd(), TRUE );
+ if ( cwd.empty() )
+ curDir.AssignCwd();
else
- Assign( cwd );
- start = 1;
+ curDir.AssignDir(cwd);
}
- else
- if (dirs[0] == wxT(".."))
+
+ // handle ~ stuff under Unix only
+ if ( (format == wxPATH_UNIX) && (flags & wxPATH_NORM_TILDE) )
{
- if (cwd == wxEmptyString)
- Assign( wxFileName::GetCwd(), TRUE );
- else
- Assign( cwd );
- m_dirs.Remove( m_dirs.GetCount()-1 );
- start = 1;
+ if ( !dirs.IsEmpty() )
+ {
+ wxString dir = dirs[0u];
+ if ( !dir.empty() && dir[0u] == _T('~') )
+ {
+ curDir.AssignDir(wxGetUserHome(dir.c_str() + 1));
+
+ dirs.RemoveAt(0u);
+ }
+ }
}
- else
- if (dirs[0] == wxT("~"))
+
+ if ( curDir.IsOk() )
{
- if (home == wxEmptyString)
- Assign( wxFileName::GetHomeDir(), TRUE );
- else
- Assign( home );
- start = 1;
+ wxArrayString dirsNew = curDir.GetDirs();
+ size_t count = dirs.GetCount();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ dirsNew.Add(dirs[n]);
+ }
+
+ dirs = dirsNew;
}
-
- for (size_t i = start; i < dirs.GetCount(); i++)
+
+ // now deal with ".", ".." and the rest
+ m_dirs.Empty();
+ size_t count = dirs.GetCount();
+ for ( size_t n = 0; n < count; n++ )
{
- if (dirs[i] == wxT(".")) continue;
-
- if (dirs[i] == wxT(".."))
+ wxString dir = dirs[n];
+
+ if ( flags && wxPATH_NORM_DOTS )
+ {
+ if ( dir == wxT(".") )
+ {
+ // just ignore
+ continue;
+ }
+
+ if ( dir == wxT("..") )
+ {
+ if ( m_dirs.IsEmpty() )
+ {
+ wxLogError(_("The path '%s' contains too many \"..\"!"),
+ GetFullPath().c_str());
+ return FALSE;
+ }
+
+ m_dirs.Remove(m_dirs.GetCount() - 1);
+ continue;
+ }
+ }
+
+ if ( flags & wxPATH_NORM_ENV_VARS )
+ {
+ dir = wxExpandEnvVars(dir);
+ }
+
+ if ( (flags & wxPATH_NORM_CASE) && !IsCaseSensitive(format) )
{
- m_dirs.Remove( m_dirs.GetCount()-1 );
- continue;
+ dir.MakeLower();
}
-
- // expand env vars here ?
-
- m_dirs.Add( dirs[i] );
+
+ m_dirs.Add(dir);
}
-
- m_name = tmp.GetName();
- m_ext = tmp.GetExt();
-
+
+ if ( (flags & wxPATH_NORM_CASE) && !IsCaseSensitive(format) )
+ {
+ // VZ: expand env vars here too?
+
+ m_name.MakeLower();
+ m_ext.MakeLower();
+ }
+
+#if defined(__WXMSW__) && defined(__WIN32__)
+ if (flags & wxPATH_NORM_LONG)
+ {
+ Assign(GetLongPath());
+ }
+#endif
+
return TRUE;
}
-bool wxFileName::SameAs( const wxFileName &filepath, bool upper_case )
+// ----------------------------------------------------------------------------
+// filename kind tests
+// ----------------------------------------------------------------------------
+
+bool wxFileName::SameAs( const wxFileName &filepath, wxPathFormat format)
{
- wxString file1( GetFullPath() );
- wxString file2( filepath.GetFullPath() );
-
- if (upper_case)
- {
- file1.MakeUpper(); // what does MSW do to non-ascii chars etc? native funcs?
- file2.MakeUpper();
- }
-
- return (file1 == file2);
+ wxFileName fn1 = *this,
+ fn2 = filepath;
+
+ // get cwd only once - small time saving
+ wxString cwd = wxGetCwd();
+ fn1.Normalize(wxPATH_NORM_ALL, cwd, format);
+ fn2.Normalize(wxPATH_NORM_ALL, cwd, format);
+
+ if ( fn1.GetFullPath() == fn2.GetFullPath() )
+ return TRUE;
+
+ // TODO: compare inodes for Unix, this works even when filenames are
+ // different but files are the same (symlinks) (VZ)
+
+ return FALSE;
}
+/* static */
bool wxFileName::IsCaseSensitive( wxPathFormat format )
{
- format = GetFormat( format );
-
- return (format != wxPATH_DOS);
+ // only DOS filenames are case-sensitive
+ return GetFormat(format) != wxPATH_DOS;
}
bool wxFileName::IsRelative( wxPathFormat format )
{
- format = GetFormat( format );
-
- for (size_t i = 0; i < m_dirs.GetCount(); i++)
+ return !IsAbsolute(format);
+}
+
+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('~') );
+}
+
+/* static */
+wxString wxFileName::GetPathSeparators(wxPathFormat format)
+{
+ wxString seps;
+ switch ( GetFormat(format) )
{
- if ((format == wxPATH_UNIX) && (i == 0) && (m_dirs[0] == wxT("~"))) return TRUE;
-
- if (m_dirs[i] == wxT(".")) return TRUE;
- if (m_dirs[i] == wxT("..")) return TRUE;
+ case wxPATH_DOS:
+ // accept both as native APIs do
+ seps << wxFILE_SEP_PATH_UNIX << wxFILE_SEP_PATH_DOS;
+ break;
+
+ default:
+ wxFAIL_MSG( _T("unknown wxPATH_XXX style") );
+ // fall through
+
+ case wxPATH_UNIX:
+ seps = wxFILE_SEP_PATH_UNIX;
+ break;
+
+ case wxPATH_MAC:
+ seps = wxFILE_SEP_PATH_MAC;
+ break;
}
- return FALSE;
+ return seps;
}
-bool wxFileName::IsAbsolute( wxPathFormat format )
+/* static */
+bool wxFileName::IsPathSeparator(wxChar ch, wxPathFormat format)
{
- return (!IsRelative(format));
+ return GetPathSeparators(format).Find(ch) != wxNOT_FOUND;
}
bool wxFileName::IsWild( wxPathFormat format )
{
- format = GetFormat( format );
-
- if (format == wxPATH_DOS)
- {
- if (m_name.Find( wxT('*') ) != -1) return TRUE;
- if (m_name.Find( wxT('?') ) != -1) return TRUE;
- }
- else
- {
- if (m_name.Find( wxT('*') ) != -1) return TRUE;
- }
-
- return FALSE;
+ // FIXME: this is probably false for Mac and this is surely wrong for most
+ // of Unix shells (think about "[...]")
+ return m_name.find_first_of(_T("*?")) != wxString::npos;
}
+// ----------------------------------------------------------------------------
+// path components manipulation
+// ----------------------------------------------------------------------------
+
void wxFileName::AppendDir( const wxString &dir )
{
m_dirs.Add( dir );
m_dirs.Remove( (size_t)pos );
}
-void wxFileName::SetFullName( const wxString name, wxPathFormat format )
+// ----------------------------------------------------------------------------
+// accessors
+// ----------------------------------------------------------------------------
+
+void wxFileName::SetFullName(const wxString& fullname)
{
- format = GetFormat( format );
-
- m_name = name;
-
- if (m_name == wxT(".")) return;
- if (m_name == wxT("..")) return;
-
- // ext?
- int pos = m_name.Find( wxT('.') );
- if (pos == -1) return;
-
- bool has_starting_dot = (pos == 0);
- if (has_starting_dot && (format == wxPATH_UNIX))
- {
- // remove dot
- m_name.Remove(0,1);
-
- // search again
- pos = m_name.Find( wxT('.') );
- if (pos == -1)
- {
- // add dot back
- m_name.Prepend( "." );
- return;
- }
- }
-
- m_ext = m_name;
- m_ext.Remove( 0, pos+1 );
-
- m_name.Remove( pos, m_name.Len()-pos );
-
- if (has_starting_dot && (format == wxPATH_UNIX))
- {
- // add dot back
- m_name.Prepend( "." );
- return;
- }
+ SplitPath(fullname, NULL /* no path */, &m_name, &m_ext);
}
-wxString wxFileName::GetFullName()
+wxString wxFileName::GetFullName() const
{
- wxString ret( m_name );
- if (!m_ext.IsEmpty())
- {
- ret += '.';
- ret += m_ext;
+ wxString fullname = m_name;
+ if ( !m_ext.empty() )
+ {
+ fullname << wxFILE_SEP_EXT << m_ext;
}
- return ret;
+
+ return fullname;
}
wxString wxFileName::GetPath( bool add_separator, wxPathFormat format ) const
{
format = GetFormat( format );
-
+
wxString ret;
- if (format == wxPATH_DOS)
- {
- for (size_t i = 0; i < m_dirs.GetCount(); i++)
- {
- ret += m_dirs[i];
- if (add_separator || (i != m_dirs.GetCount()-1))
- ret += '\\';
- }
- }
- else
- if (format == wxPATH_UNIX)
- {
- ret = '/'; // FIXME: must be absolute
- for (size_t i = 0; i < m_dirs.GetCount(); i++)
- {
- ret += m_dirs[i];
- if (add_separator || (i != m_dirs.GetCount()-1))
- ret += '/';
- }
- }
- else
+ size_t count = m_dirs.GetCount();
+ for ( size_t i = 0; i < count; i++ )
{
- for (size_t i = 0; i < m_dirs.GetCount(); i++)
- {
- ret += m_dirs[i];
- if (add_separator || (i != m_dirs.GetCount()-1))
- ret += ":";
- }
+ ret += m_dirs[i];
+ if ( add_separator || (i < count) )
+ ret += wxFILE_SEP_PATH;
}
-
+
return ret;
}
wxString wxFileName::GetFullPath( wxPathFormat format ) const
{
- format = GetFormat( format );
-
- wxString ret;
- if (format == wxPATH_DOS)
+ return GetPathWithSep() + GetFullName();
+}
+
+// Return the short form of the path (returns identity on non-Windows platforms)
+wxString wxFileName::GetShortPath() const
+{
+#if defined(__WXMSW__) && defined(__WIN32__)
+ wxString path(GetFullPath());
+ wxString pathOut;
+ DWORD sz = ::GetShortPathName(path, NULL, 0);
+ bool ok = sz != 0;
+ if ( ok )
{
- for (size_t i = 0; i < m_dirs.GetCount(); i++)
- {
- ret += m_dirs[i];
- ret += '\\';
- }
+ ok = ::GetShortPathName
+ (
+ path,
+ pathOut.GetWriteBuf(sz),
+ sz
+ ) != 0;
+ pathOut.UngetWriteBuf();
}
+ if (ok)
+ return pathOut;
else
- if (format == wxPATH_UNIX)
+ 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__)
+ wxString path(GetFullPath());
+ wxString pathOut;
+ bool success = FALSE;
+
+#if 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 )
{
- ret = '/'; // FIXME: must be absolute
- for (size_t i = 0; i < m_dirs.GetCount(); i++)
+ s_triedToLoad = TRUE;
+
+ wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));
+ if ( 0 ) // dllKernel )
{
- ret += m_dirs[i];
- ret += '/';
+ // may succeed or fail depending on the Windows version
+#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;
+ }
+ }
+ }
}
}
- else
+ if (success)
+ return pathOut;
+#endif
+ // wxUSE_DYNLIB_CLASS
+
+ if (!success)
{
- for (size_t i = 0; i < m_dirs.GetCount(); i++)
+ // 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(GetName());
+
+ size_t count = dirs.GetCount();
+ size_t i;
+ wxString tmpPath;
+
+ for ( i = 0; i < count; i++ )
{
- ret += m_dirs[i];
- ret += ':';
+ // 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);
+ }
}
}
-
- ret += m_name;
-
- if (!m_ext.IsEmpty())
- {
- ret += '.';
- ret += m_ext;
- }
-
- return ret;
+ return pathOut;
+#else
+ return GetFullPath();
+#endif
}
wxPathFormat wxFileName::GetFormat( wxPathFormat format )
{
#if defined(__WXMSW__) || defined(__WXPM__)
format = wxPATH_DOS;
-#endif
-#if defined(__WXMAC__)
- format = wxPATH_MAC;
-#endif
-#if !defined(__WXMSW__) && !defined(__WXPM__) && !defined(__WXMAC__)
+#elif defined(__WXMAC__)
+ format = wxPATH_UNIX; // that's the way the rest of wx' code works right now
+#else
format = wxPATH_UNIX;
#endif
}
return format;
}
+// ----------------------------------------------------------------------------
+// path splitting function
+// ----------------------------------------------------------------------------
+
+void wxFileName::SplitPath(const wxString& fullpath,
+ wxString *pstrPath,
+ wxString *pstrName,
+ wxString *pstrExt,
+ wxPathFormat format)
+{
+ format = GetFormat(format);
+
+ // find the positions of the last dot and last path separator in the path
+ size_t posLastDot = fullpath.find_last_of(wxFILE_SEP_EXT);
+ size_t posLastSlash = fullpath.find_last_of(GetPathSeparators(format));
+
+ if ( (posLastDot != wxString::npos) && (format == wxPATH_UNIX) )
+ {
+ if ( (posLastDot == 0) ||
+ (fullpath[posLastDot - 1] == wxFILE_SEP_PATH_UNIX) )
+ {
+ // under Unix, dot may be (and commonly is) the first character of
+ // the filename, don't treat the entire filename as extension in
+ // this case
+ posLastDot = wxString::npos;
+ }
+ }
+
+ // 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;
+ }
+
+ // now fill in the variables provided by user
+ if ( pstrPath )
+ {
+ if ( posLastSlash == wxString::npos )
+ {
+ // no path at all
+ pstrPath->Empty();
+ }
+ else
+ {
+ // take all until the separator
+ *pstrPath = fullpath.Left(posLastSlash);
+ }
+ }
+
+ 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;
+ 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);
+ }
+
+ if ( pstrExt )
+ {
+ if ( posLastDot == wxString::npos )
+ {
+ // no extension
+ pstrExt->Empty();
+ }
+ else
+ {
+ // take everything after the dot
+ *pstrExt = fullpath.Mid(posLastDot + 1);
+ }
+ }
+}
projects / wxWidgets.git / blobdiff