// Created: 28.12.2000
// RCS-ID: $Id$
// Copyright: (c) 2000 Robert Roebling
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/*
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "filename.h"
#endif
#include "wx/config.h" // for wxExpandEnvVars
#include "wx/utils.h"
#include "wx/file.h"
-//#include "wx/dynlib.h" // see GetLongPath below, code disabled.
+#include "wx/dynlib.h"
// For GetShort/LongPathName
#ifdef __WIN32__
-#include <windows.h>
-#include "wx/msw/winundef.h"
+#include "wx/msw/wrapwin.h"
+#endif
+
+#ifdef __WXWINCE__
+#include "wx/msw/private.h"
#endif
#if defined(__WXMAC__)
#endif
#ifdef __MWERKS__
+#ifdef __MACH__
+#include <sys/types.h>
+#include <utime.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#else
#include <stat.h>
#include <unistd.h>
#include <unix.h>
#endif
+#endif
#ifdef __WATCOMC__
#include <io.h>
#endif
#endif
+#ifdef __EMX__
+#include <os2.h>
+#define MAX_PATH _MAX_PATH
+#endif
+
// ----------------------------------------------------------------------------
// private classes
// ----------------------------------------------------------------------------
class wxFileHandle
{
public:
- wxFileHandle(const wxString& filename)
+ enum OpenMode
+ {
+ Read,
+ Write
+ };
+
+ wxFileHandle(const wxString& filename, OpenMode mode)
{
m_hFile = ::CreateFile
(
- filename, // name
- GENERIC_READ, // access mask
- 0, // no sharing
- NULL, // no secutity attr
- OPEN_EXISTING, // creation disposition
- 0, // no flags
- NULL // no template file
+ filename, // name
+ mode == Read ? GENERIC_READ // access mask
+ : GENERIC_WRITE,
+ 0, // no sharing
+ NULL, // no secutity attr
+ OPEN_EXISTING, // creation disposition
+ 0, // no flags
+ NULL // no template file
);
if ( m_hFile == INVALID_HANDLE_VALUE )
{
- wxLogSysError(_("Failed to open '%s' for reading"),
- filename.c_str());
+ wxLogSysError(_("Failed to open '%s' for %s"),
+ filename.c_str(),
+ mode == Read ? _("reading") : _("writing"));
}
}
}
}
- // 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
// private functions
// ----------------------------------------------------------------------------
-#if defined(__WIN32__) && !defined(__WXMICROWIN__)
+#if wxUSE_DATETIME && defined(__WIN32__) && !defined(__WXMICROWIN__)
// convert between wxDateTime and FILETIME which is a 64-bit value representing
// the number of 100-nanosecond intervals since January 1, 1601.
-// the number of milliseconds between the Unix Epoch (January 1, 1970) and the
-// FILETIME reference point (January 1, 1601)
-static const wxLongLong FILETIME_EPOCH_OFFSET = wxLongLong(0xa97, 0x30b66800);
-
static void ConvertFileTimeToWx(wxDateTime *dt, const FILETIME &ft)
{
- wxLongLong ll(ft.dwHighDateTime, ft.dwLowDateTime);
-
- // convert 100ns to ms
- ll /= 10000;
+ FILETIME ftcopy = ft;
+ FILETIME ftLocal;
+ if ( !::FileTimeToLocalFileTime(&ftcopy, &ftLocal) )
+ {
+ wxLogLastError(_T("FileTimeToLocalFileTime"));
+ }
- // move it to our Epoch
- ll -= FILETIME_EPOCH_OFFSET;
+ SYSTEMTIME st;
+ if ( !::FileTimeToSystemTime(&ftLocal, &st) )
+ {
+ wxLogLastError(_T("FileTimeToSystemTime"));
+ }
- *dt = wxDateTime(ll);
+ dt->Set(st.wDay, wxDateTime::Month(st.wMonth - 1), st.wYear,
+ st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
}
static void ConvertWxToFileTime(FILETIME *ft, const wxDateTime& dt)
{
- // do the reverse of ConvertFileTimeToWx()
- wxLongLong ll = dt.GetValue();
- ll *= 10000;
- ll += FILETIME_EPOCH_OFFSET;
+ SYSTEMTIME st;
+ st.wDay = dt.GetDay();
+ st.wMonth = dt.GetMonth() + 1;
+ st.wYear = dt.GetYear();
+ st.wHour = dt.GetHour();
+ st.wMinute = dt.GetMinute();
+ st.wSecond = dt.GetSecond();
+ st.wMilliseconds = dt.GetMillisecond();
+
+ FILETIME ftLocal;
+ if ( !::SystemTimeToFileTime(&st, &ftLocal) )
+ {
+ wxLogLastError(_T("SystemTimeToFileTime"));
+ }
- ft->dwHighDateTime = ll.GetHi();
- ft->dwLowDateTime = ll.GetLo();
+ if ( !::LocalFileTimeToFileTime(&ftLocal, ft) )
+ {
+ wxLogLastError(_T("LocalFileTimeToFileTime"));
+ }
}
-#endif // __WIN32__
+#endif // wxUSE_DATETIME && __WIN32__
+
+// return a string with the volume par
+static wxString wxGetVolumeString(const wxString& volume, wxPathFormat format)
+{
+ wxString path;
+
+ if ( !volume.empty() )
+ {
+ format = wxFileName::GetFormat(format);
+
+ // 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 && volume.length() > 1 )
+ {
+ path << wxFILE_SEP_PATH_DOS << wxFILE_SEP_PATH_DOS << volume;
+ }
+ else if ( format == wxPATH_DOS || format == wxPATH_VMS )
+ {
+ path << volume << wxFileName::GetVolumeSeparator(format);
+ }
+ // else ignore
+ }
+
+ return path;
+}
// ============================================================================
// implementation
m_dirs = filepath.GetDirs();
m_name = filepath.GetName();
m_ext = filepath.GetExt();
- m_relative = filepath.IsRelative();
+ m_relative = filepath.m_relative;
}
void wxFileName::Assign(const wxString& volume,
void wxFileName::SetPath( const wxString &path, wxPathFormat format )
{
- wxPathFormat my_format = GetFormat( format );
- wxString my_path = path;
-
m_dirs.Clear();
- if (!my_path.empty())
+ if ( !path.empty() )
{
+ wxPathFormat my_format = GetFormat( format );
+ wxString my_path = path;
+
// 1) Determine if the path is relative or absolute.
+ wxChar leadingChar = my_path[0u];
switch (my_format)
{
case wxPATH_MAC:
- m_relative = ( my_path[0u] == wxT(':') );
+ m_relative = leadingChar == 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
// actually means <UP>, whereas under DOS, double
// slashes can be ignored: "\\\\" is the same as "\\".
if (m_relative)
- my_path.Remove( 0, 1 );
+ my_path.erase( 0, 1 );
break;
+
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:
- m_relative = ( my_path[0u] != wxT('/') );
+ // the paths of the form "~" or "~username" are absolute
+ m_relative = leadingChar != wxT('/') && leadingChar != _T('~');
break;
+
case wxPATH_DOS:
- m_relative = ( (my_path[0u] != wxT('/')) && (my_path[0u] != wxT('\\')) );
- break;
- default:
- wxFAIL_MSG( wxT("error") );
+ m_relative = !IsPathSeparator(leadingChar, my_format);
break;
+
}
// 2) Break up the path into its members. If the original path
}
}
}
- else
+ else // no path at all
{
- m_relative = TRUE;
+ m_relative = true;
}
}
wxString fullpath = fullpathOrig;
if ( !wxEndsWithPathSeparator(fullpath) )
{
- fullpath += GetPathSeparators(format)[0u];
+ fullpath += GetPathSeparator(format);
}
wxString volume, path, name, ext;
m_volume =
m_name =
m_ext = wxEmptyString;
+
+ // we don't have any absolute path for now
+ 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;
}
// existence tests
// ----------------------------------------------------------------------------
-bool wxFileName::FileExists()
+bool wxFileName::FileExists() const
{
return wxFileName::FileExists( GetFullPath() );
}
return ::wxFileExists( file );
}
-bool wxFileName::DirExists()
+bool wxFileName::DirExists() const
{
return wxFileName::DirExists( GetFullPath() );
}
// 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() )
{
if ( !::GetTempPath(MAX_PATH, wxStringBuffer(dir, MAX_PATH + 1)) )
dir = _T('.');
}
}
+ else // we have a dir to create the file in
+ {
+ // ensure we use only the back slashes as GetTempFileName(), unlike all
+ // the other APIs, is picky and doesn't accept the forward ones
+ dir.Replace(_T("/"), _T("\\"));
+ }
if ( !::GetTempFileName(dir, name, 0, wxStringBuffer(path, MAX_PATH + 1)) )
{
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
+#else // !Windows
if ( dir.empty() )
{
#if defined(__WXMAC__) && !defined(__DARWIN__)
if ( dir.empty() )
{
// default
- #ifdef __DOS__
+ #if defined(__DOS__) || defined(__OS2__)
dir = _T(".");
#else
dir = _T("/tmp");
// 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());
+ // we need to copy the path to the buffer in which mkstemp() can modify it
+ wxCharBuffer buf( wxConvFile.cWX2MB( path ) );
+
+ // cast is safe because the string length doesn't change
+ int fdTemp = mkstemp( (char*)(const char*) buf );
if ( fdTemp == -1 )
{
// this might be not necessary as mkstemp() on most systems should have
}
else // mkstemp() succeeded
{
+ path = wxConvFile.cMB2WX( (const char*) buf );
+
// avoid leaking the fd
if ( fileTemp )
{
// same as above
path += _T("XXXXXX");
- if ( !mktemp((char *)path.mb_str()) )
+ wxCharBuffer buf = wxConvFile.cWX2MB( path );
+ if ( !mktemp( (const char*) buf ) )
{
path.clear();
}
+ else
+ {
+ path = wxConvFile.cMB2WX( (const char*) buf );
+ }
#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
for ( size_t n = 0; n < numTries; n++ )
{
// 3 hex digits is enough for numTries == 1000 < 4096
- pathTry = path + wxString::Format(_T("%.03x"), n);
+ pathTry = path + wxString::Format(_T("%.03x"), (unsigned int) n);
if ( !wxFile::Exists(pathTry) )
{
break;
// directory operations
// ----------------------------------------------------------------------------
-bool wxFileName::Mkdir( int perm, bool full )
+bool wxFileName::Mkdir( int perm, int flags )
{
- return wxFileName::Mkdir( GetFullPath(), perm, full );
+ return wxFileName::Mkdir( GetFullPath(), perm, flags );
}
-bool wxFileName::Mkdir( const wxString &dir, int perm, bool full )
+bool wxFileName::Mkdir( const wxString& dir, int perm, int flags )
{
- if (full)
+ if ( flags & wxPATH_MKDIR_FULL )
{
- wxFileName filename(dir);
- wxArrayString dirs = filename.GetDirs();
- dirs.Add(filename.GetName());
+ // split the path in components
+ wxFileName filename;
+ filename.AssignDir(dir);
- size_t count = dirs.GetCount();
- size_t i;
wxString currPath;
- int noErrors = 0;
- for ( i = 0; i < count; i++ )
+ if ( filename.HasVolume())
{
- currPath += dirs[i];
+ currPath << wxGetVolumeString(filename.GetVolume(), wxPATH_NATIVE);
+ }
- if (currPath.Last() == wxT(':'))
- {
- // Can't create a root directory so continue to next dir
+ wxArrayString dirs = filename.GetDirs();
+ size_t count = dirs.GetCount();
+ for ( size_t i = 0; i < count; i++ )
+ {
+ if ( i > 0 ||
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+ // relative pathnames are exactely the other way round under mac...
+ !filename.IsAbsolute()
+#else
+ filename.IsAbsolute()
+#endif
+ )
currPath += wxFILE_SEP_PATH;
- continue;
- }
+ currPath += dirs[i];
if (!DirExists(currPath))
+ {
if (!wxMkdir(currPath, perm))
- noErrors ++;
-
- if ( (i < (count-1)) )
- currPath += wxFILE_SEP_PATH;
+ {
+ // no need to try creating further directories
+ return false;
+ }
+ }
}
- return (noErrors == 0);
+ return true;
}
- else
- return ::wxMkdir( dir, perm );
+
+ return ::wxMkdir( dir, perm );
}
bool wxFileName::Rmdir()
// path normalization
// ----------------------------------------------------------------------------
-bool wxFileName::Normalize(wxPathNormalize flags,
+bool wxFileName::Normalize(int flags,
const wxString& cwd,
wxPathFormat format)
{
+ // deal with env vars renaming first as this may seriously change the path
+ if ( flags & wxPATH_NORM_ENV_VARS )
+ {
+ wxString pathOrig = GetFullPath(format);
+ wxString path = wxExpandEnvVars(pathOrig);
+ if ( path != pathOrig )
+ {
+ Assign(path);
+ }
+ }
+
+
// the existing path components
wxArrayString dirs = GetDirs();
format = GetFormat(format);
// make the path absolute
- if ( (flags & wxPATH_NORM_ABSOLUTE) && m_relative )
+ if ( (flags & wxPATH_NORM_ABSOLUTE) && !IsAbsolute(format) )
{
if ( cwd.empty() )
{
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
{
SetVolume(curDir.GetVolume());
- if ( IsAbsolute() )
+ if ( !m_relative )
{
// yes, it was the case - we don't need curDir then
curDir.Clear();
}
}
-#endif
- m_relative = FALSE;
}
// handle ~ stuff under Unix only
{
wxLogError(_("The path '%s' contains too many \"..\"!"),
GetFullPath().c_str());
- return FALSE;
+ return false;
}
m_dirs.RemoveAt(m_dirs.GetCount() - 1);
}
}
- if ( flags & wxPATH_NORM_ENV_VARS )
- {
- dir = wxExpandEnvVars(dir);
- }
-
if ( (flags & wxPATH_NORM_CASE) && !IsCaseSensitive(format) )
{
dir.MakeLower();
m_dirs.Add(dir);
}
+
+#if defined(__WIN32__) && !defined(__WXWINCE__) && wxUSE_OLE
+ if ( (flags & wxPATH_NORM_SHORTCUT) )
+ {
+ wxString filename;
+ if (GetShortcutTarget(GetFullPath(format), filename))
+ {
+ // Repeat this since we may now have a new path
+ if ( (flags & wxPATH_NORM_CASE) && !IsCaseSensitive(format) )
+ {
+ filename.MakeLower();
+ }
+ m_relative = false;
+ Assign(filename);
+ }
+ }
+#endif
if ( (flags & wxPATH_NORM_CASE) && !IsCaseSensitive(format) )
{
m_ext.MakeLower();
}
+ // we do have the path now
+ //
+ // NB: need to do this before (maybe) calling Assign() below
+ m_relative = false;
+
#if defined(__WIN32__)
if ( (flags & wxPATH_NORM_LONG) && (format == wxPATH_DOS) )
{
}
#endif // Win32
- return TRUE;
+ return true;
+}
+
+// ----------------------------------------------------------------------------
+// get the shortcut target
+// ----------------------------------------------------------------------------
+
+// WinCE (3) doesn't have CLSID_ShellLink, IID_IShellLink definitions.
+// The .lnk file is a plain text file so it should be easy to
+// make it work. Hint from Google Groups:
+// "If you open up a lnk file, you'll see a
+// number, followed by a pound sign (#), followed by more text. The
+// number is the number of characters that follows the pound sign. The
+// characters after the pound sign are the command line (which _can_
+// include arguments) to be executed. Any path (e.g. \windows\program
+// files\myapp.exe) that includes spaces needs to be enclosed in
+// quotation marks."
+
+#if defined(__WIN32__) && !defined(__WXWINCE__) && wxUSE_OLE
+// The following lines are necessary under WinCE
+// #include "wx/msw/private.h"
+// #include <ole2.h>
+#include <shlobj.h>
+#if defined(__WXWINCE__)
+#include <shlguid.h>
+#endif
+
+bool wxFileName::GetShortcutTarget(const wxString& shortcutPath, wxString& targetFilename, wxString* arguments)
+{
+ wxString path, file, ext;
+ wxSplitPath(shortcutPath, & path, & file, & ext);
+
+ HRESULT hres;
+ IShellLink* psl;
+ bool success = FALSE;
+
+ // Assume it's not a shortcut if it doesn't end with lnk
+ if (ext.Lower() != wxT("lnk"))
+ return FALSE;
+
+ // create a ShellLink object
+ hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
+ IID_IShellLink, (LPVOID*) &psl);
+
+ if (SUCCEEDED(hres))
+ {
+ IPersistFile* ppf;
+ hres = psl->QueryInterface( IID_IPersistFile, (LPVOID *) &ppf);
+ if (SUCCEEDED(hres))
+ {
+ WCHAR wsz[MAX_PATH];
+
+ MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, shortcutPath.mb_str(), -1, wsz,
+ MAX_PATH);
+
+ hres = ppf->Load(wsz, 0);
+ if (SUCCEEDED(hres))
+ {
+ wxChar buf[2048];
+ psl->GetPath(buf, 2048, NULL, SLGP_UNCPRIORITY);
+ targetFilename = wxString(buf);
+ success = (shortcutPath != targetFilename);
+
+ psl->GetArguments(buf, 2048);
+ wxString args(buf);
+ if (!args.IsEmpty() && arguments)
+ {
+ *arguments = args;
+ }
+ }
+ }
+ }
+ psl->Release();
+ return success;
+}
+#endif
+
+
+// ----------------------------------------------------------------------------
+// absolute/relative paths
+// ----------------------------------------------------------------------------
+
+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;
+
+ 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 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();
- Normalize(wxPATH_NORM_ALL, cwd, format);
- fnBase.Normalize(wxPATH_NORM_ALL, cwd, format);
+ Normalize(wxPATH_NORM_ALL & ~wxPATH_NORM_CASE, cwd, format);
+ fnBase.Normalize(wxPATH_NORM_ALL & ~wxPATH_NORM_CASE, cwd, format);
bool withCase = IsCaseSensitive(format);
if ( !GetVolume().IsSameAs(fnBase.GetVolume(), withCase) )
{
// nothing done
- return FALSE;
+ return false;
}
// same drive, so we don't need our volume
m_dirs.Insert(wxT(".."), 0u);
}
- m_relative = TRUE;
+ if ( format == wxPATH_UNIX || format == wxPATH_DOS )
+ {
+ // a directory made relative with respect to itself is '.' under Unix
+ // and DOS, by definition (but we don't have to insert "./" for the
+ // files)
+ if ( m_dirs.IsEmpty() && IsDir() )
+ {
+ m_dirs.Add(_T('.'));
+ }
+ }
+
+ m_relative = true;
// we were modified
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
// filename kind tests
// ----------------------------------------------------------------------------
-bool wxFileName::SameAs(const wxFileName &filepath, wxPathFormat format)
+bool wxFileName::SameAs(const wxFileName& filepath, wxPathFormat format) const
{
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);
+ fn1.Normalize(wxPATH_NORM_ALL & ~wxPATH_NORM_CASE, cwd, format);
+ 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 */
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)
{
break;
default:
- wxFAIL_MSG( _T("unknown wxPATH_XXX style") );
+ wxFAIL_MSG( _T("Unknown wxPATH_XXX style") );
// fall through
case wxPATH_UNIX:
return GetPathSeparators(format).Find(ch) != wxNOT_FOUND;
}
-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;
-}
-
// ----------------------------------------------------------------------------
// path components manipulation
// ----------------------------------------------------------------------------
+/* static */ bool wxFileName::IsValidDirComponent(const wxString& dir)
+{
+ if ( dir.empty() )
+ {
+ wxFAIL_MSG( _T("empty directory passed to wxFileName::InsertDir()") );
+
+ return false;
+ }
+
+ const size_t len = dir.length();
+ for ( size_t n = 0; n < len; n++ )
+ {
+ if ( dir[n] == GetVolumeSeparator() || IsPathSeparator(dir[n]) )
+ {
+ wxFAIL_MSG( _T("invalid directory component in wxFileName") );
+
+ return false;
+ }
+ }
+
+ return true;
+}
+
void wxFileName::AppendDir( const wxString &dir )
{
- m_dirs.Add( dir );
+ if ( IsValidDirComponent(dir) )
+ m_dirs.Add( dir );
}
void wxFileName::PrependDir( const wxString &dir )
{
- m_dirs.Insert( dir, 0 );
+ InsertDir(0, dir);
}
void wxFileName::InsertDir( int before, const wxString &dir )
{
- m_dirs.Insert( dir, before );
+ if ( IsValidDirComponent(dir) )
+ m_dirs.Insert( dir, before );
}
void wxFileName::RemoveDir( int pos )
{
- m_dirs.Remove( (size_t)pos );
+ m_dirs.RemoveAt( (size_t)pos );
}
// ----------------------------------------------------------------------------
return fullname;
}
-wxString wxFileName::GetPath( bool add_separator, wxPathFormat format ) const
+wxString wxFileName::GetPath( int flags, wxPathFormat format ) const
{
format = GetFormat( format );
wxString fullpath;
- // the leading character
- if ( format == wxPATH_MAC && m_relative )
- {
- fullpath += wxFILE_SEP_PATH_MAC;
- }
- else if ( format == wxPATH_DOS )
+ // return the volume with the path as well if requested
+ if ( flags & wxPATH_GET_VOLUME )
{
- if (!m_relative)
- fullpath += wxFILE_SEP_PATH_DOS;
- }
- else if ( format == wxPATH_UNIX )
- {
- if (!m_relative)
- fullpath += wxFILE_SEP_PATH_UNIX;
+ fullpath += wxGetVolumeString(GetVolume(), format);
}
- // then concatenate all the path components using the path separator
- size_t dirCount = m_dirs.GetCount();
- if ( dirCount )
+ // the leading character
+ switch ( format )
{
- if ( format == wxPATH_VMS )
- {
- fullpath += wxT('[');
- }
+ case wxPATH_MAC:
+ if ( m_relative )
+ fullpath += wxFILE_SEP_PATH_MAC;
+ break;
+ case wxPATH_DOS:
+ if ( !m_relative )
+ fullpath += wxFILE_SEP_PATH_DOS;
+ break;
- for ( size_t i = 0; i < dirCount; i++ )
- {
- // TODO: What to do with ".." under VMS
+ default:
+ wxFAIL_MSG( wxT("Unknown path format") );
+ // fall through
- switch (format)
+ case wxPATH_UNIX:
+ if ( !m_relative )
{
- case wxPATH_MAC:
+ // normally the absolute file names start with a slash
+ // with one exception: the ones like "~/foo.bar" don't
+ // have it
+ if ( m_dirs.IsEmpty() || m_dirs[0u] != _T('~') )
{
- 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") );
+ fullpath += wxFILE_SEP_PATH_UNIX;
}
}
- }
- }
-
-
-
- return fullpath;
-}
-
-wxString wxFileName::GetFullPath( wxPathFormat format ) const
-{
- format = GetFormat(format);
-
- wxString fullpath;
+ break;
- // first put the volume
- if ( !m_volume.empty() )
- {
- {
- // 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
- }
+ case wxPATH_VMS:
+ // no leading character here but use this place to unset
+ // wxPATH_GET_SEPARATOR flag: under VMS it doesn't make sense
+ // as, if I understand correctly, there should never be a dot
+ // before the closing bracket
+ flags &= ~wxPATH_GET_SEPARATOR;
}
- // the leading character
- if ( format == wxPATH_MAC && m_relative )
+ if ( m_dirs.empty() )
{
- fullpath += wxFILE_SEP_PATH_MAC;
+ // there is nothing more
+ return fullpath;
}
- else if ( format == wxPATH_DOS )
- {
- if (!m_relative)
- fullpath += wxFILE_SEP_PATH_DOS;
- }
- else if ( format == wxPATH_UNIX )
+
+ // then concatenate all the path components using the path separator
+ if ( format == wxPATH_VMS )
{
- if (!m_relative)
- fullpath += wxFILE_SEP_PATH_UNIX;
+ fullpath += wxT('[');
}
- // then concatenate all the path components using the path separator
- size_t dirCount = m_dirs.GetCount();
- if ( dirCount )
+ const size_t dirCount = m_dirs.GetCount();
+ for ( size_t i = 0; i < dirCount; i++ )
{
- if ( format == wxPATH_VMS )
+ switch (format)
{
- fullpath += wxT('[');
- }
+ case wxPATH_MAC:
+ if ( m_dirs[i] == wxT(".") )
+ {
+ // skip appending ':', this shouldn't be done in this
+ // case as "::" is interpreted as ".." under Unix
+ continue;
+ }
+ // convert back from ".." to nothing
+ if ( m_dirs[i] != wxT("..") )
+ fullpath += m_dirs[i];
+ break;
- for ( size_t i = 0; i < dirCount; i++ )
- {
- // TODO: What to do with ".." under VMS
+ default:
+ wxFAIL_MSG( wxT("Unexpected path format") );
+ // still fall through
- 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:
- {
+ case wxPATH_DOS:
+ case wxPATH_UNIX:
+ fullpath += m_dirs[i];
+ break;
+
+ case wxPATH_VMS:
+ // TODO: What to do with ".." under VMS
+
+ // convert back from ".." to nothing
+ if ( m_dirs[i] != wxT("..") )
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") );
- }
- }
+ break;
}
+
+ if ( (flags & wxPATH_GET_SEPARATOR) || (i != dirCount - 1) )
+ fullpath += GetPathSeparator(format);
}
- // finally add the file name and extension
+ if ( format == wxPATH_VMS )
+ {
+ fullpath += wxT(']');
+ }
+
+ return fullpath;
+}
+
+wxString wxFileName::GetFullPath( wxPathFormat format ) const
+{
+ // we already have a function to get the path
+ wxString fullpath = GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR,
+ format);
+
+ // now just add the file name and extension to it
fullpath += GetFullName();
return fullpath;
// 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);
ok = ::GetShortPathName
(
path,
- pathOut.GetWriteBuf(sz),
+ wxStringBuffer(pathOut, sz),
sz
) != 0;
- pathOut.UngetWriteBuf();
}
if (ok)
return pathOut;
path = GetFullPath();
#if defined(__WIN32__) && !defined(__WXMICROWIN__)
- bool success = FALSE;
+ bool success = false;
- // VZ: this code was disabled, why?
-#if 0 // wxUSE_DYNAMIC_LOADER
- typedef DWORD (*GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD);
+#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 )
{
- s_triedToLoad = TRUE;
+ // suppress the errors about missing GetLongPathName[AW]
+ wxLogNull noLog;
+
+ s_triedToLoad = true;
wxDynamicLibrary dllKernel(_T("kernel32"));
if ( dllKernel.IsLoaded() )
{
ok = (*s_pfnGetLongPathName)
(
path,
- pathOut.GetWriteBuf(sz),
+ wxStringBuffer(pathOut, sz),
sz
) != 0;
- pathOut.UngetWriteBuf();
-
- success = TRUE;
+ success = true;
}
}
}
}
}
+
if (success)
return pathOut;
#endif // wxUSE_DYNAMIC_LOADER
WIN32_FIND_DATA findFileData;
HANDLE hFind;
- pathOut = wxEmptyString;
+
+ if ( HasVolume() )
+ pathOut = GetVolume() +
+ GetVolumeSeparator(wxPATH_DOS) +
+ GetPathSeparator(wxPATH_DOS);
+ else
+ pathOut = wxEmptyString;
wxArrayString dirs = GetDirs();
dirs.Add(GetFullName());
if ( tmpPath.empty() )
continue;
- if ( tmpPath.Last() == wxT(':') )
+ // can't see this being necessary? MF
+ if ( tmpPath.Last() == GetVolumeSeparator(wxPATH_DOS) )
{
// Can't pass a drive and root dir to FindFirstFile,
// so continue to next dir
hFind = ::FindFirstFile(tmpPath, &findFileData);
if (hFind == INVALID_HANDLE_VALUE)
{
- // Error: return immediately with the original path
- return path;
+ // Error: most likely reason is that path doesn't exist, so
+ // append any unprocessed parts and return
+ for ( i += 1; i < count; i++ )
+ tmpPath += wxFILE_SEP_PATH + dirs[i];
+
+ return tmpPath;
}
pathOut += findFileData.cFileName;
{
if (format == wxPATH_NATIVE)
{
-#if defined(__WXMSW__) || defined(__WXPM__) || defined(__DOS__)
+#if defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__)
format = wxPATH_DOS;
#elif defined(__WXMAC__) && !defined(__DARWIN__)
format = wxPATH_MAC;
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);
}
}
}
// the path equal to something like '/', not empty, for the files
// immediately under root directory
size_t len = posLastSlash;
- if ( !len )
+
+ // this rule does not apply to mac since we do not start with colons (sep)
+ // except for relative paths
+ if ( !len && format != wxPATH_MAC)
len++;
*pstrPath = fullpath.Left(len);
wxString volume;
SplitPath(fullpath, &volume, path, name, ext, format);
- if ( path && !volume.empty() )
+ if ( path )
{
- path->Prepend(volume + GetVolumeSeparator(format));
+ path->Prepend(wxGetVolumeString(volume, format));
}
}
// time functions
// ----------------------------------------------------------------------------
-bool wxFileName::SetTimes(const wxDateTime *dtCreate,
- const wxDateTime *dtAccess,
- const wxDateTime *dtMod)
+#if wxUSE_DATETIME
+
+bool wxFileName::SetTimes(const wxDateTime *dtAccess,
+ const wxDateTime *dtMod,
+ const wxDateTime *dtCreate)
{
-#if defined(__UNIX_LIKE__) || (defined(__DOS__) && defined(__WATCOMC__))
+#if defined(__WIN32__)
+ if ( IsDir() )
+ {
+ // VZ: please let me know how to do this if you can
+ wxFAIL_MSG( _T("SetTimes() not implemented for the directories") );
+ }
+ else // file
+ {
+ wxFileHandle fh(GetFullPath(), wxFileHandle::Write);
+ if ( fh.IsOk() )
+ {
+ FILETIME ftAccess, ftCreate, ftWrite;
+
+ if ( dtCreate )
+ ConvertWxToFileTime(&ftCreate, *dtCreate);
+ if ( dtAccess )
+ ConvertWxToFileTime(&ftAccess, *dtAccess);
+ if ( dtMod )
+ ConvertWxToFileTime(&ftWrite, *dtMod);
+
+ if ( ::SetFileTime(fh,
+ dtCreate ? &ftCreate : NULL,
+ dtAccess ? &ftAccess : NULL,
+ dtMod ? &ftWrite : NULL) )
+ {
+ return true;
+ }
+ }
+ }
+#elif defined(__UNIX_LIKE__) || (defined(__DOS__) && defined(__WATCOMC__))
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
utimbuf utm;
utm.actime = dtAccess ? dtAccess->GetTicks() : dtMod->GetTicks();
utm.modtime = dtMod ? dtMod->GetTicks() : dtAccess->GetTicks();
- if ( utime(GetFullPath(), &utm) == 0 )
+ if ( utime(GetFullPath().fn_str(), &utm) == 0 )
{
- return TRUE;
- }
-#elif defined(__WIN32__)
- wxFileHandle fh(GetFullPath());
- if ( fh.IsOk() )
- {
- FILETIME ftAccess, ftCreate, ftWrite;
-
- if ( dtCreate )
- ConvertWxToFileTime(&ftCreate, *dtCreate);
- if ( dtAccess )
- ConvertWxToFileTime(&ftAccess, *dtAccess);
- if ( dtMod )
- ConvertWxToFileTime(&ftWrite, *dtMod);
-
- if ( ::SetFileTime(fh,
- dtCreate ? &ftCreate : NULL,
- dtAccess ? &ftAccess : NULL,
- dtMod ? &ftWrite : NULL) )
- {
- return TRUE;
- }
+ return true;
}
#else // other platform
#endif // platforms
wxLogSysError(_("Failed to modify file times for '%s'"),
GetFullPath().c_str());
- return FALSE;
+ return false;
}
bool wxFileName::Touch()
{
#if defined(__UNIX_LIKE__)
// under Unix touching file is simple: just pass NULL to utime()
- if ( utime(GetFullPath(), NULL) == 0 )
+ 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();
- return SetTimes(NULL /* don't change create time */, &dtNow, &dtNow);
+ return SetTimes(&dtNow, &dtNow, NULL /* don't change create time */);
#endif // platforms
}
bool wxFileName::GetTimes(wxDateTime *dtAccess,
wxDateTime *dtMod,
- wxDateTime *dtChange) const
+ wxDateTime *dtCreate) const
{
-#if defined(__UNIX_LIKE__) || defined(__WXMAC__) || (defined(__DOS__) && defined(__WATCOMC__))
- wxStructStat stBuf;
- if ( wxStat(GetFullPath(), &stBuf) == 0 )
+#if defined(__WIN32__)
+ // we must use different methods for the files and directories under
+ // Windows as CreateFile(GENERIC_READ) doesn't work for the directories and
+ // CreateFile(FILE_FLAG_BACKUP_SEMANTICS) works -- but only under NT and
+ // not 9x
+ bool ok;
+ FILETIME ftAccess, ftCreate, ftWrite;
+ if ( IsDir() )
+ {
+ // implemented in msw/dir.cpp
+ extern bool wxGetDirectoryTimes(const wxString& dirname,
+ FILETIME *, FILETIME *, FILETIME *);
+
+ // we should pass the path without the trailing separator to
+ // wxGetDirectoryTimes()
+ ok = wxGetDirectoryTimes(GetPath(wxPATH_GET_VOLUME),
+ &ftAccess, &ftCreate, &ftWrite);
+ }
+ else // file
{
+ wxFileHandle fh(GetFullPath(), wxFileHandle::Read);
+ if ( fh.IsOk() )
+ {
+ ok = ::GetFileTime(fh,
+ dtCreate ? &ftCreate : NULL,
+ dtAccess ? &ftAccess : NULL,
+ dtMod ? &ftWrite : NULL) != 0;
+ }
+ else
+ {
+ ok = false;
+ }
+ }
+
+ if ( ok )
+ {
+ if ( dtCreate )
+ ConvertFileTimeToWx(dtCreate, ftCreate);
if ( dtAccess )
- dtAccess->Set(stBuf.st_atime);
+ ConvertFileTimeToWx(dtAccess, ftAccess);
if ( dtMod )
- dtMod->Set(stBuf.st_mtime);
- if ( dtChange )
- dtChange->Set(stBuf.st_ctime);
+ ConvertFileTimeToWx(dtMod, ftWrite);
- return TRUE;
+ return true;
}
-#elif defined(__WIN32__)
- wxFileHandle fh(GetFullPath());
- if ( fh.IsOk() )
+#elif defined(__UNIX_LIKE__) || defined(__WXMAC__) || (defined(__DOS__) && defined(__WATCOMC__))
+ wxStructStat stBuf;
+ if ( wxStat( GetFullPath().c_str(), &stBuf) == 0 )
{
- FILETIME ftAccess, ftCreate, ftWrite;
-
- if ( ::GetFileTime(fh,
- dtMod ? &ftCreate : NULL,
- dtAccess ? &ftAccess : NULL,
- dtChange ? &ftWrite : NULL) )
- {
- if ( dtMod )
- ConvertFileTimeToWx(dtMod, ftCreate);
- if ( dtAccess )
- ConvertFileTimeToWx(dtAccess, ftAccess);
- if ( dtChange )
- ConvertFileTimeToWx(dtChange, ftWrite);
+ if ( dtAccess )
+ dtAccess->Set(stBuf.st_atime);
+ if ( dtMod )
+ dtMod->Set(stBuf.st_mtime);
+ if ( dtCreate )
+ dtCreate->Set(stBuf.st_ctime);
- return TRUE;
- }
+ return true;
}
#else // other platform
#endif // platforms
wxLogSysError(_("Failed to retrieve file times for '%s'"),
GetFullPath().c_str());
- return FALSE;
+ return false;
}
+#endif // wxUSE_DATETIME
+
#ifdef __WXMAC__
const short kMacExtensionMaxLength = 16 ;
-typedef struct
+class MacDefaultExtensionRecord
{
- char m_ext[kMacExtensionMaxLength] ;
+public :
+ MacDefaultExtensionRecord()
+ {
+ m_ext[0] = 0 ;
+ m_type = m_creator = NULL ;
+ }
+ MacDefaultExtensionRecord( const MacDefaultExtensionRecord& from )
+ {
+ wxStrcpy( m_ext , from.m_ext ) ;
+ m_type = from.m_type ;
+ m_creator = from.m_creator ;
+ }
+ MacDefaultExtensionRecord( const wxChar * extension , OSType type , OSType creator )
+ {
+ wxStrncpy( m_ext , extension , kMacExtensionMaxLength ) ;
+ m_ext[kMacExtensionMaxLength] = 0 ;
+ m_type = type ;
+ m_creator = creator ;
+ }
+ wxChar m_ext[kMacExtensionMaxLength] ;
OSType m_type ;
OSType m_creator ;
-} MacDefaultExtensionRecord ;
+} ;
#include "wx/dynarray.h"
WX_DECLARE_OBJARRAY(MacDefaultExtensionRecord, MacDefaultExtensionArray) ;
+
+bool gMacDefaultExtensionsInited = false ;
+
#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(MacDefaultExtensionArray) ;
+
+WX_DEFINE_EXPORTED_OBJARRAY(MacDefaultExtensionArray) ;
MacDefaultExtensionArray gMacDefaultExtensions ;
-bool gMacDefaultExtensionsInited = false ;
+
+// load the default extensions
+MacDefaultExtensionRecord gDefaults[] =
+{
+ MacDefaultExtensionRecord( wxT("txt") , 'TEXT' , 'ttxt' ) ,
+ MacDefaultExtensionRecord( wxT("tif") , 'TIFF' , '****' ) ,
+ MacDefaultExtensionRecord( wxT("jpg") , 'JPEG' , '****' ) ,
+} ;
static void MacEnsureDefaultExtensionsLoaded()
{
- if ( !gMacDefaultExtensionsInited )
- {
- // load the default extensions
- MacDefaultExtensionRecord defaults[] =
+ if ( !gMacDefaultExtensionsInited )
{
- { "txt" , 'TEXT' , 'ttxt' } ,
-
- } ;
- // we could load the pc exchange prefs here too
-
- for ( int i = 0 ; i < WXSIZEOF( defaults ) ; ++i )
- {
- gMacDefaultExtensions.Add( defaults[i] ) ;
- }
- gMacDefaultExtensionsInited = true ;
- }
+ // we could load the pc exchange prefs here too
+ for ( size_t i = 0 ; i < WXSIZEOF( gDefaults ) ; ++i )
+ {
+ gMacDefaultExtensions.Add( gDefaults[i] ) ;
+ }
+ gMacDefaultExtensionsInited = true ;
+ }
}
-bool wxFileName::MacSetTypeAndCreator( wxUint32 type , wxUint32 creator )
+bool wxFileName::MacSetTypeAndCreator( wxUint32 type , wxUint32 creator )
{
FInfo fndrInfo ;
FSSpec spec ;
return true ;
}
-bool wxFileName::MacGetTypeAndCreator( wxUint32 *type , wxUint32 *creator )
+bool wxFileName::MacGetTypeAndCreator( wxUint32 *type , wxUint32 *creator )
{
FInfo fndrInfo ;
FSSpec spec ;
if ( wxFileName::MacFindDefaultTypeAndCreator(GetExt() , &type ,
&creator ) )
{
- MacSetTypeAndCreator( type , creator ) ;
- }
+ return MacSetTypeAndCreator( type , creator ) ;
+ }
+ return false;
}
-bool wxFileName::MacFindDefaultTypeAndCreator( const wxString& ext , wxUint32 *type , wxUint32 *creator )
+bool wxFileName::MacFindDefaultTypeAndCreator( const wxString& ext , wxUint32 *type , wxUint32 *creator )
{
MacEnsureDefaultExtensionsLoaded() ;
wxString extl = ext.Lower() ;
MacDefaultExtensionRecord rec ;
rec.m_type = type ;
rec.m_creator = creator ;
- strncpy( rec.m_ext , ext.Lower().c_str() , kMacExtensionMaxLength ) ;
+ wxStrncpy( rec.m_ext , ext.Lower().c_str() , kMacExtensionMaxLength ) ;
gMacDefaultExtensions.Add( rec ) ;
}
#endif
-
projects / wxWidgets.git / blobdiff