m_hFile = ::CreateFile
(
filename, // name
- mode == Read ? GENERIC_READ // access mask
+ mode == Read ? GENERIC_READ // access mask
: GENERIC_WRITE,
0, // no sharing
NULL, // no secutity attr
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
wxString fullpath = fullpathOrig;
if ( !wxEndsWithPathSeparator(fullpath) )
{
- fullpath += GetPathSeparators(format)[0u];
+ fullpath += GetPathSeparator(format);
}
wxString volume, path, name, ext;
_T("the path shouldn't contain file name nor extension") );
#else // !__WXDEBUG__
- SplitPath(fullname, NULL /* no path */, &name, &ext, format);
+ SplitPath(fullname, NULL /* no path */, &name, &ext, format);
SplitPath(fullpath, &volume, &path, NULL, NULL, format);
#endif // __WXDEBUG__/!__WXDEBUG__
// 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 || filename.IsAbsolute() )
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()
if ( m_dirs.IsEmpty() && IsDir() )
{
m_dirs.Add(_T('.'));
- }
+ }
}
m_relative = TRUE;
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 )
- {
- if (!m_relative)
- fullpath += wxFILE_SEP_PATH_DOS;
- }
- else if ( format == wxPATH_UNIX )
- {
- 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") );
- }
- }
- }
- }
-
- if ( add_separator && !fullpath.empty() )
+ // return the volume with the path as well if requested
+ if ( flags & wxPATH_GET_VOLUME )
{
- fullpath += GetPathSeparators(format)[0u];
+ fullpath += wxGetVolumeString(GetVolume(), format);
}
- return fullpath;
-}
-
-wxString wxFileName::GetFullPath( wxPathFormat format ) const
-{
- format = GetFormat(format);
-
- // first put the volume
- wxString fullpath = wxGetVolumeString(m_volume, format);
-
// the leading character
if ( format == wxPATH_MAC )
{
}
else if ( format == wxPATH_DOS )
{
- if ( !m_relative )
+ if (!m_relative)
fullpath += wxFILE_SEP_PATH_DOS;
}
else if ( format == wxPATH_UNIX )
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
+ 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];
- fullpath += wxT(':');
break;
- }
+
+ default:
+ wxFAIL_MSG( wxT("unexpected path format") );
+ // still fall through
+
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
+ // TODO: What to do with ".." under VMS
+ // convert back from ".." to nothing
+ if ( m_dirs[i] != wxT("..") )
fullpath += m_dirs[i];
- if (i == dirCount-1)
- fullpath += wxT(']');
- else
- fullpath += wxT('.');
break;
- }
- default:
- {
- wxFAIL_MSG( wxT("error") );
- }
}
+
+ if ( i != dirCount - 1 )
+ fullpath += GetPathSeparator(format);
}
+
+ if ( format == wxPATH_VMS )
+ {
+ fullpath += wxT(']');
+ }
+ }
+
+ if ( (flags & wxPATH_GET_SEPARATOR) && !fullpath.empty() )
+ {
+ fullpath += GetPathSeparator(format);
}
- // finally add the file name and extension
+ 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;
bool success = FALSE;
#if wxUSE_DYNAMIC_LOADER
- typedef DWORD (*GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD);
+ typedef DWORD (WINAPI *GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD);
static bool s_triedToLoad = FALSE;
MacDefaultExtensionRecord defaults[] =
{
{ "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 ;
}
}
-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 ;
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() ;
projects / wxWidgets.git / blobdiff