// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
+/*
+ Here are brief descriptions of the filename formats supported by this class:
+
+ wxPATH_UNIX: standard Unix format, used under Darwin as well, absolute file
+ names have the form:
+ /dir1/dir2/.../dirN/filename, "." and ".." stand for the
+ current and parent directory respectively, "~" is parsed as the
+ user HOME and "~username" as the HOME of that user
+
+ wxPATH_DOS: DOS/Windows format, absolute file names have the form:
+ drive:\dir1\dir2\...\dirN\filename.ext where drive is a single
+ letter. "." and ".." as for Unix but no "~".
+
+ There are also UNC names of the form \\share\fullpath
+
+ wxPATH_MAC: Mac OS 8/9 and Mac OS X under CodeWarrior 7 format, absolute file
+ names have the form
+ volume:dir1:...:dirN:filename
+ and the relative file names are either
+ :dir1:...:dirN:filename
+ or just
+ filename
+ (although :filename works as well).
+ Since the volume is just part of the file path, it is not
+ treated like a separate entity as it is done under DOS and
+ VMS, it is just treated as another dir.
+
+ wxPATH_VMS: VMS native format, absolute file names have the form
+ <device>:[dir1.dir2.dir3]file.txt
+ or
+ <device>:[000000.dir1.dir2.dir3]file.txt
+
+ the <device> is the physical device (i.e. disk). 000000 is the
+ root directory on the device which can be omitted.
+
+ Note that VMS uses different separators unlike Unix:
+ : always after the device. If the path does not contain : than
+ the default (the device of the current directory) is assumed.
+ [ start of directory specyfication
+ . separator between directory and subdirectory
+ ] between directory and file
+ */
+
// ============================================================================
// declarations
// ============================================================================
// ----------------------------------------------------------------------------
#ifdef __GNUG__
- #pragma implementation "filename.h"
+#pragma implementation "filename.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
- #pragma hdrstop
+#pragma hdrstop
#endif
#ifndef WX_PRECOMP
- #include "wx/intl.h"
- #include "wx/log.h"
+#include "wx/intl.h"
+#include "wx/log.h"
+#include "wx/file.h"
#endif
#include "wx/filename.h"
#include "wx/tokenzr.h"
#include "wx/config.h" // for wxExpandEnvVars
#include "wx/utils.h"
-
-#if wxUSE_DYNLIB_CLASS
- #include "wx/dynlib.h"
-#endif
+#include "wx/file.h"
+//#include "wx/dynlib.h" // see GetLongPath below, code disabled.
// For GetShort/LongPathName
#ifdef __WIN32__
- #include <windows.h>
-
- #include "wx/msw/winundef.h"
+#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>
+#include <sys/types.h>
+#include <utime.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#endif
+
+#ifdef __DJGPP__
+#include <unistd.h>
#endif
#ifdef __MWERKS__
- #include <stat.h>
- #include <unistd.h>
- #include <unix.h>
+#include <stat.h>
+#include <unistd.h>
+#include <unix.h>
+#endif
+
+#ifdef __WATCOMC__
+#include <io.h>
+#include <sys/utime.h>
+#include <sys/stat.h>
+#endif
+
+#ifdef __VISAGECPP__
+#ifndef MAX_PATH
+#define MAX_PATH 256
+#endif
#endif
// ----------------------------------------------------------------------------
void wxFileName::Assign( const wxFileName &filepath )
{
- m_ext = filepath.GetExt();
- m_name = filepath.GetName();
+ m_volume = filepath.GetVolume();
m_dirs = filepath.GetDirs();
+ m_name = filepath.GetName();
+ m_ext = filepath.GetExt();
+ m_relative = filepath.IsRelative();
+}
+
+void wxFileName::Assign(const wxString& volume,
+ const wxString& path,
+ const wxString& name,
+ const wxString& ext,
+ wxPathFormat format )
+{
+ SetPath( path, format );
+
+ m_volume = volume;
+ m_ext = ext;
+ m_name = name;
}
-void wxFileName::Assign( const wxString& path,
- const wxString& name,
- const wxString& ext,
- wxPathFormat format )
+void wxFileName::SetPath( const wxString &path, wxPathFormat format )
{
- wxStringTokenizer tn(path, GetPathSeparators(format),
- wxTOKEN_RET_EMPTY_ALL);
- int i = 0;
+ wxPathFormat my_format = GetFormat( format );
+ wxString my_path = path;
+
m_dirs.Clear();
- while ( tn.HasMoreTokens() )
+
+ if (!my_path.empty())
{
- wxString token = tn.GetNextToken();
+ // 1) Determine if the path is relative or absolute.
+
+ switch (my_format)
+ {
+ case wxPATH_MAC:
+ m_relative = ( my_path[0u] == wxT(':') );
+ // We then remove a leading ":". The reason is in our
+ // storage form for relative paths:
+ // ":dir:file.txt" actually means "./dir/file.txt" in
+ // DOS notation and should get stored as
+ // (relative) (dir) (file.txt)
+ // "::dir:file.txt" actually means "../dir/file.txt"
+ // stored as (relative) (..) (dir) (file.txt)
+ // This is important only for the Mac as an empty dir
+ // actually means <UP>, whereas under DOS, double
+ // slashes can be ignored: "\\\\" is the same as "\\".
+ if (m_relative)
+ my_path.Remove( 0, 1 );
+ break;
+ case wxPATH_VMS:
+ // TODO: what is the relative path format here?
+ m_relative = FALSE;
+ break;
+ case wxPATH_UNIX:
+ m_relative = ( my_path[0u] != wxT('/') );
+ break;
+ case wxPATH_DOS:
+ m_relative = ( (my_path[0u] != wxT('/')) && (my_path[0u] != wxT('\\')) );
+ break;
+ default:
+ wxFAIL_MSG( wxT("error") );
+ break;
+ }
- // 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 );
+ // 2) Break up the path into its members. If the original path
+ // was just "/" or "\\", m_dirs will be empty. We know from
+ // the m_relative field, if this means "nothing" or "root dir".
- i ++;
- }
+ wxStringTokenizer tn( my_path, GetPathSeparators(my_format) );
- m_ext = ext;
- m_name = name;
+ while ( tn.HasMoreTokens() )
+ {
+ wxString token = tn.GetNextToken();
+
+ // Remove empty token under DOS and Unix, interpret them
+ // as .. under Mac.
+ if (token.empty())
+ {
+ if (my_format == wxPATH_MAC)
+ m_dirs.Add( wxT("..") );
+ // else ignore
+ }
+ else
+ {
+ m_dirs.Add( token );
+ }
+ }
+ }
+ else
+ {
+ m_relative = TRUE;
+ }
}
void wxFileName::Assign(const wxString& fullpath,
wxPathFormat format)
{
- wxString path, name, ext;
- SplitPath(fullpath, &path, &name, &ext, format);
+ wxString volume, path, name, ext;
+ SplitPath(fullpath, &volume, &path, &name, &ext, format);
- Assign(path, name, ext, format);
+ Assign(volume, path, name, ext, format);
}
-void wxFileName::Assign(const wxString& path,
+void wxFileName::Assign(const wxString& fullpathOrig,
const wxString& fullname,
wxPathFormat format)
{
- wxString name, ext;
+ // always recognize fullpath as directory, even if it doesn't end with a
+ // slash
+ wxString fullpath = fullpathOrig;
+ if ( !wxEndsWithPathSeparator(fullpath) )
+ {
+ fullpath += GetPathSeparators(format)[0u];
+ }
+
+ wxString volume, path, name, ext;
+
+ // do some consistency checks in debug mode: the name should be really just
+ // the filename and the path should be really just a path
+#ifdef __WXDEBUG__
+ wxString pathDummy, nameDummy, extDummy;
+
+ SplitPath(fullname, &pathDummy, &name, &ext, format);
+
+ wxASSERT_MSG( pathDummy.empty(),
+ _T("the file name shouldn't contain the path") );
+
+ SplitPath(fullpath, &volume, &path, &nameDummy, &extDummy, format);
+
+ wxASSERT_MSG( nameDummy.empty() && extDummy.empty(),
+ _T("the path shouldn't contain file name nor extension") );
+
+#else // !__WXDEBUG__
SplitPath(fullname, NULL /* no path */, &name, &ext, format);
+ SplitPath(fullpath, &volume, &path, NULL, NULL, format);
+#endif // __WXDEBUG__/!__WXDEBUG__
- Assign(path, name, ext, format);
+ Assign(volume, path, name, ext, format);
+}
+
+void wxFileName::AssignDir(const wxString& dir, wxPathFormat format)
+{
+ Assign(dir, _T(""), format);
}
void wxFileName::Clear()
{
m_dirs.Clear();
+
+ m_volume =
m_name =
m_ext = wxEmptyString;
}
// CWD and HOME stuff
// ----------------------------------------------------------------------------
-void wxFileName::AssignCwd()
+void wxFileName::AssignCwd(const wxString& volume)
{
- AssignDir(wxFileName::GetCwd());
+ AssignDir(wxFileName::GetCwd(volume));
}
/* static */
-wxString wxFileName::GetCwd()
+wxString wxFileName::GetCwd(const wxString& volume)
{
- return ::wxGetCwd();
+ // if we have the volume, we must get the current directory on this drive
+ // and to do this we have to chdir to this volume - at least under Windows,
+ // I don't know how to get the current drive on another volume elsewhere
+ // (TODO)
+ wxString cwdOld;
+ if ( !volume.empty() )
+ {
+ cwdOld = wxGetCwd();
+ SetCwd(volume + GetVolumeSeparator());
+ }
+
+ wxString cwd = ::wxGetCwd();
+
+ if ( !volume.empty() )
+ {
+ SetCwd(cwdOld);
+ }
+
+ return cwd;
}
bool wxFileName::SetCwd()
return ::wxGetHomeDir();
}
-void wxFileName::AssignTempFileName( const wxString &prefix )
+void wxFileName::AssignTempFileName(const wxString& prefix, wxFile *fileTemp)
{
- wxString fullname;
- if ( wxGetTempFileName(prefix, fullname) )
+ wxString tempname = CreateTempFileName(prefix, fileTemp);
+ if ( tempname.empty() )
{
- Assign(fullname);
+ // error, failed to get temp file name
+ Clear();
}
- else // error
+ else // ok
{
- Clear();
+ Assign(tempname);
+ }
+}
+
+/* static */
+wxString
+wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp)
+{
+ wxString path, dir, name;
+
+ // use the directory specified by the prefix
+ SplitPath(prefix, &dir, &name, NULL /* extension */);
+
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
+
+#ifdef __WIN32__
+ if ( dir.empty() )
+ {
+ if ( !::GetTempPath(MAX_PATH, wxStringBuffer(dir, MAX_PATH + 1)) )
+ {
+ wxLogLastError(_T("GetTempPath"));
+ }
+
+ if ( dir.empty() )
+ {
+ // GetTempFileName() fails if we pass it an empty string
+ dir = _T('.');
+ }
+ }
+
+ if ( !::GetTempFileName(dir, name, 0, wxStringBuffer(path, MAX_PATH + 1)) )
+ {
+ wxLogLastError(_T("GetTempFileName"));
+
+ path.clear();
+ }
+#else // Win16
+ if ( !::GetTempFileName(NULL, prefix, 0, wxStringBuffer(path, 1025)) )
+ {
+ path.clear();
+ }
+#endif // Win32/16
+
+#elif defined(__WXPM__)
+ // for now just create a file
+ //
+ // future enhancements can be to set some extended attributes for file
+ // systems OS/2 supports that have them (HPFS, FAT32) and security
+ // (HPFS386)
+ static const wxChar *szMktempSuffix = wxT("XXX");
+ path << dir << _T('/') << name << szMktempSuffix;
+
+ // Temporarily remove - MN
+ #ifndef __WATCOMC__
+ ::DosCreateDir(wxStringBuffer(path, MAX_PATH), NULL);
+ #endif
+
+#else // !Windows, !OS/2
+ if ( dir.empty() )
+ {
+ dir = wxGetenv(_T("TMP"));
+ if ( path.empty() )
+ {
+ dir = wxGetenv(_T("TEMP"));
+ }
+
+ if ( dir.empty() )
+ {
+ // default
+ #ifdef __DOS__
+ dir = _T(".");
+ #else
+ dir = _T("/tmp");
+ #endif
+ }
+ }
+
+ path = dir;
+
+ if ( !wxEndsWithPathSeparator(dir) &&
+ (name.empty() || !wxIsPathSeparator(name[0u])) )
+ {
+ path += wxFILE_SEP_PATH;
+ }
+
+ path += name;
+
+#if defined(HAVE_MKSTEMP)
+ // scratch space for mkstemp()
+ path += _T("XXXXXX");
+
+ // can use the cast here because the length doesn't change and the string
+ // is not shared
+ int fdTemp = mkstemp((char *)path.mb_str());
+ if ( fdTemp == -1 )
+ {
+ // this might be not necessary as mkstemp() on most systems should have
+ // already done it but it doesn't hurt neither...
+ path.clear();
+ }
+ else // mkstemp() succeeded
+ {
+ // avoid leaking the fd
+ if ( fileTemp )
+ {
+ fileTemp->Attach(fdTemp);
+ }
+ else
+ {
+ close(fdTemp);
+ }
+ }
+#else // !HAVE_MKSTEMP
+
+#ifdef HAVE_MKTEMP
+ // same as above
+ path += _T("XXXXXX");
+
+ if ( !mktemp((char *)path.mb_str()) )
+ {
+ path.clear();
+ }
+#else // !HAVE_MKTEMP (includes __DOS__)
+ // generate the unique file name ourselves
+ #ifndef __DOS__
+ path << (unsigned int)getpid();
+ #endif
+
+ wxString pathTry;
+
+ static const size_t numTries = 1000;
+ for ( size_t n = 0; n < numTries; n++ )
+ {
+ // 3 hex digits is enough for numTries == 1000 < 4096
+ pathTry = path + wxString::Format(_T("%.03x"), n);
+ if ( !wxFile::Exists(pathTry) )
+ {
+ break;
+ }
+
+ pathTry.clear();
+ }
+
+ path = pathTry;
+#endif // HAVE_MKTEMP/!HAVE_MKTEMP
+
+ if ( !path.empty() )
+ {
+ }
+#endif // HAVE_MKSTEMP/!HAVE_MKSTEMP
+
+#endif // Windows/!Windows
+
+ if ( path.empty() )
+ {
+ wxLogSysError(_("Failed to create a temporary file name"));
+ }
+ else if ( fileTemp && !fileTemp->IsOpened() )
+ {
+ // open the file - of course, there is a race condition here, this is
+ // why we always prefer using mkstemp()...
+ //
+ // NB: GetTempFileName() under Windows creates the file, so using
+ // write_excl there would fail
+ if ( !fileTemp->Open(path,
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
+ wxFile::write,
+#else
+ wxFile::write_excl,
+#endif
+ wxS_IRUSR | wxS_IWUSR) )
+ {
+ // FIXME: If !ok here should we loop and try again with another
+ // file name? That is the standard recourse if open(O_EXCL)
+ // fails, though of course it should be protected against
+ // possible infinite looping too.
+
+ wxLogError(_("Failed to open temporary file."));
+
+ path.clear();
+ }
}
+
+ return path;
}
// ----------------------------------------------------------------------------
format = GetFormat(format);
// make the path absolute
- if ( (flags & wxPATH_NORM_ABSOLUTE) && !IsAbsolute() )
+ if ( (flags & wxPATH_NORM_ABSOLUTE) && m_relative )
{
if ( cwd.empty() )
- curDir.AssignCwd();
- else
+ {
+ curDir.AssignCwd(GetVolume());
+ }
+ else // cwd provided
+ {
curDir.AssignDir(cwd);
+ }
+
+#if 0
+ // the path may be not absolute because it doesn't have the volume name
+ // but in this case we shouldn't modify the directory components of it
+ // but just set the current volume
+ if ( !HasVolume() && curDir.HasVolume() )
+ {
+ SetVolume(curDir.GetVolume());
+
+ if ( IsAbsolute() )
+ {
+ // yes, it was the case - we don't need curDir then
+ curDir.Clear();
+ }
+ }
+#endif
+ m_relative = FALSE;
}
// handle ~ stuff under Unix only
}
}
+ // transform relative path into abs one
if ( curDir.IsOk() )
{
wxArrayString dirsNew = curDir.GetDirs();
{
wxString dir = dirs[n];
- if ( flags && wxPATH_NORM_DOTS )
+ if ( flags & wxPATH_NORM_DOTS )
{
if ( dir == wxT(".") )
{
return FALSE;
}
- m_dirs.Remove(m_dirs.GetCount() - 1);
+ m_dirs.RemoveAt(m_dirs.GetCount() - 1);
continue;
}
}
m_ext.MakeLower();
}
-#if defined(__WXMSW__) && defined(__WIN32__)
- if (flags & wxPATH_NORM_LONG)
+#if defined(__WIN32__)
+ if ( (flags & wxPATH_NORM_LONG) && (format == wxPATH_DOS) )
{
Assign(GetLongPath());
}
-#endif
+#endif // Win32
+
+ return TRUE;
+}
+
+bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format)
+{
+ wxFileName fnBase(pathBase, format);
+
+ // get cwd only once - small time saving
+ wxString cwd = wxGetCwd();
+ Normalize(wxPATH_NORM_ALL, cwd, format);
+ fnBase.Normalize(wxPATH_NORM_ALL, cwd, format);
+
+ bool withCase = IsCaseSensitive(format);
+
+ // we can't do anything if the files live on different volumes
+ if ( !GetVolume().IsSameAs(fnBase.GetVolume(), withCase) )
+ {
+ // nothing done
+ return FALSE;
+ }
+
+ // same drive, so we don't need our volume
+ m_volume.clear();
+
+ // remove common directories starting at the top
+ while ( !m_dirs.IsEmpty() && !fnBase.m_dirs.IsEmpty() &&
+ m_dirs[0u].IsSameAs(fnBase.m_dirs[0u], withCase) )
+ {
+ m_dirs.RemoveAt(0);
+ fnBase.m_dirs.RemoveAt(0);
+ }
+
+ // add as many ".." as needed
+ size_t count = fnBase.m_dirs.GetCount();
+ for ( size_t i = 0; i < count; i++ )
+ {
+ m_dirs.Insert(wxT(".."), 0u);
+ }
+ m_relative = TRUE;
+
+ // we were modified
return TRUE;
}
// filename kind tests
// ----------------------------------------------------------------------------
-bool wxFileName::SameAs( const wxFileName &filepath, wxPathFormat format)
+bool wxFileName::SameAs(const wxFileName &filepath, wxPathFormat format)
{
wxFileName fn1 = *this,
fn2 = filepath;
/* static */
bool wxFileName::IsCaseSensitive( wxPathFormat format )
{
- // only DOS and OpenVMS filenames are case-sensitive
- return GetFormat(format) != wxPATH_DOS && GetFormat(format) != wxPATH_VMS;
+ // only Unix filenames are truely case-sensitive
+ return GetFormat(format) == wxPATH_UNIX;
}
-bool wxFileName::IsRelative( wxPathFormat format )
+/* static */
+wxString wxFileName::GetVolumeSeparator(wxPathFormat format)
{
- return !IsAbsolute(format);
-}
+ wxString sepVol;
-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('~') );
+ if ( (GetFormat(format) == wxPATH_DOS) ||
+ (GetFormat(format) == wxPATH_VMS) )
+ {
+ sepVol = wxFILE_SEP_DSK;
+ }
+ //else: leave empty
+
+ return sepVol;
}
/* static */
switch ( GetFormat(format) )
{
case wxPATH_DOS:
- // accept both as native APIs do
- seps << wxFILE_SEP_PATH_UNIX << wxFILE_SEP_PATH_DOS;
+ // accept both as native APIs do but put the native one first as
+ // this is the one we use in GetFullPath()
+ seps << wxFILE_SEP_PATH_DOS << wxFILE_SEP_PATH_UNIX;
break;
default:
case wxPATH_MAC:
seps = wxFILE_SEP_PATH_MAC;
break;
-
+
case wxPATH_VMS:
seps = wxFILE_SEP_PATH_VMS;
break;
/* static */
bool wxFileName::IsPathSeparator(wxChar ch, wxPathFormat format)
{
+ // wxString::Find() doesn't work as expected with NUL - it will always find
+ // it, so it is almost surely a bug if this function is called with NUL arg
+ wxASSERT_MSG( ch != _T('\0'), _T("shouldn't be called with NUL") );
+
return GetPathSeparators(format).Find(ch) != wxNOT_FOUND;
}
{
// FIXME: this is probably false for Mac and this is surely wrong for most
// of Unix shells (think about "[...]")
- (void)format;
+ (void)format;
return m_name.find_first_of(_T("*?")) != wxString::npos;
}
{
format = GetFormat( format );
- wxString ret;
- size_t count = m_dirs.GetCount();
- for ( size_t i = 0; i < count; i++ )
+ wxString fullpath;
+
+ // the leading character
+ if ( format == wxPATH_MAC && m_relative )
+ {
+ fullpath += wxFILE_SEP_PATH_MAC;
+ }
+ else if ( format == wxPATH_DOS )
+ {
+ if (!m_relative)
+ fullpath += wxFILE_SEP_PATH_DOS;
+ }
+ else if ( format == wxPATH_UNIX )
{
- ret += m_dirs[i];
- if ( add_separator || (i < count) )
- ret += wxFILE_SEP_PATH;
+ if (!m_relative)
+ fullpath += wxFILE_SEP_PATH_UNIX;
+ }
+
+ // then concatenate all the path components using the path separator
+ size_t dirCount = m_dirs.GetCount();
+ if ( dirCount )
+ {
+ if ( format == wxPATH_VMS )
+ {
+ fullpath += wxT('[');
+ }
+
+
+ for ( size_t i = 0; i < dirCount; i++ )
+ {
+ // TODO: What to do with ".." under VMS
+
+ switch (format)
+ {
+ case wxPATH_MAC:
+ {
+ if (m_dirs[i] == wxT("."))
+ break;
+ if (m_dirs[i] != wxT("..")) // convert back from ".." to nothing
+ fullpath += m_dirs[i];
+ fullpath += wxT(':');
+ break;
+ }
+ case wxPATH_DOS:
+ {
+ fullpath += m_dirs[i];
+ fullpath += wxT('\\');
+ break;
+ }
+ case wxPATH_UNIX:
+ {
+ fullpath += m_dirs[i];
+ fullpath += wxT('/');
+ break;
+ }
+ case wxPATH_VMS:
+ {
+ if (m_dirs[i] != wxT("..")) // convert back from ".." to nothing
+ fullpath += m_dirs[i];
+ if (i == dirCount-1)
+ fullpath += wxT(']');
+ else
+ fullpath += wxT('.');
+ break;
+ }
+ default:
+ {
+ wxFAIL_MSG( wxT("error") );
+ }
+ }
+ }
}
- return ret;
+
+
+ return fullpath;
}
wxString wxFileName::GetFullPath( wxPathFormat format ) const
{
- format = GetFormat( format );
-
- wxString ret;
- if (format == wxPATH_DOS)
+ format = GetFormat(format);
+
+ wxString fullpath;
+
+ // first put the volume
+ if ( !m_volume.empty() )
{
- for (size_t i = 0; i < m_dirs.GetCount(); i++)
{
- ret += m_dirs[i];
- ret += '\\';
+ // Special Windows UNC paths hack, part 2: undo what we did in
+ // SplitPath() and make an UNC path if we have a drive which is not a
+ // single letter (hopefully the network shares can't be one letter only
+ // although I didn't find any authoritative docs on this)
+ if ( format == wxPATH_DOS && m_volume.length() > 1 )
+ {
+ fullpath << wxFILE_SEP_PATH_DOS << wxFILE_SEP_PATH_DOS << m_volume;
+ }
+ else if ( format == wxPATH_DOS || format == wxPATH_VMS )
+ {
+ fullpath << m_volume << GetVolumeSeparator(format);
+ }
+ // else ignore
}
}
- else
- if (format == wxPATH_UNIX)
+
+ // the leading character
+ if ( format == wxPATH_MAC && m_relative )
{
- for (size_t i = 0; i < m_dirs.GetCount(); i++)
- {
- ret += m_dirs[i];
- ret += '/';
- }
+ fullpath += wxFILE_SEP_PATH_MAC;
}
- else
- if (format == wxPATH_VMS)
+ else if ( format == wxPATH_DOS )
{
- ret += '[';
- for (size_t i = 0; i < m_dirs.GetCount(); i++)
- {
- ret += '.';
- ret += m_dirs[i];
- }
- ret += ']';
+ if (!m_relative)
+ fullpath += wxFILE_SEP_PATH_DOS;
}
- else
+ else if ( format == wxPATH_UNIX )
{
- for (size_t i = 0; i < m_dirs.GetCount(); i++)
- {
- ret += m_dirs[i];
- ret += ':';
- }
+ if (!m_relative)
+ fullpath += wxFILE_SEP_PATH_UNIX;
}
-
- ret += m_name;
-
- if (!m_ext.IsEmpty())
+
+ // then concatenate all the path components using the path separator
+ size_t dirCount = m_dirs.GetCount();
+ if ( dirCount )
{
- ret += '.';
- ret += m_ext;
+ if ( format == wxPATH_VMS )
+ {
+ fullpath += wxT('[');
+ }
+
+
+ for ( size_t i = 0; i < dirCount; i++ )
+ {
+ // TODO: What to do with ".." under VMS
+
+ switch (format)
+ {
+ case wxPATH_MAC:
+ {
+ if (m_dirs[i] == wxT("."))
+ break;
+ if (m_dirs[i] != wxT("..")) // convert back from ".." to nothing
+ fullpath += m_dirs[i];
+ fullpath += wxT(':');
+ break;
+ }
+ case wxPATH_DOS:
+ {
+ fullpath += m_dirs[i];
+ fullpath += wxT('\\');
+ break;
+ }
+ case wxPATH_UNIX:
+ {
+ fullpath += m_dirs[i];
+ fullpath += wxT('/');
+ break;
+ }
+ case wxPATH_VMS:
+ {
+ if (m_dirs[i] != wxT("..")) // convert back from ".." to nothing
+ fullpath += m_dirs[i];
+ if (i == dirCount-1)
+ fullpath += wxT(']');
+ else
+ fullpath += wxT('.');
+ break;
+ }
+ default:
+ {
+ wxFAIL_MSG( wxT("error") );
+ }
+ }
+ }
}
-
- return ret;
+
+ // finally add the file name and extension
+ fullpath += GetFullName();
+
+ return fullpath;
}
// Return the short form of the path (returns identity on non-Windows platforms)
// 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;
+ wxString pathOut,
+ path = GetFullPath();
+
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)
bool success = FALSE;
// VZ: this code was disabled, why?
-#if 0 // wxUSE_DYNLIB_CLASS
+#if 0 // wxUSE_DYNAMIC_LOADER
typedef DWORD (*GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD);
static bool s_triedToLoad = FALSE;
if ( dllKernel )
{
// may succeed or fail depending on the Windows version
- static GET_LONG_PATH_NAME s_pfnGetLongPathName = NULL;
+ static GET_LONG_PATH_NAME s_pfnGetLongPathName = NULL;
#ifdef _UNICODE
s_pfnGetLongPathName = (GET_LONG_PATH_NAME) wxDllLoader::GetSymbol(dllKernel, _T("GetLongPathNameW"));
#else
}
if (success)
return pathOut;
-#endif // wxUSE_DYNLIB_CLASS
+#endif // wxUSE_DYNAMIC_LOADER
if (!success)
{
wxArrayString dirs = GetDirs();
dirs.Add(GetFullName());
- size_t count = dirs.GetCount();
- size_t i;
wxString tmpPath;
- for ( i = 0; i < count; i++ )
+ size_t count = dirs.GetCount();
+ for ( size_t 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
+ // 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(':'))
+ if ( tmpPath.empty() )
+ continue;
+
+ if ( tmpPath.Last() == wxT(':') )
{
// Can't pass a drive and root dir to FindFirstFile,
// so continue to next dir
// Error: return immediately with the original path
return path;
}
- else
- {
- pathOut += findFileData.cFileName;
- if ( (i < (count-1)) )
- pathOut += wxFILE_SEP_PATH;
- ::FindClose(hFind);
- }
+ pathOut += findFileData.cFileName;
+ if ( (i < (count-1)) )
+ pathOut += wxFILE_SEP_PATH;
+
+ ::FindClose(hFind);
}
}
+#else // !Win32
+ pathOut = path;
+#endif // Win32/!Win32
return pathOut;
-#else
- return GetFullPath();
-#endif
}
wxPathFormat wxFileName::GetFormat( wxPathFormat format )
{
if (format == wxPATH_NATIVE)
{
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WXMSW__) || defined(__WXPM__) || defined(__DOS__)
format = wxPATH_DOS;
#elif defined(__WXMAC__) && !defined(__DARWIN__)
- format = wxPATH_MAC;
+ format = wxPATH_MAC;
#elif defined(__VMS)
- format = wxPATH_VMS;
+ format = wxPATH_VMS;
#else
format = wxPATH_UNIX;
#endif
// path splitting function
// ----------------------------------------------------------------------------
-void wxFileName::SplitPath(const wxString& fullpath,
+/* static */
+void wxFileName::SplitPath(const wxString& fullpathWithVolume,
+ wxString *pstrVolume,
wxString *pstrPath,
wxString *pstrName,
wxString *pstrExt,
{
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));
+ wxString fullpath = fullpathWithVolume;
+
+ // under VMS the end of the path is ']', not the path separator used to
+ // separate the components
+ wxString sepPath = format == wxPATH_VMS ? wxString(_T(']'))
+ : GetPathSeparators(format);
- if ( (posLastDot != wxString::npos) && (format == wxPATH_UNIX) )
+ // special Windows UNC paths hack: transform \\share\path into share:path
+ if ( format == wxPATH_DOS )
{
- if ( (posLastDot == 0) ||
- (fullpath[posLastDot - 1] == wxFILE_SEP_PATH_UNIX) )
+ if ( fullpath.length() >= 4 &&
+ fullpath[0u] == wxFILE_SEP_PATH_DOS &&
+ fullpath[1u] == wxFILE_SEP_PATH_DOS )
{
- // 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;
+ fullpath.erase(0, 2);
+
+ size_t posFirstSlash = fullpath.find_first_of(sepPath);
+ if ( posFirstSlash != wxString::npos )
+ {
+ fullpath[posFirstSlash] = wxFILE_SEP_DSK;
+
+ // UNC paths are always absolute, right? (FIXME)
+ fullpath.insert(posFirstSlash + 1, wxFILE_SEP_PATH_DOS);
+ }
}
}
- else
- if ( (posLastDot != wxString::npos) && (format == wxPATH_VMS) )
+
+ // We separate the volume here
+ if ( format == wxPATH_DOS || format == wxPATH_VMS )
+ {
+ wxString sepVol = GetVolumeSeparator(format);
+
+ size_t posFirstColon = fullpath.find_first_of(sepVol);
+ if ( posFirstColon != wxString::npos )
+ {
+ if ( pstrVolume )
+ {
+ *pstrVolume = fullpath.Left(posFirstColon);
+ }
+
+ // remove the volume name and the separator from the full path
+ fullpath.erase(0, posFirstColon + sepVol.length());
+ }
+ }
+
+ // 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(sepPath);
+
+ if ( (posLastDot != wxString::npos) &&
+ ((format == wxPATH_UNIX) || (format == wxPATH_VMS)) )
{
if ( (posLastDot == 0) ||
- (fullpath[posLastDot - 1] == ']' ) )
+ (fullpath[posLastDot - 1] == sepPath[0u] ) )
{
- // under OpenVMS, dot may be (and commonly is) the first character of
- // the filename, don't treat the entire filename as extension in
- // this case
+ // under Unix and VMS, 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;
}
}
}
else
{
- // take all until the separator
- *pstrPath = fullpath.Left(posLastSlash);
+ // take everything up to the path separator but take care to make
+ // the path equal to something like '/', not empty, for the files
+ // immediately under root directory
+ size_t len = posLastSlash;
+ if ( !len )
+ len++;
+
+ *pstrPath = fullpath.Left(len);
+
+ // special VMS hack: remove the initial bracket
+ if ( format == wxPATH_VMS )
+ {
+ if ( (*pstrPath)[0u] == _T('[') )
+ pstrPath->erase(0, 1);
+ }
}
}
}
}
+/* static */
+void wxFileName::SplitPath(const wxString& fullpath,
+ wxString *path,
+ wxString *name,
+ wxString *ext,
+ wxPathFormat format)
+{
+ wxString volume;
+ SplitPath(fullpath, &volume, path, name, ext, format);
+
+ if ( path && !volume.empty() )
+ {
+ path->Prepend(volume + GetVolumeSeparator(format));
+ }
+}
+
// ----------------------------------------------------------------------------
// time functions
// ----------------------------------------------------------------------------
const wxDateTime *dtAccess,
const wxDateTime *dtMod)
{
-#if defined(__UNIX_LIKE__)
+#if defined(__UNIX_LIKE__) || (defined(__DOS__) && defined(__WATCOMC__))
if ( !dtAccess && !dtMod )
{
// can't modify the creation time anyhow, don't try
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(__WXMAC__)
+#if defined(__UNIX_LIKE__) || defined(__WXMAC__) || (defined(__DOS__) && defined(__WATCOMC__))
wxStructStat stBuf;
if ( wxStat(GetFullPath(), &stBuf) == 0 )
{
projects / wxWidgets.git / blobdiff