X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e6667e2699fccd04313780f6cf21dbff8a435a7..b4a2ab728bf4627ab2b41385b69e31f10c1fd3b1:/src/common/filefn.cpp diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 6e7c62ada3..d6b6b6d604 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -9,6 +9,14 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ #pragma implementation "filefn.h" #endif @@ -58,6 +66,10 @@ #include #endif +#ifdef __OS2__ + #include + #include +#endif #ifdef __WINDOWS__ #if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__) #include @@ -96,9 +108,12 @@ #include "windows.h" #endif +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + #define _MAXPATHLEN 500 -extern wxChar *wxBuffer; #ifdef __WXMAC__ extern wxChar gwxMacFileName[] ; extern wxChar gwxMacFileName2[] ; @@ -109,6 +124,16 @@ extern wxChar *wxBuffer; IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList) #endif +// ---------------------------------------------------------------------------- +// private globals +// ---------------------------------------------------------------------------- + +static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN]; + +// ============================================================================ +// implementation +// ============================================================================ + void wxPathList::Add (const wxString& path) { wxStringList::Add (WXSTRINGCAST path); @@ -119,9 +144,9 @@ void wxPathList::AddEnvList (const wxString& envVariable) { static const wxChar PATH_TOKS[] = #ifdef __WINDOWS__ - _T(" ;"); // Don't seperate with colon in DOS (used for drive) + T(" ;"); // Don't seperate with colon in DOS (used for drive) #else - _T(" :;"); + T(" :;"); #endif wxChar *val = wxGetenv (WXSTRINGCAST envVariable); @@ -177,11 +202,11 @@ bool wxPathList::Member (const wxString& path) wxString wxPathList::FindValidPath (const wxString& file) { - if (wxFileExists (wxExpandPath(wxBuffer, file))) - return wxString(wxBuffer); + if (wxFileExists (wxExpandPath(wxFileFunctionsBuffer, file))) + return wxString(wxFileFunctionsBuffer); wxChar buf[_MAXPATHLEN]; - wxStrcpy(buf, wxBuffer); + wxStrcpy(buf, wxFileFunctionsBuffer); wxChar *filename = (wxChar*) NULL; /* shut up buggy egcs warning */ filename = IsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (wxChar *)buf; @@ -189,48 +214,39 @@ wxString wxPathList::FindValidPath (const wxString& file) for (wxNode * node = First (); node; node = node->Next ()) { wxChar *path = (wxChar *) node->Data (); - wxStrcpy (wxBuffer, path); - wxChar ch = wxBuffer[wxStrlen(wxBuffer)-1]; - if (ch != _T('\\') && ch != _T('/')) - wxStrcat (wxBuffer, _T("/")); - wxStrcat (wxBuffer, filename); + wxStrcpy (wxFileFunctionsBuffer, path); + wxChar ch = wxFileFunctionsBuffer[wxStrlen(wxFileFunctionsBuffer)-1]; + if (ch != T('\\') && ch != T('/')) + wxStrcat (wxFileFunctionsBuffer, T("/")); + wxStrcat (wxFileFunctionsBuffer, filename); #ifdef __WINDOWS__ - Unix2DosFilename (wxBuffer); + Unix2DosFilename (wxFileFunctionsBuffer); #endif - if (wxFileExists (wxBuffer)) + if (wxFileExists (wxFileFunctionsBuffer)) { - return wxString(wxBuffer); // Found! + return wxString(wxFileFunctionsBuffer); // Found! } } // for() - return wxString(_T("")); // Not found + return wxString(T("")); // Not found } wxString wxPathList::FindAbsoluteValidPath (const wxString& file) { - wxString f = FindValidPath(file); - if (wxIsAbsolutePath(f)) - return f; - else - { - wxChar buf[500]; - wxGetWorkingDirectory(buf, 499); - int len = (int)wxStrlen(buf); - wxChar lastCh = 0; - if (len > 0) - lastCh = buf[len-1]; - if (lastCh != _T('/') && lastCh != _T('\\')) + wxString f = FindValidPath(file); + if ( wxIsAbsolutePath(f) ) + return f; + + wxString buf; + wxGetWorkingDirectory(buf.GetWriteBuf(_MAXPATHLEN), _MAXPATHLEN - 1); + buf.UngetWriteBuf(); + if ( !wxEndsWithPathSeparator(buf) ) { -#ifdef __WINDOWS__ - wxStrcat(buf, _T("\\")); -#else - wxStrcat(buf, _T("/")); -#endif + buf += wxFILE_SEP_PATH; } - wxStrcat(buf, (const wxChar *)f); - wxStrcpy(wxBuffer, buf); - return wxString(wxBuffer); - } + buf += f; + + return buf; } bool @@ -256,7 +272,7 @@ wxFileExists (const wxString& filename) struct stat stbuf; #endif - if ((filename != _T("")) && stat (FNSTRINGCAST filename.fn_str(), &stbuf) == 0) + if ((filename != T("")) && stat (wxFNSTRINGCAST filename.fn_str(), &stbuf) == 0) return TRUE; return FALSE; #endif @@ -277,15 +293,15 @@ bool wxFileExists(const char *pszFileName) bool wxIsAbsolutePath (const wxString& filename) { - if (filename != "") + if (filename != T("")) { - if (filename[0] == _T('/') + if (filename[0] == T('/') #ifdef __VMS__ - || (filename[0] == _T('[') && filename[1] != _T('.')) + || (filename[0] == T('[') && filename[1] != T('.')) #endif #ifdef __WINDOWS__ /* MSDOS */ - || filename[0] == _T('\\') || (wxIsalpha (filename[0]) && filename[1] == _T(':')) + || filename[0] == T('\\') || (wxIsalpha (filename[0]) && filename[1] == T(':')) #endif ) return TRUE; @@ -305,7 +321,7 @@ void wxStripExtension(wxChar *buffer) int i = len-1; while (i > 0) { - if (buffer[i] == _T('.')) + if (buffer[i] == T('.')) { buffer[i] = 0; break; @@ -320,7 +336,7 @@ void wxStripExtension(wxString& buffer) size_t i = len-1; while (i > 0) { - if (buffer.GetChar(i) == _T('.')) + if (buffer.GetChar(i) == T('.')) { buffer = buffer.Left(i); break; @@ -333,15 +349,15 @@ void wxStripExtension(wxString& buffer) wxChar *wxRealPath (wxChar *path) { #ifdef __WXMSW__ - static const wxChar SEP = _T('\\'); + static const wxChar SEP = T('\\'); Unix2DosFilename(path); #else - static const wxChar SEP = _T('/'); + static const wxChar SEP = T('/'); #endif if (path[0] && path[1]) { /* MATTHEW: special case "/./x" */ wxChar *p; - if (path[2] == SEP && path[1] == _T('.')) + if (path[2] == SEP && path[1] == T('.')) p = &path[0]; else p = &path[2]; @@ -349,31 +365,31 @@ wxChar *wxRealPath (wxChar *path) { if (*p == SEP) { - if (p[1] == _T('.') && p[2] == _T('.') && (p[3] == SEP || p[3] == _T('\0'))) + if (p[1] == T('.') && p[2] == T('.') && (p[3] == SEP || p[3] == T('\0'))) { wxChar *q; for (q = p - 1; q >= path && *q != SEP; q--); - if (q[0] == SEP && (q[1] != _T('.') || q[2] != _T('.') || q[3] != SEP) + if (q[0] == SEP && (q[1] != T('.') || q[2] != T('.') || q[3] != SEP) && (q - 1 <= path || q[-1] != SEP)) { wxStrcpy (q, p + 3); - if (path[0] == _T('\0')) + if (path[0] == T('\0')) { path[0] = SEP; - path[1] = _T('\0'); + path[1] = T('\0'); } #ifdef __WXMSW__ /* Check that path[2] is NULL! */ - else if (path[1] == _T(':') && !path[2]) + else if (path[1] == T(':') && !path[2]) { path[2] = SEP; - path[3] = _T('\0'); + path[3] = T('\0'); } #endif p = q - 1; } } - else if (p[1] == _T('.') && (p[2] == SEP || p[2] == _T('\0'))) + else if (p[1] == T('.') && (p[2] == SEP || p[2] == T('\0'))) wxStrcpy (p, p + 2); } } @@ -384,25 +400,25 @@ wxChar *wxRealPath (wxChar *path) // Must be destroyed wxChar *wxCopyAbsolutePath(const wxString& filename) { - if (filename == _T("")) + if (filename == T("")) return (wxChar *) NULL; - if (! IsAbsolutePath(wxExpandPath(wxBuffer, filename))) { + if (! IsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename))) { wxChar buf[_MAXPATHLEN]; - buf[0] = _T('\0'); + buf[0] = T('\0'); wxGetWorkingDirectory(buf, WXSIZEOF(buf)); wxChar ch = buf[wxStrlen(buf) - 1]; #ifdef __WXMSW__ - if (ch != _T('\\') && ch != _T('/')) - wxStrcat(buf, _T("\\")); + if (ch != T('\\') && ch != T('/')) + wxStrcat(buf, T("\\")); #else - if (ch != _T('/')) - wxStrcat(buf, _T("/")); + if (ch != T('/')) + wxStrcat(buf, T("/")); #endif - wxStrcat(buf, wxBuffer); + wxStrcat(buf, wxFileFunctionsBuffer); return copystring( wxRealPath(buf) ); } - return copystring( wxBuffer ); + return copystring( wxFileFunctionsBuffer ); } /*- @@ -435,21 +451,21 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) int q; // Some compilers don't like this line. -// const wxChar trimchars[] = _T("\n \t"); +// const wxChar trimchars[] = T("\n \t"); wxChar trimchars[4]; - trimchars[0] = _T('\n'); - trimchars[1] = _T(' '); - trimchars[2] = _T('\t'); + trimchars[0] = T('\n'); + trimchars[1] = T(' '); + trimchars[2] = T('\t'); trimchars[3] = 0; #ifdef __WXMSW__ - const wxChar SEP = _T('\\'); + const wxChar SEP = T('\\'); #else - const wxChar SEP = _T('/'); + const wxChar SEP = T('/'); #endif - buf[0] = _T('\0'); - if (name == NULL || *name == _T('\0')) + buf[0] = T('\0'); + if (name == NULL || *name == T('\0')) return buf; nm = copystring(name); // Make a scratch copy wxChar *nm_tmp = nm; @@ -460,45 +476,74 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) /* And strip off trailing whitespace and cr */ s = nm + (q = wxStrlen(nm)) - 1; while (q-- && wxStrchr((wxChar *)trimchars, *s) != NULL) - *s = _T('\0'); + *s = T('\0'); s = nm; d = lnm; #ifdef __WXMSW__ q = FALSE; #else - q = nm[0] == _T('\\') && nm[1] == _T('~'); + q = nm[0] == T('\\') && nm[1] == T('~'); #endif /* Expand inline environment variables */ +#ifdef __VISAGECPP__ + while (*d) + { + *d++ = *s; + if(*s == T('\\')) + { + *(d - 1) = *++s; + if (*d) + { + s++; + continue; + } + else + break; + } + else +#else while ((*d++ = *s)) { -#ifndef __WXMSW__ - if (*s == _T('\\')) { +# ifndef __WXMSW__ + if (*s == T('\\')) { if ((*(d - 1) = *++s)) { s++; continue; } else break; } else +# endif #endif #ifdef __WXMSW__ - if (*s++ == _T('$') && (*s == _T('{') || *s == _T(')'))) + if (*s++ == T('$') && (*s == T('{') || *s == T(')'))) #else - if (*s++ == _T('$')) + if (*s++ == T('$')) #endif { register wxChar *start = d; - register int braces = (*s == _T('{') || *s == _T('(')); + register int braces = (*s == T('{') || *s == T('(')); register wxChar *value; +#ifdef __VISAGECPP__ + // VA gives assignment in logical expr warning + while (*d) + *d++ = *s; +#else while ((*d++ = *s)) - if (braces ? (*s == _T('}') || *s == _T(')')) : !(wxIsalnum(*s) || *s == _T('_')) ) +#endif + if (braces ? (*s == T('}') || *s == T(')')) : !(wxIsalnum(*s) || *s == T('_')) ) break; else s++; *--d = 0; value = wxGetenv(braces ? start + 1 : start); if (value) { +#ifdef __VISAGECPP__ + // VA gives assignment in logical expr warning + for ((d = start - 1); (*d); *d++ = *value++); +#else for ((d = start - 1); (*d++ = *value++);); +#endif d--; if (braces && *s) s++; @@ -508,13 +553,14 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) /* Expand ~ and ~user */ nm = lnm; - s = _T(""); - if (nm[0] == _T('~') && !q) + s = T(""); + if (nm[0] == T('~') && !q) { /* prefix ~ */ if (nm[1] == SEP || nm[1] == 0) { /* ~/filename */ - if ((s = WXSTRINGCAST wxGetUserHome(_T(""))) != NULL) { + // FIXME: wxGetUserHome could return temporary storage in Unicode mode + if ((s = WXSTRINGCAST wxGetUserHome(T(""))) != NULL) { if (*++nm) nm++; } @@ -527,10 +573,11 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) 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) { if (was_sep) /* replace only if it was there: */ *s = SEP; - s = _T(""); + s = T(""); } else { nm = nnm; s = home; @@ -541,15 +588,20 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) d = buf; if (s && *s) { /* MATTHEW: s could be NULL if user '~' didn't exist */ /* Copy home dir */ - while (_T('\0') != (*d++ = *s++)) + while (T('\0') != (*d++ = *s++)) /* loop */; // Handle root home if (d - 1 > buf && *(d - 2) != SEP) *(d - 1) = SEP; } s = nm; +#ifdef __VISAGECPP__ + // VA gives assignment in logical expr warning + while (*d) + *d++ = *s++; +#else while ((*d++ = *s++)); - +#endif delete[] nm_tmp; // clean up alloc /* Now clean up the buffer */ return wxRealPath(buf); @@ -568,7 +620,7 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin { static wxChar dest[_MAXPATHLEN]; - if (filename == _T("")) + if (filename == T("")) return (wxChar *) NULL; wxStrcpy (dest, WXSTRINGCAST filename); @@ -582,12 +634,12 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin if (envname != WXSTRINGCAST NULL && (val = wxGetenv (WXSTRINGCAST envname)) != NULL && (tcp = wxStrstr (dest, val)) != NULL) { - wxStrcpy (wxBuffer, tcp + wxStrlen (val)); - *tcp++ = _T('$'); - *tcp++ = _T('{'); + wxStrcpy (wxFileFunctionsBuffer, tcp + wxStrlen (val)); + *tcp++ = T('$'); + *tcp++ = T('{'); wxStrcpy (tcp, WXSTRINGCAST envname); - wxStrcat (tcp, _T("}")); - wxStrcat (tcp, wxBuffer); + wxStrcat (tcp, T("}")); + wxStrcat (tcp, wxFileFunctionsBuffer); } // Handle User's home (ignore root homes!) @@ -596,16 +648,16 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin (len = wxStrlen(val)) > 2 && wxStrncmp(dest, val, len) == 0) { - wxStrcpy(wxBuffer, _T("~")); - if (user != _T("")) - wxStrcat(wxBuffer, (const wxChar*) user); + wxStrcpy(wxFileFunctionsBuffer, T("~")); + if (user != T("")) + wxStrcat(wxFileFunctionsBuffer, (const wxChar*) user); #ifdef __WXMSW__ -// strcat(wxBuffer, "\\"); +// strcat(wxFileFunctionsBuffer, "\\"); #else -// strcat(wxBuffer, "/"); +// strcat(wxFileFunctionsBuffer, "/"); #endif - wxStrcat(wxBuffer, dest + len); - wxStrcpy (dest, wxBuffer); + wxStrcat(wxFileFunctionsBuffer, dest + len); + wxStrcpy (dest, wxFileFunctionsBuffer); } return dest; @@ -622,16 +674,16 @@ wxChar *wxFileNameFromPath (wxChar *path) tcp = path + wxStrlen (path); while (--tcp >= path) { - if (*tcp == _T('/') || *tcp == _T('\\') + if (*tcp == T('/') || *tcp == T('\\') #ifdef __VMS__ - || *tcp == _T(':') || *tcp == _T(']')) + || *tcp == T(':') || *tcp == T(']')) #else ) #endif return tcp + 1; } /* while */ -#ifdef __WXMSW__ - if (wxIsalpha (*path) && *(path + 1) == _T(':')) +#if defined(__WXMSW__) || defined(__WXPM__) + if (wxIsalpha (*path) && *(path + 1) == T(':')) return path + 2; #endif } @@ -640,7 +692,7 @@ wxChar *wxFileNameFromPath (wxChar *path) wxString wxFileNameFromPath (const wxString& path1) { - if (path1 != _T("")) + if (path1 != T("")) { wxChar *path = WXSTRINGCAST path1 ; @@ -649,16 +701,16 @@ wxString wxFileNameFromPath (const wxString& path1) tcp = path + wxStrlen (path); while (--tcp >= path) { - if (*tcp == _T('/') || *tcp == _T('\\') + if (*tcp == T('/') || *tcp == T('\\') #ifdef __VMS__ - || *tcp == _T(':') || *tcp == _T(']')) + || *tcp == T(':') || *tcp == T(']')) #else ) #endif return wxString(tcp + 1); } /* while */ -#ifdef __WXMSW__ - if (wxIsalpha (*path) && *(path + 1) == _T(':')) +#if defined(__WXMSW__) || defined(__WXPM__) + if (wxIsalpha (*path) && *(path + 1) == T(':')) return wxString(path + 2); #endif } @@ -687,7 +739,7 @@ wxPathOnly (wxChar *path) while (!done && i > -1) { // ] is for VMS - if (path[i] == _T('/') || path[i] == _T('\\') || path[i] == _T(']')) + if (path[i] == T('/') || path[i] == T('\\') || path[i] == T(']')) { done = TRUE; #ifdef __VMS__ @@ -701,13 +753,13 @@ wxPathOnly (wxChar *path) else i --; } -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXPM__) // Try Drive specifier - if (wxIsalpha (buf[0]) && buf[1] == _T(':')) + if (wxIsalpha (buf[0]) && buf[1] == T(':')) { // A:junk --> A:. (since A:.\junk Not A:\junk) - buf[2] = _T('.'); - buf[3] = _T('\0'); + buf[2] = T('.'); + buf[3] = T('\0'); return buf; } #endif @@ -719,7 +771,7 @@ wxPathOnly (wxChar *path) // Return just the directory, or NULL if no directory wxString wxPathOnly (const wxString& path) { - if (path != "") + if (path != T("")) { wxChar buf[_MAXPATHLEN]; @@ -735,7 +787,7 @@ wxString wxPathOnly (const wxString& path) while (!done && i > -1) { // ] is for VMS - if (path[i] == _T('/') || path[i] == _T('\\') || path[i] == _T(']')) + if (path[i] == T('/') || path[i] == T('\\') || path[i] == T(']')) { done = TRUE; #ifdef __VMS__ @@ -749,19 +801,19 @@ wxString wxPathOnly (const wxString& path) else i --; } -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXPM__) // Try Drive specifier - if (wxIsalpha (buf[0]) && buf[1] == _T(':')) + if (wxIsalpha (buf[0]) && buf[1] == T(':')) { // A:junk --> A:. (since A:.\junk Not A:\junk) - buf[2] = _T('.'); - buf[3] = _T('\0'); + buf[2] = T('.'); + buf[3] = T('\0'); return wxString(buf); } #endif } - return wxString(_T("")); + return wxString(T("")); } // Utility for converting delimiters in DOS filenames to UNIX style @@ -775,15 +827,15 @@ wxMac2UnixFilename (wxChar *s) if (s) { memmove( s+1 , s ,(strlen( s ) + 1)*sizeof(wxChar)) ; - if ( *s == _T(':') ) - *s = _T('.') ; + if ( *s == T(':') ) + *s = T('.') ; else - *s = _T('/') ; + *s = T('/') ; while (*s) { - if (*s == _T(':')) - *s = _T('/'); + if (*s == T(':')) + *s = T('/'); else *s = wxTolower(*s); // Case INDEPENDENT s++; @@ -796,24 +848,24 @@ wxUnix2MacFilename (wxChar *s) { if (s) { - if ( *s == _T('.') ) + if ( *s == T('.') ) { // relative path , since it goes on with slash which is translated to a : memmove( s , s+1 ,strlen( s )*sizeof(wxChar) ) ; } - else if ( *s == _T('/') ) + else if ( *s == T('/') ) { // absolute path -> on mac just start with the drive name memmove( s , s+1 ,strlen( s )*sizeof(wxChar) ) ; } else { - wxASSERT_MSG( 1 , _T("unknown path beginning") ) ; + wxASSERT_MSG( 1 , T("unknown path beginning") ) ; } while (*s) { - if (*s == _T('/') || *s == _T('\\')) - *s = _T(':'); + if (*s == T('/') || *s == T('\\')) + *s = T(':'); s++ ; } @@ -826,9 +878,9 @@ wxDos2UnixFilename (wxChar *s) if (s) while (*s) { - if (*s == _T('\\')) - *s = _T('/'); -#ifdef __WXMSW__ + if (*s == T('\\')) + *s = T('/'); +#if defined(__WXMSW__) || defined(__WXPM__) else *s = wxTolower(*s); // Case INDEPENDENT #endif @@ -837,19 +889,19 @@ wxDos2UnixFilename (wxChar *s) } void -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXPM__) wxUnix2DosFilename (wxChar *s) #else wxUnix2DosFilename (wxChar *WXUNUSED(s)) #endif { // Yes, I really mean this to happen under DOS only! JACS -#ifdef __WXMSW__ +#if defined(__WXMSW__) || defined(__WXPM__) if (s) while (*s) { - if (*s == _T('/')) - *s = _T('\\'); + if (*s == T('/')) + *s = T('\\'); s++; } #endif @@ -877,8 +929,8 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil (fp2 = fopen (gwxMacFileName2, "rb")) == NULL || (fp3 = fopen (gwxMacFileName3, "wb")) == NULL) #else - if ((fp1 = fopen (FNSTRINGCAST file1.fn_str(), "rb")) == NULL || - (fp2 = fopen (FNSTRINGCAST file2.fn_str(), "rb")) == NULL || + if ((fp1 = fopen (wxFNSTRINGCAST file1.fn_str(), "rb")) == NULL || + (fp2 = fopen (wxFNSTRINGCAST file2.fn_str(), "rb")) == NULL || (fp3 = fopen (wxFNCONV(outfile), "wb")) == NULL) #endif { @@ -924,9 +976,9 @@ wxCopyFile (const wxString& file1, const wxString& file2) return FALSE; if ((fd2 = fopen (gwxMacFileName2, "wb")) == NULL) #else - if ((fd1 = fopen (FNSTRINGCAST file1.fn_str(), "rb")) == NULL) + if ((fd1 = fopen (wxFNSTRINGCAST file1.fn_str(), "rb")) == NULL) return FALSE; - if ((fd2 = fopen (FNSTRINGCAST file2.fn_str(), "wb")) == NULL) + if ((fd2 = fopen (wxFNSTRINGCAST file2.fn_str(), "wb")) == NULL) #endif { fclose (fd1); @@ -954,7 +1006,7 @@ wxRenameFile (const wxString& file1, const wxString& file2) return TRUE; #else // Normal system call - if (0 == rename (FNSTRINGCAST file1.fn_str(), FNSTRINGCAST file2.fn_str())) + if (0 == rename (wxFNSTRINGCAST file1.fn_str(), wxFNSTRINGCAST file2.fn_str())) return TRUE; #endif // Try to copy @@ -969,13 +1021,13 @@ wxRenameFile (const wxString& file1, const wxString& file2) bool wxRemoveFile(const wxString& file) { #if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__) - int flag = remove(FNSTRINGCAST file.fn_str()); + int flag = remove(wxFNSTRINGCAST file.fn_str()); #elif defined( __WXMAC__ ) wxStrcpy( gwxMacFileName , file ) ; wxUnix2MacFilename( gwxMacFileName ) ; int flag = unlink(gwxMacFileName); #else - int flag = unlink(FNSTRINGCAST file.fn_str()); + int flag = unlink(wxFNSTRINGCAST file.fn_str()); #endif return (flag == 0) ; } @@ -990,12 +1042,12 @@ bool wxMkdir(const wxString& dir, int perm) const wxChar *dirname = dir.c_str(); #endif // Mac/!Mac - // assume mkdir() has 2 args on non Windows platforms and on Windows too + // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too // for the GNU compiler -#if !defined(__WXMSW__) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) +#if (!(defined(__WXMSW__) || defined(__WXPM__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__) if ( mkdir(wxFNCONV(dirname), perm) != 0 ) -#else // MSW - if ( mkdir(wxFNCONV(dirname)) != 0 ) +#else // MSW and OS/2 + if ( mkdir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 ) #endif // !MSW/MSW { wxLogSysError(_("Directory '%s' couldn't be created"), dirname); @@ -1019,7 +1071,7 @@ bool wxRmdir(const wxString& dir, int WXUNUSED(flags)) #ifdef __SALFORDC__ return FALSE; // What to do? #else - return (rmdir(FNSTRINGCAST dir.fn_str()) == 0); + return (rmdir(wxFNSTRINGCAST dir.fn_str()) == 0); #endif #endif @@ -1074,11 +1126,11 @@ bool wxDirExists(const wxString& dir) // does the path exists? (may have or not '/' or '\\' at the end) bool wxPathExists(const wxChar *pszPathName) { - // Windows API returns -1 from stat for "c:\dir\" if "c:\dir" exists - // OTOH, we should change "d:" to "d:\" and leave "\" as is. + /* Windows API returns -1 from stat for "c:\dir\" if "c:\dir" exists + * OTOH, we should change "d:" to "d:\" and leave "\" as is. */ wxString strPath(pszPathName); - if ( wxEndsWithPathSeparator(pszPathName) && pszPathName[1] != _T('\0') ) - strPath.Last() = _T('\0'); + if ( wxEndsWithPathSeparator(pszPathName) && pszPathName[1] != T('\0') ) + strPath.Last() = T('\0'); #ifdef __SALFORDC__ struct _stat st; @@ -1086,7 +1138,7 @@ bool wxPathExists(const wxChar *pszPathName) struct stat st; #endif - return stat(FNSTRINGCAST strPath.fn_str(), &st) == 0 && (st.st_mode & S_IFDIR); + return stat(wxFNSTRINGCAST strPath.fn_str(), &st) == 0 && (st.st_mode & S_IFDIR); } // Get a temporary filename, opening and closing the file. @@ -1114,7 +1166,7 @@ wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf) for (short suffix = last_temp + 1; suffix != last_temp; ++suffix %= 1000) { - wxSprintf (tmp, _T("/tmp/%s%d.%03x"), WXSTRINGCAST prefix, (int) getpid (), (int) suffix); + wxSprintf (tmp, T("/tmp/%s%d.%03x"), WXSTRINGCAST prefix, (int) getpid (), (int) suffix); if (!wxFileExists( tmp )) { // Touch the file to create it (reserve name) @@ -1165,11 +1217,11 @@ wxString wxFindFirstFile(const wxChar *spec, int flags) wxString path(wxPathOnly(gs_strFileSpec)); // special case: path is really "/" - if ( !path && gs_strFileSpec[0u] == _T('/') ) - path = _T('/'); + if ( !path && gs_strFileSpec[0u] == T('/') ) + path = T('/'); // path is empty => Local directory if ( !path ) - path = _T('.'); + path = T('.'); gs_dirStream = opendir(path.fn_str()); if ( !gs_dirStream ) @@ -1191,7 +1243,7 @@ wxString wxFindNextFile() wxString result; #ifndef __VMS__ - wxCHECK_MSG( gs_dirStream, result, _T("must call wxFindFirstFile first") ); + wxCHECK_MSG( gs_dirStream, result, T("must call wxFindFirstFile first") ); // Find path only so we can concatenate // found file onto path @@ -1199,8 +1251,8 @@ wxString wxFindNextFile() wxString name(wxFileNameFromPath(gs_strFileSpec)); /* MATTHEW: special case: path is really "/" */ - if ( !path && gs_strFileSpec[0u] == _T('/')) - path = _T('/'); + if ( !path && gs_strFileSpec[0u] == T('/')) + path = T('/'); // Do the reading struct dirent *nextDir; @@ -1214,8 +1266,8 @@ wxString wxFindNextFile() if ( !path.IsEmpty() ) { result = path; - if ( path != _T('/') ) - result += _T('/'); + if ( path != T('/') ) + result += T('/'); } result += nextDir->d_name; @@ -1278,7 +1330,7 @@ wxString wxFindFirstFile(const wxChar *spec, int flags) // Find path only so we can concatenate found file onto path wxString path(wxPathOnly(gs_strFileSpec)); if ( !path.IsEmpty() ) - result << path << _T('\\'); + result << path << T('\\'); #ifdef __WIN32__ if ( gs_hFileStruct != INVALID_HANDLE_VALUE ) @@ -1371,7 +1423,7 @@ try_again: goto try_again; if ( !path.IsEmpty() ) - result << path << _T('\\'); + result << path << T('\\'); result << gs_findDataStruct.cFileName; } @@ -1437,12 +1489,12 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz) if (getcwd(buf, sz) == NULL) { #endif #endif - buf[0] = _T('.'); - buf[1] = _T('\0'); + buf[0] = T('.'); + buf[1] = T('\0'); } #if wxUSE_UNICODE else { - wxConv_file.MB2WC(buf, cbuf, sz); + wxConvFile.MB2WC(buf, cbuf, sz); delete [] cbuf; } #endif @@ -1462,8 +1514,8 @@ wxString wxGetCwd() bool wxSetWorkingDirectory(const wxString& d) { -#if defined( __UNIX__ ) || defined( __WXMAC__ ) - return (chdir(d.fn_str()) == 0); +#if defined( __UNIX__ ) || defined( __WXMAC__ ) || defined(__WXPM__) + return (chdir(wxFNSTRINGCAST d.fn_str()) == 0); #elif defined(__WINDOWS__) #ifdef __WIN32__ @@ -1508,9 +1560,9 @@ wxString wxGetOSDirectory() #endif } -bool wxEndsWithPathSeparator(const char *pszFileName) +bool wxEndsWithPathSeparator(const wxChar *pszFileName) { - size_t len = Strlen(pszFileName); + size_t len = wxStrlen(pszFileName); if ( len == 0 ) return FALSE; else @@ -1561,7 +1613,7 @@ void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName, wxString *pstrExt) { // it can be empty, but it shouldn't be NULL - wxCHECK_RET( pszFileName, _T("NULL file name in wxSplitPath") ); + wxCHECK_RET( pszFileName, T("NULL file name in wxSplitPath") ); const wxChar *pDot = wxStrrchr(pszFileName, wxFILE_SEP_EXT); @@ -1579,7 +1631,7 @@ void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName, pDot = NULL; } #endif // MSW/Unix - + if ( pDot < pLastSeparator ) { // the dot is part of the path, not the start of the extension @@ -1588,7 +1640,7 @@ void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName, if ( pstrPath ) { - if ( pLastSeparator ) + if ( pLastSeparator ) *pstrPath = wxString(pszFileName, pLastSeparator - pszFileName); else pstrPath->Empty(); @@ -1621,9 +1673,9 @@ bool wxIsWild( const wxString& pattern ) wxChar *pat = WXSTRINGCAST(tmp); while (*pat) { switch (*pat++) { - case _T('?'): case _T('*'): case _T('['): case _T('{'): + case T('?'): case T('*'): case T('['): case T('{'): return TRUE; - case _T('\\'): + case T('\\'): if (!*pat++) return FALSE; } @@ -1657,57 +1709,57 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special ) wxChar *cp; bool done = FALSE, ret_code, ok; // Below is for vi fans - const wxChar OB = _T('{'), CB = _T('}'); + const wxChar OB = T('{'), CB = T('}'); // dot_special means '.' only matches '.' - if (dot_special && *str == _T('.') && *pattern != *str) + if (dot_special && *str == T('.') && *pattern != *str) return FALSE; - while ((*pattern != _T('\0')) && (!done) - && (((*str==_T('\0'))&&((*pattern==OB)||(*pattern==_T('*'))))||(*str!=_T('\0')))) { + while ((*pattern != T('\0')) && (!done) + && (((*str==T('\0'))&&((*pattern==OB)||(*pattern==T('*'))))||(*str!=T('\0')))) { switch (*pattern) { - case _T('\\'): + case T('\\'): pattern++; - if (*pattern != _T('\0')) + if (*pattern != T('\0')) pattern++; break; - case _T('*'): + case T('*'): pattern++; ret_code = FALSE; - while ((*str!=_T('\0')) + while ((*str!=T('\0')) && (!(ret_code=wxMatchWild(pattern, str++, FALSE)))) /*loop*/; if (ret_code) { - while (*str != _T('\0')) + while (*str != T('\0')) str++; - while (*pattern != _T('\0')) + while (*pattern != T('\0')) pattern++; } break; - case _T('['): + case T('['): pattern++; repeat: - if ((*pattern == _T('\0')) || (*pattern == _T(']'))) { + if ((*pattern == T('\0')) || (*pattern == T(']'))) { done = TRUE; break; } - if (*pattern == _T('\\')) { + if (*pattern == T('\\')) { pattern++; - if (*pattern == _T('\0')) { + if (*pattern == T('\0')) { done = TRUE; break; } } - if (*(pattern + 1) == _T('-')) { + if (*(pattern + 1) == T('-')) { c = *pattern; pattern += 2; - if (*pattern == _T(']')) { + if (*pattern == T(']')) { done = TRUE; break; } - if (*pattern == _T('\\')) { + if (*pattern == T('\\')) { pattern++; - if (*pattern == _T('\0')) { + if (*pattern == T('\0')) { done = TRUE; break; } @@ -1721,51 +1773,51 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special ) goto repeat; } pattern++; - while ((*pattern != _T(']')) && (*pattern != _T('\0'))) { - if ((*pattern == _T('\\')) && (*(pattern + 1) != _T('\0'))) + while ((*pattern != T(']')) && (*pattern != T('\0'))) { + if ((*pattern == T('\\')) && (*(pattern + 1) != T('\0'))) pattern++; pattern++; } - if (*pattern != _T('\0')) { + if (*pattern != T('\0')) { pattern++, str++; } break; - case _T('?'): + case T('?'): pattern++; str++; break; case OB: pattern++; - while ((*pattern != CB) && (*pattern != _T('\0'))) { + while ((*pattern != CB) && (*pattern != T('\0'))) { cp = str; ok = TRUE; - while (ok && (*cp != _T('\0')) && (*pattern != _T('\0')) - && (*pattern != _T(',')) && (*pattern != CB)) { - if (*pattern == _T('\\')) + while (ok && (*cp != T('\0')) && (*pattern != T('\0')) + && (*pattern != T(',')) && (*pattern != CB)) { + if (*pattern == T('\\')) pattern++; ok = (*pattern++ == *cp++); } - if (*pattern == _T('\0')) { + if (*pattern == T('\0')) { ok = FALSE; done = TRUE; break; } else if (ok) { str = cp; - while ((*pattern != CB) && (*pattern != _T('\0'))) { - if (*++pattern == _T('\\')) { + while ((*pattern != CB) && (*pattern != T('\0'))) { + if (*++pattern == T('\\')) { if (*++pattern == CB) pattern++; } } } else { - while (*pattern!=CB && *pattern!=_T(',') && *pattern!=_T('\0')) { - if (*++pattern == _T('\\')) { - if (*++pattern == CB || *pattern == _T(',')) + while (*pattern!=CB && *pattern!=T(',') && *pattern!=T('\0')) { + if (*++pattern == T('\\')) { + if (*++pattern == CB || *pattern == T(',')) pattern++; } } } - if (*pattern != _T('\0')) + if (*pattern != T('\0')) pattern++; } break; @@ -1777,9 +1829,9 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special ) } } } - while (*pattern == _T('*')) + while (*pattern == T('*')) pattern++; - return ((*str == _T('\0')) && (*pattern == _T('\0'))); + return ((*str == T('\0')) && (*pattern == T('\0'))); }; #endif