#include "wx/intl.h"
#include "wx/log.h"
#include "wx/utils.h"
+ #include "wx/crt.h"
#endif
+#include "wx/dynarray.h"
#include "wx/file.h"
#include "wx/filename.h"
#include "wx/dir.h"
#endif
#ifdef __WXMAC__
-# include "MoreFilesX.h"
+// # include "MoreFilesX.h"
#endif
// ----------------------------------------------------------------------------
// wrappers around standard POSIX functions
// ----------------------------------------------------------------------------
-#ifdef wxNEED_WX_UNISTD_H
-
-WXDLLEXPORT int wxStat( const wxChar *file_name, wxStructStat *buf )
-{
- return stat( wxConvFile.cWX2MB( file_name ), buf );
-}
-
-WXDLLEXPORT int wxLstat( const wxChar *file_name, wxStructStat *buf )
-{
- return lstat( wxConvFile.cWX2MB( file_name ), buf );
-}
-
-WXDLLEXPORT int wxAccess( const wxChar *pathname, int mode )
-{
- return access( wxConvFile.cWX2MB( pathname ), mode );
-}
-
-WXDLLEXPORT int wxOpen( const wxChar *pathname, int flags, mode_t mode )
-{
- return open( wxConvFile.cWX2MB( pathname ), flags, mode );
-}
-
-#endif // wxNEED_WX_UNISTD_H
-
#if wxUSE_UNICODE && defined __BORLANDC__ \
&& __BORLANDC__ >= 0x550 && __BORLANDC__ <= 0x551
// BCC 5.5 and 5.5.1 have a bug in _wopen where files are created read only
// regardless of the mode parameter. This hack works around the problem by
// setting the mode with _wchmod.
-//
-int wxOpen(const wchar_t *pathname, int flags, mode_t mode)
+//
+int wxCRT_Open(const wchar_t *pathname, int flags, mode_t mode)
{
int moreflags = 0;
return wxStrcpy(copy, s.c_str());
}
-static inline wxChar* MYcopystring(const wxChar* s)
+template<typename CharType>
+static inline CharType* MYcopystring(const CharType* s)
{
- wxChar* copy = new wxChar[wxStrlen(s) + 1];
+ CharType* copy = new CharType[wxStrlen(s) + 1];
return wxStrcpy(copy, s);
}
#elif defined(__WIN32__) && !defined(__WXMICROWIN__)
// we must use GetFileAttributes() instead of the ANSI C functions because
// it can cope with network (UNC) paths unlike them
- DWORD ret = ::GetFileAttributes(filename);
+ DWORD ret = ::GetFileAttributes(filename.fn_str());
return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY);
#else // !__WIN32__
{
if (!filename.empty())
{
-#if defined(__WXMAC__) && !defined(__DARWIN__)
- // Classic or Carbon CodeWarrior like
- // Carbon with Apple DevTools is Unix like
-
- // This seems wrong to me, but there is no fix. since
- // "MacOS:MyText.txt" is absolute whereas "MyDir:MyText.txt"
- // is not. Or maybe ":MyDir:MyText.txt" has to be used? RR.
- if (filename.Find(':') != wxNOT_FOUND && filename[0] != ':')
- return true ;
-#else
// Unix like or Windows
if (filename[0] == wxT('/'))
return true;
-#endif
#ifdef __VMS__
if ((filename[0] == wxT('[') && filename[1] != wxT('.')))
return true;
*
*/
-void wxStripExtension(wxChar *buffer)
+template<typename T>
+static void wxDoStripExtension(T *buffer)
{
int len = wxStrlen(buffer);
int i = len-1;
}
}
+void wxStripExtension(char *buffer) { wxDoStripExtension(buffer); }
+void wxStripExtension(wchar_t *buffer) { wxDoStripExtension(buffer); }
+
void wxStripExtension(wxString& buffer)
{
//RN: Be careful about the handling the case where
}
// Destructive removal of /./ and /../ stuff
-wxChar *wxRealPath (wxChar *path)
+template<typename CharType>
+static CharType *wxDoRealPath (CharType *path)
{
+ static const CharType SEP = wxFILE_SEP_PATH;
#ifdef __WXMSW__
- static const wxChar SEP = wxT('\\');
wxUnix2DosFilename(path);
-#else
- static const wxChar SEP = wxT('/');
#endif
if (path[0] && path[1]) {
/* MATTHEW: special case "/./x" */
- wxChar *p;
+ CharType *p;
if (path[2] == SEP && path[1] == wxT('.'))
p = &path[0];
else
{
if (p[1] == wxT('.') && p[2] == wxT('.') && (p[3] == SEP || p[3] == wxT('\0')))
{
- wxChar *q;
+ CharType *q;
for (q = p - 1; q >= path && *q != SEP; q--)
{
// Empty
return path;
}
+char *wxRealPath(char *path)
+{
+ return wxDoRealPath(path);
+}
+
+wchar_t *wxRealPath(wchar_t *path)
+{
+ return wxDoRealPath(path);
+}
+
wxString wxRealPath(const wxString& path)
{
wxChar *buf1=MYcopystring(path);
/* input name in name, pathname output to buf. */
-wxChar *wxExpandPath(wxChar *buf, const wxChar *name)
+template<typename CharType>
+static CharType *wxDoExpandPath(CharType *buf, const wxString& name)
{
- register wxChar *d, *s, *nm;
- wxChar lnm[_MAXPATHLEN];
+ register CharType *d, *s, *nm;
+ CharType lnm[_MAXPATHLEN];
int q;
// Some compilers don't like this line.
-// const wxChar trimchars[] = wxT("\n \t");
+// const CharType trimchars[] = wxT("\n \t");
- wxChar trimchars[4];
+ CharType trimchars[4];
trimchars[0] = wxT('\n');
trimchars[1] = wxT(' ');
trimchars[2] = wxT('\t');
trimchars[3] = 0;
+ static const CharType SEP = wxFILE_SEP_PATH;
#ifdef __WXMSW__
- const wxChar SEP = wxT('\\');
-#else
- const wxChar SEP = wxT('/');
+ //wxUnix2DosFilename(path);
#endif
+
buf[0] = wxT('\0');
- if (name == NULL || *name == wxT('\0'))
+ if (name.empty())
return buf;
- nm = MYcopystring(name); // Make a scratch copy
- wxChar *nm_tmp = nm;
+ nm = ::MYcopystring(static_cast<const CharType*>(name.c_str())); // Make a scratch copy
+ CharType *nm_tmp = nm;
/* Skip leading whitespace and cr */
- while (wxStrchr((wxChar *)trimchars, *nm) != NULL)
+ while (wxStrchr(trimchars, *nm) != NULL)
nm++;
/* And strip off trailing whitespace and cr */
s = nm + (q = wxStrlen(nm)) - 1;
- while (q-- && wxStrchr((wxChar *)trimchars, *s) != NULL)
+ while (q-- && wxStrchr(trimchars, *s) != NULL)
*s = wxT('\0');
s = nm;
if (*s++ == wxT('$'))
#endif
{
- register wxChar *start = d;
+ register CharType *start = d;
register int braces = (*s == wxT('{') || *s == wxT('('));
- register wxChar *value;
+ register CharType *value;
while ((*d++ = *s) != 0)
if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) )
break;
}
/* Expand ~ and ~user */
+ wxString homepath;
nm = lnm;
if (nm[0] == wxT('~') && !q)
{
/* prefix ~ */
if (nm[1] == SEP || nm[1] == 0)
{ /* ~/filename */
- // FIXME: wxGetUserHome could return temporary storage in Unicode mode
- if ((s = WXSTRINGCAST wxGetUserHome(wxEmptyString)) != NULL) {
+ homepath = wxGetUserHome(wxEmptyString);
+ if (!homepath.empty()) {
+ s = (CharType*)(const CharType*)homepath.c_str();
if (*++nm)
nm++;
}
} else
{ /* ~user/filename */
- register wxChar *nnm;
- register wxChar *home;
+ register CharType *nnm;
for (s = nm; *s && *s != SEP; s++)
{
// Empty
was_sep = (*s == SEP);
nnm = *s ? s + 1 : s;
*s = 0;
- // FIXME: wxGetUserHome could return temporary storage in Unicode mode
- if ((home = WXSTRINGCAST wxGetUserHome(wxString(nm + 1))) == NULL)
+ homepath = wxGetUserHome(wxString(nm + 1));
+ if (homepath.empty())
{
if (was_sep) /* replace only if it was there: */
*s = SEP;
else
{
nm = nnm;
- s = home;
+ s = (CharType*)(const CharType*)homepath.c_str();
}
}
}
return wxRealPath(buf);
}
+char *wxExpandPath(char *buf, const wxString& name)
+{
+ return wxDoExpandPath(buf, name);
+}
+
+wchar_t *wxExpandPath(wchar_t *buf, const wxString& name)
+{
+ return wxDoExpandPath(buf, name);
+}
+
+
/* Contract Paths to be build upon an environment variable
component:
if (filename.empty())
return (wxChar *) NULL;
- wxStrcpy (dest, WXSTRINGCAST filename);
+ wxStrcpy (dest, filename);
#ifdef __WXMSW__
wxUnix2DosFilename(dest);
#endif
// Handle environment
- const wxChar *val;
+ wxString val;
#ifndef __WXWINCE__
wxChar *tcp;
- if (!envname.empty() && (val = wxGetenv (WXSTRINGCAST envname)) != NULL &&
+ if (!envname.empty() && !(val = wxGetenv (envname)).empty() &&
(tcp = wxStrstr (dest, val)) != NULL)
{
- wxStrcpy (wxFileFunctionsBuffer, tcp + wxStrlen (val));
+ wxStrcpy (wxFileFunctionsBuffer, tcp + val.length());
*tcp++ = wxT('$');
*tcp++ = wxT('{');
- wxStrcpy (tcp, WXSTRINGCAST envname);
+ wxStrcpy (tcp, envname);
wxStrcat (tcp, wxT("}"));
wxStrcat (tcp, wxFileFunctionsBuffer);
}
// Handle User's home (ignore root homes!)
val = wxGetUserHome (user);
- if (!val)
+ if (val.empty())
return dest;
- const size_t len = wxStrlen(val);
+ const size_t len = val.length();
if (len <= 2)
return dest;
{
wxStrcpy(wxFileFunctionsBuffer, wxT("~"));
if (!user.empty())
- wxStrcat(wxFileFunctionsBuffer, (const wxChar*) user);
+ wxStrcat(wxFileFunctionsBuffer, user);
wxStrcat(wxFileFunctionsBuffer, dest + len);
wxStrcpy (dest, wxFileFunctionsBuffer);
}
// Search backward for a backward or forward slash
while (i > -1)
{
-#if defined(__WXMAC__) && !defined(__DARWIN__)
- // Classic or Carbon CodeWarrior like
- // Carbon with Apple DevTools is Unix like
- if (path[i] == wxT(':') )
- {
- buf[i] = 0;
- return buf;
- }
-#else
// Unix like or Windows
if (path[i] == wxT('/') || path[i] == wxT('\\'))
{
buf[i] = 0;
return buf;
}
-#endif
#ifdef __VMS__
if (path[i] == wxT(']'))
{
wxChar buf[_MAXPATHLEN];
// Local copy
- wxStrcpy (buf, WXSTRINGCAST path);
+ wxStrcpy(buf, path);
int l = path.length();
int i = l - 1;
// Search backward for a backward or forward slash
while (i > -1)
{
-#if defined(__WXMAC__) && !defined(__DARWIN__)
- // Classic or Carbon CodeWarrior like
- // Carbon with Apple DevTools is Unix like
- if (path[i] == wxT(':') )
- {
- buf[i] = 0;
- return wxString(buf);
- }
-#else
// Unix like or Windows
if (path[i] == wxT('/') || path[i] == wxT('\\'))
{
buf[i] = 0;
return wxString(buf);
}
-#endif
#ifdef __VMS__
if (path[i] == wxT(']'))
{
#if defined(__WXMAC__)
-#if TARGET_API_MAC_OSX
#define kDefaultPathStyle kCFURLPOSIXPathStyle
-#else
-#define kDefaultPathStyle kCFURLHFSPathStyle
-#endif
wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent )
{
CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfString);
CFRelease( cfString );
CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
- return wxMacCFStringHolder(cfMutableString).AsString();
+ return wxCFStringRef(cfMutableString).AsString();
}
OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef )
{
OSStatus err = noErr ;
- CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, wxMacCFStringHolder(path));
+ CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, wxCFStringRef(path));
CFStringNormalize(cfMutableString,kCFStringNormalizationFormD);
CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfMutableString , kDefaultPathStyle, false);
CFRelease( cfMutableString );
CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfname);
CFRelease( cfname );
CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
- return wxMacCFStringHolder(cfMutableString).AsString() ;
+ return wxCFStringRef(cfMutableString).AsString() ;
}
#ifndef __LP64__
void wxMacFilename2FSSpec( const wxString& path , FSSpec *spec )
{
- OSStatus err = noErr ;
- FSRef fsRef ;
- wxMacPathToFSRef( path , &fsRef ) ;
- err = FSRefMakeFSSpec( &fsRef , spec ) ;
+ OSStatus err = noErr;
+ FSRef fsRef;
+ wxMacPathToFSRef( path , &fsRef );
+ err = FSGetCatalogInfo(&fsRef, kFSCatInfoNone, NULL, NULL, spec, NULL);
+ verify_noerr( err );
}
#endif
#endif // __WXMAC__
-void
-wxDos2UnixFilename (wxChar *s)
+template<typename T>
+static void wxDoDos2UnixFilename(T *s)
{
if (s)
while (*s)
*s = _T('/');
#ifdef __WXMSW__
else
- *s = (wxChar)wxTolower (*s); // Case INDEPENDENT
+ *s = wxTolower(*s); // Case INDEPENDENT
#endif
s++;
}
}
-void
+void wxDos2UnixFilename(char *s) { wxDoDos2UnixFilename(s); }
+void wxDos2UnixFilename(wchar_t *s) { wxDoDos2UnixFilename(s); }
+
+template<typename T>
+static void
#if defined(__WXMSW__) || defined(__OS2__)
-wxUnix2DosFilename (wxChar *s)
+wxDoUnix2DosFilename(T *s)
#else
-wxUnix2DosFilename (wxChar *WXUNUSED(s) )
+wxDoUnix2DosFilename(T *WXUNUSED(s) )
#endif
{
// Yes, I really mean this to happen under DOS only! JACS
#endif
}
+void wxUnix2DosFilename(char *s) { wxDoUnix2DosFilename(s); }
+void wxUnix2DosFilename(wchar_t *s) { wxDoUnix2DosFilename(s); }
+
// Concatenate two files to form third
bool
wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
#endif
}
+// helper of generic implementation of wxCopyFile()
+#if !(defined(__WIN32__) || defined(__OS2__) || defined(__PALMOS__)) && \
+ wxUSE_FILE
+
+static bool
+wxDoCopyFile(wxFile& fileIn,
+ const wxStructStat& fbuf,
+ const wxString& filenameDst,
+ bool overwrite)
+{
+ // reset the umask as we want to create the file with exactly the same
+ // permissions as the original one
+ wxCHANGE_UMASK(0);
+
+ // create file2 with the same permissions than file1 and open it for
+ // writing
+
+ wxFile fileOut;
+ if ( !fileOut.Create(filenameDst, overwrite, fbuf.st_mode & 0777) )
+ return false;
+
+ // copy contents of file1 to file2
+ char buf[4096];
+ for ( ;; )
+ {
+ ssize_t count = fileIn.Read(buf, WXSIZEOF(buf));
+ if ( count == wxInvalidOffset )
+ return false;
+
+ // end of file?
+ if ( !count )
+ break;
+
+ if ( fileOut.Write(buf, count) < (size_t)count )
+ return false;
+ }
+
+ // we can expect fileIn to be closed successfully, but we should ensure
+ // that fileOut was closed as some write errors (disk full) might not be
+ // detected before doing this
+ return fileIn.Close() && fileOut.Close();
+}
+
+#endif // generic implementation of wxCopyFile
+
// Copy files
bool
wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
// instead of our code if available
//
// NB: 3rd parameter is bFailIfExists i.e. the inverse of overwrite
- if ( !::CopyFile(file1, file2, !overwrite) )
+ if ( !::CopyFile(file1.fn_str(), file2.fn_str(), !overwrite) )
{
wxLogSysError(_("Failed to copy the file '%s' to '%s'"),
file1.c_str(), file2.c_str());
return false;
}
#elif defined(__OS2__)
- if ( ::DosCopy((PSZ)file1.c_str(), (PSZ)file2.c_str(), overwrite ? DCPY_EXISTING : 0) != 0 )
+ if ( ::DosCopy(file1.c_str(), file2.c_str(), overwrite ? DCPY_EXISTING : 0) != 0 )
return false;
#elif defined(__PALMOS__)
// TODO with http://www.palmos.com/dev/support/docs/protein_books/Memory_Databases_Files/
return false;
}
- // reset the umask as we want to create the file with exactly the same
- // permissions as the original one
- wxCHANGE_UMASK(0);
-
- // create file2 with the same permissions than file1 and open it for
- // writing
+ wxDoCopyFile(fileIn, fbuf, file2, overwrite);
- wxFile fileOut;
- if ( !fileOut.Create(file2, overwrite, fbuf.st_mode & 0777) )
- return false;
+#if defined(__WXMAC__) || defined(__WXCOCOA__)
+ // copy the resource fork of the file too if it's present
+ wxString pathRsrcOut;
+ wxFile fileRsrcIn;
- // copy contents of file1 to file2
- char buf[4096];
- size_t count;
- for ( ;; )
{
- count = fileIn.Read(buf, WXSIZEOF(buf));
- if ( fileIn.Error() )
- return false;
+ // suppress error messages from this block as resource forks don't have
+ // to exist
+ wxLogNull noLog;
+
+ // it's not enough to check for file existence: it always does on HFS
+ // but is empty for files without resources
+ if ( fileRsrcIn.Open(file1 + wxT("/..namedfork/rsrc")) &&
+ fileRsrcIn.Length() > 0 )
+ {
+ // we must be using HFS or another filesystem with resource fork
+ // support, suppose that destination file system also is HFS[-like]
+ pathRsrcOut = file2 + wxT("/..namedfork/rsrc");
+ }
+ else // check if we have resource fork in separate file (non-HFS case)
+ {
+ wxFileName fnRsrc(file1);
+ fnRsrc.SetName(wxT("._") + fnRsrc.GetName());
- // end of file?
- if ( !count )
- break;
+ fileRsrcIn.Close();
+ if ( fileRsrcIn.Open( fnRsrc.GetFullPath() ) )
+ {
+ fnRsrc = file2;
+ fnRsrc.SetName(wxT("._") + fnRsrc.GetName());
- if ( fileOut.Write(buf, count) < count )
- return false;
+ pathRsrcOut = fnRsrc.GetFullPath();
+ }
+ }
}
- // we can expect fileIn to be closed successfully, but we should ensure
- // that fileOut was closed as some write errors (disk full) might not be
- // detected before doing this
- if ( !fileIn.Close() || !fileOut.Close() )
- return false;
+ if ( !pathRsrcOut.empty() )
+ {
+ if ( !wxDoCopyFile(fileRsrcIn, fbuf, pathRsrcOut, overwrite) )
+ return false;
+ }
+#endif // wxMac || wxCocoa
#if !defined(__VISAGECPP__) && !defined(__WXMAC__) || defined(__UNIX__)
// no chmod in VA. Should be some permission API for HPFS386 partitions
|| (defined(__MWERKS__) && defined(__MSL__))
int res = wxRemove(file);
#elif defined(__WXMAC__)
- int res = unlink(wxFNCONV(file));
+ int res = unlink(file.fn_str());
#elif defined(__WXPALMOS__)
int res = 1;
// TODO with VFSFileDelete()
#if defined(__WXPALMOS__)
return false;
#elif defined(__WXMAC__) && !defined(__UNIX__)
- return (mkdir( wxFNCONV(dir) , 0 ) == 0);
+ return (mkdir(dir.fn_str() , 0 ) == 0);
#else // !Mac
const wxChar *dirname = dir.c_str();
#if defined(__VMS__)
return false; //to be changed since rmdir exists in VMS7.x
#elif defined(__OS2__)
- return (::DosDeleteDir((PSZ)dir.c_str()) == 0);
+ return (::DosDeleteDir(dir.c_str()) == 0);
#elif defined(__WXWINCE__)
return (RemoveDirectory(dir) != 0);
#elif defined(__WXPALMOS__)
}
// does the path exists? (may have or not '/' or '\\' at the end)
-bool wxDirExists(const wxChar *pszPathName)
+bool wxDirExists(const wxString& pathName)
{
- wxString strPath(pszPathName);
+ wxString strPath(pathName);
#if defined(__WINDOWS__) || defined(__OS2__)
// Windows fails to find directory named "c:\dir\" even if "c:\dir" exists,
return false;
#elif defined(__WIN32__) && !defined(__WXMICROWIN__)
// stat() can't cope with network paths
- DWORD ret = ::GetFileAttributes(strPath);
+ DWORD ret = ::GetFileAttributes(strPath.fn_str());
return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY);
#elif defined(__OS2__)
return wxStat(strPath.c_str(), &st) == 0 && ((st.st_mode & S_IFMT) == S_IFDIR);
#else
// S_IFMT not supported in VA compilers.. st_mode is a 2byte value only
- return wxStat(pszPathName, &st) == 0 && (st.st_mode == S_IFDIR);
+ return wxStat(strPath.c_str(), &st) == 0 && (st.st_mode == S_IFDIR);
#endif
#endif // __WIN32__/!__WIN32__
static wxDir *gs_dir = NULL;
static wxString gs_dirPath;
-wxString wxFindFirstFile(const wxChar *spec, int flags)
+wxString wxFindFirstFile(const wxString& spec, int flags)
{
wxSplitPath(spec, &gs_dirPath, NULL, NULL);
if ( gs_dirPath.empty() )
}
wxString result;
- gs_dir->GetFirst(&result, wxFileNameFromPath(wxString(spec)), dirFlags);
+ gs_dir->GetFirst(&result, wxFileNameFromPath(spec), dirFlags);
if ( result.empty() )
{
wxDELETE(gs_dir);
{
#if defined(_MSC_VER) || defined(__MINGW32__)
ok = _getcwd(cbuf, sz) != NULL;
- #elif defined(__WXMAC__) && !defined(__DARWIN__)
- char lbuf[1024] ;
- if ( getcwd( lbuf , sizeof( lbuf ) ) )
- {
- wxString res( lbuf , *wxConvCurrent ) ;
- wxStrcpy( buf , res ) ;
- ok = true;
- }
- else
- ok = false ;
#elif defined(__OS2__)
APIRET rc;
ULONG ulDriveNum = 0;
ok = getcwd(cbuf, sz) != NULL;
#endif // platform
- #if wxUSE_UNICODE && !(defined(__WXMAC__) && !defined(__DARWIN__))
+ #if wxUSE_UNICODE
// finally convert the result to Unicode if needed
wxConvFile.MB2WC(buf, cbuf, sz);
#endif // wxUSE_UNICODE
bool wxSetWorkingDirectory(const wxString& d)
{
#if defined(__OS2__)
- return (::DosSetCurrentDir((PSZ)d.c_str()) == 0);
+ if (d[1] == ':')
+ {
+ ::DosSetDefaultDisk(wxToupper(d[0]) - _T('A') + 1);
+ // do not call DosSetCurrentDir when just changing drive,
+ // since it requires e.g. "d:." instead of "d:"!
+ if (d.length() == 2)
+ return true;
+ }
+ return (::DosSetCurrentDir(d.c_str()) == 0);
#elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__)
return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
#elif defined(__WINDOWS__)
wxUnusedVar(d);
return false;
#else
- return (bool)(SetCurrentDirectory(d) != 0);
+ return (bool)(SetCurrentDirectory(d.fn_str()) != 0);
#endif
#else
// Must change drive, too.
#endif
}
-bool wxEndsWithPathSeparator(const wxChar *pszFileName)
+bool wxEndsWithPathSeparator(const wxString& filename)
{
- size_t len = wxStrlen(pszFileName);
-
- return len && wxIsPathSeparator(pszFileName[len - 1]);
+ return !filename.empty() && wxIsPathSeparator(filename.Last());
}
// find a file in a list of directories, returns false if not found
-bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFile)
+bool wxFindFileInPath(wxString *pStr, const wxString& szPath, const wxString& szFile)
{
// we assume that it's not empty
- wxCHECK_MSG( !wxIsEmpty(pszFile), false,
+ wxCHECK_MSG( !szFile.empty(), false,
_T("empty file name in wxFindFileInPath"));
// skip path separator in the beginning of the file name if present
- if ( wxIsPathSeparator(*pszFile) )
- pszFile++;
-
- // copy the path (strtok will modify it)
- wxChar *szPath = new wxChar[wxStrlen(pszPath) + 1];
- wxStrcpy(szPath, pszPath);
-
- wxString strFile;
- wxChar *pc, *save_ptr;
- for ( pc = wxStrtok(szPath, wxPATH_SEP, &save_ptr);
- pc != NULL;
- pc = wxStrtok((wxChar *) NULL, wxPATH_SEP, &save_ptr) )
+ wxString szFile2;
+ if ( wxIsPathSeparator(szFile[0u]) )
+ szFile2 = szFile.Mid(1);
+ else
+ szFile2 = szFile;
+
+ wxStringTokenizer tkn(szPath, wxPATH_SEP);
+
+ while ( tkn.HasMoreTokens() )
{
- // search for the file in this directory
- strFile = pc;
- if ( !wxEndsWithPathSeparator(pc) )
+ wxString strFile = tkn.GetNextToken();
+ if ( !wxEndsWithPathSeparator(strFile) )
strFile += wxFILE_SEP_PATH;
- strFile += pszFile;
+ strFile += szFile2;
- if ( wxFileExists(strFile) ) {
+ if ( wxFileExists(strFile) )
+ {
*pStr = strFile;
- break;
+ return true;
}
}
- // suppress warning about unused variable save_ptr when wxStrtok() is a
- // macro which throws away its third argument
- save_ptr = pc;
-
- delete [] szPath;
-
- return pc != NULL; // if true => we breaked from the loop
+ return false;
}
-void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName,
+void WXDLLIMPEXP_BASE wxSplitPath(const wxString& fileName,
wxString *pstrPath,
wxString *pstrName,
wxString *pstrExt)
{
- // it can be empty, but it shouldn't be NULL
- wxCHECK_RET( pszFileName, wxT("NULL file name in wxSplitPath") );
-
- wxFileName::SplitPath(pszFileName, pstrPath, pstrName, pstrExt);
+ wxFileName::SplitPath(fileName, pstrPath, pstrName, pstrExt);
}
#if wxUSE_DATETIME
-time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename)
+time_t WXDLLIMPEXP_BASE wxFileModificationTime(const wxString& filename)
{
wxDateTime mtime;
if ( !wxFileName(filename).GetTimes(NULL, &mtime, NULL) )
// Returns 0 if none or if there's a problem.
// filterStr is in the form: "All files (*.*)|*.*|JPEG Files (*.jpeg)|*.jpeg"
-int WXDLLEXPORT wxParseCommonDialogsFilter(const wxString& filterStr,
+int WXDLLIMPEXP_BASE wxParseCommonDialogsFilter(const wxString& filterStr,
wxArrayString& descriptions,
wxArrayString& filters)
{
HANDLE h = ::CreateFile
(
- path.c_str(),
+ path.wx_str(),
access,
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
NULL,
{
#if defined( __UNIX__ ) || defined(__OS2__)
// access() will take in count also symbolic links
- return access(wxConvFile.cWX2MB(path), W_OK) == 0;
+ return wxAccess(path.c_str(), W_OK) == 0;
#elif defined( __WINDOWS__ )
return wxCheckWin32Permission(path, GENERIC_WRITE);
#else
{
#if defined( __UNIX__ ) || defined(__OS2__)
// access() will take in count also symbolic links
- return access(wxConvFile.cWX2MB(path), R_OK) == 0;
+ return wxAccess(path.c_str(), R_OK) == 0;
#elif defined( __WINDOWS__ )
return wxCheckWin32Permission(path, GENERIC_READ);
#else
{
#if defined( __UNIX__ ) || defined(__OS2__)
// access() will take in count also symbolic links
- return access(wxConvFile.cWX2MB(path), X_OK) == 0;
+ return wxAccess(path.c_str(), X_OK) == 0;
#elif defined( __WINDOWS__ )
return wxCheckWin32Permission(path, GENERIC_EXECUTE);
#else
bool wxIsWild( const wxString& pattern )
{
- wxString tmp = pattern;
- wxChar *pat = WXSTRINGCAST(tmp);
- while (*pat)
+ for ( wxString::const_iterator p = pattern.begin(); p != pattern.end(); ++p )
{
- switch (*pat++)
+ switch ( (*p).GetValue() )
{
- case wxT('?'): case wxT('*'): case wxT('['): case wxT('{'):
- return true;
- case wxT('\\'):
- if (!*pat++)
- return false;
+ case wxT('?'):
+ case wxT('*'):
+ case wxT('['):
+ case wxT('{'):
+ return true;
+
+ case wxT('\\'):
+ if ( ++p == pattern.end() )
+ return false;
}
}
return false;
projects / wxWidgets.git / blobdiff