X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eb53bce493d640225a8e562bebf66254d0c205fe..aa21a09f91f57d45932363ca33959155dd8aa760:/src/common/filefn.cpp?ds=inline diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 7ce14f83aa..583c0711b3 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -31,7 +31,9 @@ #include "wx/utils.h" #include "wx/intl.h" -#include "wx/ffile.h" +#include "wx/file.h" +#include "wx/filename.h" +#include "wx/dir.h" // there are just too many of those... #ifdef __VISUALC__ @@ -48,6 +50,10 @@ #endif #endif +#if defined(__WXMAC__) + #include "wx/mac/private.h" // includes mac headers +#endif + #include #ifndef __MWERKS__ @@ -56,6 +62,7 @@ #else #include #include + #include #endif #ifdef __UNIX__ @@ -67,16 +74,22 @@ #include #include "wx/os2/private.h" #endif -#ifdef __WINDOWS__ +#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) #if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__) #include #include + #include #endif // __WINDOWS__ #endif // native Win compiler -#ifdef __GNUWIN32__ - #ifndef __TWIN32__ - #include +#if defined(__DOS__) + #ifdef __WATCOMC__ + #include + #include + #include + #endif + #ifdef __DJGPP__ + #include #endif #endif @@ -101,21 +114,41 @@ #ifdef __WINDOWS__ #include + + // sys/cygwin.h is needed for cygwin_conv_to_full_win32_path() + // + // note that it must be included after + #ifdef __GNUWIN32__ + #ifdef __CYGWIN__ + #include + #endif + #include + #ifndef __TWIN32__ + #include + #endif + #endif // __GNUWIN32__ +#endif // __WINDOWS__ + +// TODO: Borland probably has _wgetcwd as well? +#ifdef _MSC_VER + #define HAVE_WGETCWD #endif // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- -#define _MAXPATHLEN 500 +#ifndef _MAXPATHLEN + #define _MAXPATHLEN 1024 +#endif extern wxChar *wxBuffer; #ifdef __WXMAC__ -#include "morefile.h" -#include "moreextr.h" -#include "fullpath.h" -#include "fspcompa.h" +# include "MoreFiles.h" +# include "MoreFilesExtras.h" +# include "FullPath.h" +# include "FSpCompat.h" #endif IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList) @@ -139,11 +172,7 @@ const off_t wxInvalidOffset = (off_t)-1; // ---------------------------------------------------------------------------- // we need to translate Mac filenames before passing them to OS functions -#ifdef __MAC__ - #define OS_FILENAME(s) (wxUnix2MacFilename(s)) -#else - #define OS_FILENAME(s) (s.fn_str()) -#endif +#define OS_FILENAME(s) (s.fn_str()) // ============================================================================ // implementation @@ -258,8 +287,8 @@ wxString wxPathList::FindAbsoluteValidPath (const wxString& file) return f; wxString buf; - wxGetWorkingDirectory(buf.GetWriteBuf(_MAXPATHLEN), _MAXPATHLEN - 1); - buf.UngetWriteBuf(); + wxGetWorkingDirectory(wxStringBuffer(buf, _MAXPATHLEN), _MAXPATHLEN); + if ( !wxEndsWithPathSeparator(buf) ) { buf += wxFILE_SEP_PATH; @@ -272,8 +301,11 @@ wxString wxPathList::FindAbsoluteValidPath (const wxString& file) bool wxFileExists (const wxString& filename) { -#ifdef __GNUWIN32__ // (fix a B20 bug) - return GetFileAttributes(filename) != 0xFFFFFFFF; +#if defined(__WIN32__) && !defined(__WXMICROWIN__) + // GetFileAttributes can copy with network paths unlike stat() + DWORD ret = ::GetFileAttributes(filename); + + return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY); #else wxStructStat stbuf; if ( !filename.empty() && wxStat (OS_FILENAME(filename), &stbuf) == 0 ) @@ -286,20 +318,33 @@ wxFileExists (const wxString& filename) bool wxIsAbsolutePath (const wxString& filename) { - if (filename != wxT("")) + if (filename != wxT("")) { - if (filename[0] == wxT('/') +#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__ - || (filename[0] == wxT('[') && filename[1] != wxT('.')) + if ((filename[0] == wxT('[') && filename[1] != wxT('.'))) + return TRUE; #endif #ifdef __WINDOWS__ - /* MSDOS */ - || filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':')) + // MSDOS like + if (filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':'))) + return TRUE; #endif - ) - return TRUE; } - return FALSE; + return FALSE ; } /* @@ -441,7 +486,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) { register wxChar *d, *s, *nm; wxChar lnm[_MAXPATHLEN]; - int q; + int q; // Some compilers don't like this line. // const wxChar trimchars[] = wxT("\n \t"); @@ -497,7 +542,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) } else #else - while ((*d++ = *s)) { + while ((*d++ = *s) != 0) { # ifndef __WXMSW__ if (*s == wxT('\\')) { if ((*(d - 1) = *++s)) { @@ -517,13 +562,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) register wxChar *start = d; register int braces = (*s == wxT('{') || *s == wxT('(')); register wxChar *value; -#ifdef __VISAGECPP__ - // VA gives assignment in logical expr warning - while (*d) - *d++ = *s; -#else - while ((*d++ = *s)) -#endif + while ((*d++ = *s) != 0) if (braces ? (*s == wxT('}') || *s == wxT(')')) : !(wxIsalnum(*s) || *s == wxT('_')) ) break; else @@ -531,12 +570,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) *--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 + for ((d = start - 1); (*d++ = *value++) != 0;); d--; if (braces && *s) s++; @@ -546,7 +580,6 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) /* Expand ~ and ~user */ nm = lnm; - s = wxT(""); if (nm[0] == wxT('~') && !q) { /* prefix ~ */ @@ -570,7 +603,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) if ((home = WXSTRINGCAST wxGetUserHome(wxString(nm + 1))) == NULL) { if (was_sep) /* replace only if it was there: */ *s = SEP; - s = wxT(""); + s = NULL; } else { nm = nnm; s = home; @@ -588,13 +621,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) *(d - 1) = SEP; } s = nm; -#ifdef __VISAGECPP__ - // VA gives assignment in logical expr warning - while (*d) - *d++ = *s++; -#else - while ((*d++ = *s++)); -#endif + while ((*d++ = *s++) != 0); delete[] nm_tmp; // clean up alloc /* Now clean up the buffer */ return wxRealPath(buf); @@ -659,162 +686,244 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin // (basename) wxChar *wxFileNameFromPath (wxChar *path) { - if (path) + if (path) { - register wxChar *tcp; + register wxChar *tcp; - tcp = path + wxStrlen (path); - while (--tcp >= path) + tcp = path + wxStrlen (path); + while (--tcp >= path) { - if (*tcp == wxT('/') || *tcp == wxT('\\') -#ifdef __VMS__ - || *tcp == wxT(':') || *tcp == wxT(']')) +#if defined(__WXMAC__) && !defined(__DARWIN__) + // Classic or Carbon CodeWarrior like + // Carbon with Apple DevTools is Unix like + if (*tcp == wxT(':')) + return tcp + 1; #else - ) + // Unix like or Windows + if (*tcp == wxT('/') || *tcp == wxT('\\')) + return tcp + 1; +#endif +#ifdef __VMS__ + if (*tcp == wxT(':') || *tcp == wxT(']')) + return tcp + 1; #endif - return tcp + 1; - } /* while */ + } /* while */ #if defined(__WXMSW__) || defined(__WXPM__) - if (wxIsalpha (*path) && *(path + 1) == wxT(':')) - return path + 2; + // MSDOS like + if (wxIsalpha (*path) && *(path + 1) == wxT(':')) + return path + 2; #endif } - return path; + return path; } wxString wxFileNameFromPath (const wxString& path1) { - if (path1 != wxT("")) - { - - wxChar *path = WXSTRINGCAST path1 ; - register wxChar *tcp; + if (path1 != wxT("")) + { + wxChar *path = WXSTRINGCAST path1 ; + register wxChar *tcp; - tcp = path + wxStrlen (path); - while (--tcp >= path) - { - if (*tcp == wxT('/') || *tcp == wxT('\\') -#ifdef __VMS__ - || *tcp == wxT(':') || *tcp == wxT(']')) + tcp = path + wxStrlen (path); + while (--tcp >= path) + { +#if defined(__WXMAC__) && !defined(__DARWIN__) + // Classic or Carbon CodeWarrior like + // Carbon with Apple DevTools is Unix like + if (*tcp == wxT(':') ) + return wxString(tcp + 1); #else - ) + // Unix like or Windows + if (*tcp == wxT('/') || *tcp == wxT('\\')) + return wxString(tcp + 1); #endif +#ifdef __VMS__ + if (*tcp == wxT(':') || *tcp == wxT(']')) return wxString(tcp + 1); - } /* while */ +#endif + } /* while */ #if defined(__WXMSW__) || defined(__WXPM__) - if (wxIsalpha (*path) && *(path + 1) == wxT(':')) + // MSDOS like + if (wxIsalpha (*path) && *(path + 1) == wxT(':')) return wxString(path + 2); #endif } - // Yes, this should return the path, not an empty string, otherwise - // we get "thing.txt" -> "". - return path1; + // Yes, this should return the path, not an empty string, otherwise + // we get "thing.txt" -> "". + return path1; } // Return just the directory, or NULL if no directory wxChar * wxPathOnly (wxChar *path) { - if (path && *path) + if (path && *path) { - static wxChar buf[_MAXPATHLEN]; - - // Local copy - wxStrcpy (buf, path); + static wxChar buf[_MAXPATHLEN]; - int l = wxStrlen(path); - bool done = FALSE; + // Local copy + wxStrcpy (buf, path); - int i = l - 1; + int l = wxStrlen(path); + int i = l - 1; - // Search backward for a backward or forward slash - while (!done && i > -1) - { - // ] is for VMS - if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']')) + // Search backward for a backward or forward slash + while (i > -1) { - done = TRUE; +#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(']') ) - buf[i+1] = 0; - else + if (path[i] == wxT(']')) + { + buf[i+1] = 0; + return buf; + } #endif - buf[i] = 0; - - return buf; + i --; } - else i --; - } #if defined(__WXMSW__) || defined(__WXPM__) - // Try Drive specifier - if (wxIsalpha (buf[0]) && buf[1] == wxT(':')) + // Try Drive specifier + if (wxIsalpha (buf[0]) && buf[1] == wxT(':')) { - // A:junk --> A:. (since A:.\junk Not A:\junk) - buf[2] = wxT('.'); - buf[3] = wxT('\0'); - return buf; + // A:junk --> A:. (since A:.\junk Not A:\junk) + buf[2] = wxT('.'); + buf[3] = wxT('\0'); + return buf; } #endif } - - return (wxChar *) NULL; + return (wxChar *) NULL; } // Return just the directory, or NULL if no directory wxString wxPathOnly (const wxString& path) { - if (path != wxT("")) + if (path != wxT("")) { - wxChar buf[_MAXPATHLEN]; + wxChar buf[_MAXPATHLEN]; - // Local copy - wxStrcpy (buf, WXSTRINGCAST path); + // Local copy + wxStrcpy (buf, WXSTRINGCAST path); - int l = path.Length(); - bool done = FALSE; + int l = path.Length(); + int i = l - 1; - int i = l - 1; - - // Search backward for a backward or forward slash - while (!done && i > -1) - { - // ] is for VMS - if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']')) + // Search backward for a backward or forward slash + while (i > -1) { - done = TRUE; +#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(']') ) - buf[i+1] = 0; - else + if (path[i] == wxT(']')) + { + buf[i+1] = 0; + return wxString(buf); + } #endif - buf[i] = 0; - - return wxString(buf); + i --; } - else i --; - } #if defined(__WXMSW__) || defined(__WXPM__) - // Try Drive specifier - if (wxIsalpha (buf[0]) && buf[1] == wxT(':')) + // Try Drive specifier + if (wxIsalpha (buf[0]) && buf[1] == wxT(':')) { - // A:junk --> A:. (since A:.\junk Not A:\junk) - buf[2] = wxT('.'); - buf[3] = wxT('\0'); - return wxString(buf); + // A:junk --> A:. (since A:.\junk Not A:\junk) + buf[2] = wxT('.'); + buf[3] = wxT('\0'); + return wxString(buf); } #endif } - - return wxString(wxT("")); + return wxString(wxT("")); } // Utility for converting delimiters in DOS filenames to UNIX style // and back again - or we get nasty problems with delimiters. // Also, convert to lower case, since case is significant in UNIX. -#ifdef __WXMAC__ +#if defined(__WXMAC__) +wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) +{ +#ifdef __DARWIN__ + FSRef theRef; + char thePath[FILENAME_MAX]; + + // convert the FSSpec to an FSRef + (void) FSpMakeFSRef( spec, &theRef ); + // get the POSIX path associated with the FSRef + (void) FSRefMakePath( &theRef, (UInt8 *)thePath, sizeof(thePath) ); + + // create path string for return value + wxString result( thePath ) ; +#else + Handle myPath ; + short length ; + + // get length of path and allocate handle + FSpGetFullPath( spec , &length , &myPath ) ; + ::SetHandleSize( myPath , length + 1 ) ; + ::HLock( myPath ) ; + (*myPath)[length] = 0 ; + if ((length > 0) && ((*myPath)[length-1] == ':')) + (*myPath)[length-1] = 0 ; + + // create path string for return value + wxString result( (char*) *myPath ) ; + + // free allocated handle + ::HUnlock( myPath ) ; + ::DisposeHandle( myPath ) ; +#endif + + return result ; +} + +void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) +{ +#ifdef __DARWIN__ + FSRef theRef; + + // get the FSRef associated with the POSIX path + (void) FSPathMakeRef((const UInt8 *) path, &theRef, NULL); + // convert the FSRef to an FSSpec + (void) FSGetCatalogInfo(&theRef, kFSCatInfoNone, NULL, NULL, spec, NULL); +#else + FSpLocationFromFullPath( strlen(path) , path , spec ) ; +#endif +} + +#ifndef __DARWIN__ +// Mac file names are POSIX (Unix style) under Darwin +// therefore the conversion functions below are not needed static char sMacFileNameConversion[ 1000 ] ; @@ -822,82 +931,63 @@ wxString wxMac2UnixFilename (const char *str) { char *s = sMacFileNameConversion ; strcpy( s , str ) ; - if (s) - { - memmove( s+1 , s ,strlen( s ) + 1) ; - if ( *s == ':' ) + if (s) + { + memmove( s+1 , s ,strlen( s ) + 1) ; + if ( *s == ':' ) *s = '.' ; - else + else *s = '/' ; - while (*s) - { + while (*s) + { if (*s == ':') - *s = '/'; + *s = '/'; else - *s = wxTolower (*s); // Case INDEPENDENT + *s = wxTolower(*s); // Case INDEPENDENT s++; + } } - } - return wxString (sMacFileNameConversion) ; + return wxString(sMacFileNameConversion) ; } wxString wxUnix2MacFilename (const char *str) { char *s = sMacFileNameConversion ; strcpy( s , str ) ; - if (s) - { - if ( *s == '.' ) - { - // relative path , since it goes on with slash which is translated to a : - memmove( s , s+1 ,strlen( s ) ) ; - } - else if ( *s == '/' ) - { - // absolute path -> on mac just start with the drive name - memmove( s , s+1 ,strlen( s ) ) ; - } - else + if (s) { - wxASSERT_MSG( 1 , "unkown path beginning" ) ; - } - while (*s) - { - if (*s == '/' || *s == '\\') - { - // convert any back-directory situations - if ( *(s+1) == '.' && *(s+2) == '.' && ( (*(s+3) == '/' || *(s+3) == '\\') ) ) - { - *s = ':'; - memmove( s+1 , s+3 ,strlen( s+3 ) + 1 ) ; - } - else - *s = ':'; - } - - s++ ; + if ( *s == '.' ) + { + // relative path , since it goes on with slash which is translated to a : + memmove( s , s+1 ,strlen( s ) ) ; + } + else if ( *s == '/' ) + { + // absolute path -> on mac just start with the drive name + memmove( s , s+1 ,strlen( s ) ) ; + } + else + { + wxASSERT_MSG( 1 , "unkown path beginning" ) ; + } + while (*s) + { + if (*s == '/' || *s == '\\') + { + // convert any back-directory situations + if ( *(s+1) == '.' && *(s+2) == '.' && ( (*(s+3) == '/' || *(s+3) == '\\') ) ) + { + *s = ':'; + memmove( s+1 , s+3 ,strlen( s+3 ) + 1 ) ; + } + else + *s = ':'; + } + s++ ; + } } - } - return wxString (sMacFileNameConversion) ; -} - -wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) -{ - Handle myPath ; - short length ; - - FSpGetFullPath( spec , &length , &myPath ) ; - ::SetHandleSize( myPath , length + 1 ) ; - ::HLock( myPath ) ; - (*myPath)[length] = 0 ; - if ( length > 0 && (*myPath)[length-1] ==':' ) - (*myPath)[length-1] = 0 ; - - wxString result( (char*) *myPath ) ; - ::HUnlock( myPath ) ; - ::DisposeHandle( myPath ) ; - return result ; + return wxString (sMacFileNameConversion) ; } wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) @@ -905,18 +995,15 @@ wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) return wxMac2UnixFilename( wxMacFSSpec2MacFilename( spec) ) ; } -void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) -{ - FSpLocationFromFullPath( strlen(path ) , path , spec ) ; -} - void wxUnixFilename2FSSpec( const char *path , FSSpec *spec ) { wxString var = wxUnix2MacFilename( path ) ; wxMacFilename2FSSpec( var , spec ) ; } +#endif // ! __DARWIN__ + +#endif // __WXMAC__ -#endif void wxDos2UnixFilename (char *s) { @@ -964,9 +1051,9 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil FILE *fp2 = (FILE *) NULL; FILE *fp3 = (FILE *) NULL; // Open the inputs and outputs - if ((fp1 = fopen (OS_FILENAME( file1 ), "rb")) == NULL || - (fp2 = fopen (OS_FILENAME( file2 ), "rb")) == NULL || - (fp3 = fopen (OS_FILENAME( outfile ), "wb")) == NULL) + if ((fp1 = wxFopen (OS_FILENAME( file1 ), wxT("rb"))) == NULL || + (fp2 = wxFopen (OS_FILENAME( file2 ), wxT("rb"))) == NULL || + (fp3 = wxFopen (OS_FILENAME( outfile ), wxT("wb"))) == NULL) { if (fp1) fclose (fp1); @@ -988,22 +1075,69 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil fclose (fp3); bool result = wxRenameFile(outfile, file3); - delete outfile; return result; } // Copy files bool -wxCopyFile (const wxString& file1, const wxString& file2) +wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite) { - wxFFile fileIn(file1, "rb"); +#if defined(__WIN32__) && !defined(__WXMICROWIN__) + // CopyFile() copies file attributes and modification time too, so use it + // instead of our code if available + // + // NB: 3rd parameter is bFailIfExists i.e. the inverse of overwrite + return ::CopyFile(file1, file2, !overwrite) != 0; +#elif defined(__WXPM__) + if (::DosCopy(file2, file2, overwrite ? DCPY_EXISTING : 0) == 0) + return TRUE; + else + return FALSE; +#else // !Win32 + wxStructStat fbuf; + + // get permissions of file1 + if ( wxStat(OS_FILENAME(file1), &fbuf) != 0 ) + { + // the file probably doesn't exist or we haven't the rights to read + // from it anyhow + wxLogSysError(_("Impossible to get permissions for file '%s'"), + file1.c_str()); + return FALSE; + } + + // open file1 for reading + wxFile fileIn(file1, wxFile::read); if ( !fileIn.IsOpened() ) return FALSE; - wxFFile fileOut(file2, "wb"); - if ( !fileOut.IsOpened() ) + // remove file2, if it exists. This is needed for creating + // file2 with the correct permissions in the next step + if ( wxFileExists(file2) && (!overwrite || !wxRemoveFile(file2))) + { + wxLogSysError(_("Impossible to overwrite the file '%s'"), + file2.c_str()); return FALSE; + } +#ifdef __UNIX__ + // reset the umask as we want to create the file with exactly the same + // permissions as the original one + mode_t oldUmask = umask( 0 ); +#endif // __UNIX__ + + // create file2 with the same permissions than file1 and open it for + // writing + wxFile fileOut; + if ( !fileOut.Create(file2, overwrite, fbuf.st_mode & 0777) ) + return FALSE; + +#ifdef __UNIX__ + /// restore the old umask + umask(oldUmask); +#endif // __UNIX__ + + // copy contents of file1 to file2 char buf[4096]; size_t count; for ( ;; ) @@ -1020,14 +1154,32 @@ wxCopyFile (const wxString& file1, const wxString& file2) 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 + if ( !fileIn.Close() || !fileOut.Close() ) + return FALSE; + +#if !defined(__VISAGECPP__) && !defined(__WXMAC__) || defined(__UNIX__) + // no chmod in VA. Should be some permission API for HPFS386 partitions + // however + if ( chmod(OS_FILENAME(file2), fbuf.st_mode) != 0 ) + { + wxLogSysError(_("Impossible to set permissions for the file '%s'"), + file2.c_str()); + return FALSE; + } +#endif // OS/2 || Mac + return TRUE; +#endif // __WXMSW__ && __WIN32__ } bool wxRenameFile (const wxString& file1, const wxString& file2) { // Normal system call - if ( wxRename (OS_FILENAME(file1), OS_FILENAME(file2)) == 0 ) + if ( wxRename (file1, file2) == 0 ) return TRUE; // Try to copy @@ -1041,7 +1193,10 @@ wxRenameFile (const wxString& file1, const wxString& file2) bool wxRemoveFile(const wxString& file) { -#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__) +#if defined(__VISUALC__) \ + || defined(__BORLANDC__) \ + || defined(__WATCOMC__) \ + || defined(__GNUWIN32__) int res = wxRemove(file); #else int res = unlink(OS_FILENAME(file)); @@ -1052,18 +1207,28 @@ bool wxRemoveFile(const wxString& file) bool wxMkdir(const wxString& dir, int perm) { -#if defined( __WXMAC__ ) - return (mkdir(wxUnix2MacFilename( dir ) , 0 ) == 0); +#if defined(__WXMAC__) && !defined(__UNIX__) + return (mkdir( dir , 0 ) == 0); #else // !Mac const wxChar *dirname = dir.c_str(); // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too // for the GNU compiler -#if (!(defined(__WXMSW__) || defined(__WXPM__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__) +#if (!(defined(__WXMSW__) || defined(__WXPM__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__) || defined(__WXMICROWIN__) if ( mkdir(wxFNCONV(dirname), perm) != 0 ) #elif defined(__WXPM__) if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's?? -#else // !MSW and !OS/2 VAC++ +#elif defined(__DOS__) + #if defined(__WATCOMC__) + (void)perm; + if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 ) + #elif defined(__DJGPP__) + if ( mkdir(wxFNCONV(dirname), perm) != 0 ) + #else + #error "Unsupported DOS compiler!" + #endif +#else // !MSW, !DOS and !OS/2 VAC++ + (void)perm; if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 ) #endif // !MSW/MSW { @@ -1097,6 +1262,7 @@ bool wxRmdir(const wxString& dir, int WXUNUSED(flags)) bool wxPathExists(const wxChar *pszPathName) { wxString strPath(pszPathName); + #ifdef __WINDOWS__ // Windows fails to find directory named "c:\dir\" even if "c:\dir" exists, // so remove all trailing backslashes from the path - but don't do this for @@ -1104,13 +1270,20 @@ bool wxPathExists(const wxChar *pszPathName) while ( wxEndsWithPathSeparator(strPath) ) { size_t len = strPath.length(); - if ( len == 1 || strPath[len - 1] == _T(':') ) + if ( len == 1 || (len == 3 && strPath[len - 2] == _T(':')) ) break; strPath.Truncate(len - 1); } #endif // __WINDOWS__ +#if defined(__WIN32__) && !defined(__WXMICROWIN__) + // stat() can't cope with network paths + DWORD ret = ::GetFileAttributes(strPath); + + return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY); +#else // !__WIN32__ + wxStructStat st; #ifndef __VISAGECPP__ return wxStat(wxFNSTRINGCAST strPath.fn_str(), &st) == 0 && @@ -1121,568 +1294,207 @@ bool wxPathExists(const wxChar *pszPathName) (st.st_mode == S_IFDIR); #endif +#endif // __WIN32__/!__WIN32__ } // Get a temporary filename, opening and closing the file. wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf) { -#ifdef __WINDOWS__ + wxString filename = wxFileName::CreateTempFileName(prefix); + if ( filename.empty() ) + return NULL; -#ifndef __WIN32__ - wxChar tmp[144]; - ::GetTempFileName(0, WXSTRINGCAST prefix, 0, tmp); -#else - wxChar tmp[MAX_PATH]; - wxChar tmpPath[MAX_PATH]; - ::GetTempPath(MAX_PATH, tmpPath); - ::GetTempFileName(tmpPath, WXSTRINGCAST prefix, 0, tmp); -#endif - if (buf) wxStrcpy(buf, tmp); - else buf = copystring(tmp); - return buf; - -#else - static short last_temp = 0; // cache last to speed things a bit - // At most 1000 temp files to a process! We use a ring count. - wxChar tmp[100]; // FIXME static buffer + if ( buf ) + wxStrcpy(buf, filename); + else + buf = copystring(filename); - for (short suffix = last_temp + 1; suffix != last_temp; ++suffix %= 1000) - { - wxSprintf (tmp, wxT("/tmp/%s%d.%03x"), WXSTRINGCAST prefix, (int) getpid (), (int) suffix); - if (!wxFileExists( tmp )) - { - // Touch the file to create it (reserve name) - FILE *fd = fopen (wxFNCONV(tmp), "w"); - if (fd) - fclose (fd); - last_temp = suffix; - if (buf) - wxStrcpy( buf, tmp); - else - buf = copystring( tmp ); - return buf; - } - } - wxLogError( _("wxWindows: error finding temporary file name.\n") ); - if (buf) buf[0] = 0; - return (wxChar *) NULL; -#endif + return buf; } bool wxGetTempFileName(const wxString& prefix, wxString& buf) { - wxChar buf2[512]; - if (wxGetTempFileName(prefix, buf2) != (wxChar*) NULL) - { - buf = buf2; - return TRUE; - } - else - return FALSE; -} - -// Get first file name matching given wild card. + buf = wxFileName::CreateTempFileName(prefix); -#ifdef __UNIX__ + return !buf.empty(); +} // Get first file name matching given wild card. -// Flags are reserved for future use. -#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 ) - static DIR *gs_dirStream = (DIR *) NULL; - static wxString gs_strFileSpec; - static int gs_findFlags = 0; -#endif +static wxDir *gs_dir = NULL; +static wxString gs_dirPath; wxString wxFindFirstFile(const wxChar *spec, int flags) { - wxString result; -#ifdef __VMS - wxChar *specvms = NULL; -#endif - -#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 ) - if (gs_dirStream) - closedir(gs_dirStream); // edz 941103: better housekeping - - gs_findFlags = flags; + gs_dirPath = wxPathOnly(spec); + if ( gs_dirPath.IsEmpty() ) + gs_dirPath = wxT("."); + if ( gs_dirPath.Last() != wxFILE_SEP_PATH ) + gs_dirPath << wxFILE_SEP_PATH; - gs_strFileSpec = spec; + if (gs_dir) + delete gs_dir; + gs_dir = new wxDir(gs_dirPath); - // Find path only so we can concatenate - // found file onto path - wxString path(wxPathOnly(gs_strFileSpec)); - - // special case: path is really "/" - if ( !path && gs_strFileSpec[0u] == wxT('/') ) -#ifdef __VMS - { - wxStrcpy( specvms , wxT( "[000000]" ) ); - gs_strFileSpec = specvms; - wxString path_vms(wxPathOnly(gs_strFileSpec)); - path = path_vms; - } -#else - path = wxT('/'); -#endif - // path is empty => Local directory - if ( !path ) -#ifdef __VMS - { - wxStrcpy( specvms , wxT( "[]" ) ); - gs_strFileSpec = specvms; - wxString path_vms1(wxPathOnly(gs_strFileSpec)); - path = path_vms1; - } -#else - path = wxT('.'); -#endif - - gs_dirStream = opendir(path.fn_str()); - if ( !gs_dirStream ) + if ( !gs_dir->IsOpened() ) { - wxLogSysError(_("Can not enumerate files in directory '%s'"), - path.c_str()); + wxLogSysError(_("Can not enumerate files '%s'"), spec); + return wxEmptyString; } - else + + int dirFlags = 0; + switch (flags) { - result = wxFindNextFile(); + case wxDIR: dirFlags = wxDIR_DIRS; break; + case wxFILE: dirFlags = wxDIR_FILES; break; + default: dirFlags = wxDIR_DIRS | wxDIR_FILES; break; } -#endif // !VMS6.x or earlier - - return result; -} -wxString wxFindNextFile() -{ wxString result; - -#if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 ) - wxCHECK_MSG( gs_dirStream, result, wxT("must call wxFindFirstFile first") ); - - // Find path only so we can concatenate - // found file onto path - wxString path(wxPathOnly(gs_strFileSpec)); - wxString name(wxFileNameFromPath(gs_strFileSpec)); - - /* MATTHEW: special case: path is really "/" */ - if ( !path && gs_strFileSpec[0u] == wxT('/')) - path = wxT('/'); - - // Do the reading - struct dirent *nextDir; - for ( nextDir = readdir(gs_dirStream); - nextDir != NULL; - nextDir = readdir(gs_dirStream) ) + gs_dir->GetFirst(&result, wxFileNameFromPath(spec), dirFlags); + if ( result.IsEmpty() ) { - if (wxMatchWild(name, nextDir->d_name, FALSE) && // RR: added FALSE to find hidden files - strcmp(nextDir->d_name, ".") && - strcmp(nextDir->d_name, "..") ) - { - result.Empty(); - if ( !path.IsEmpty() ) - { - result = path; - if ( path != wxT('/') ) - result += wxT('/'); - } - - result += nextDir->d_name; - - // Only return "." and ".." when they match - bool isdir; - if ( (strcmp(nextDir->d_name, ".") == 0) || - (strcmp(nextDir->d_name, "..") == 0)) - { - if ( (gs_findFlags & wxDIR) != 0 ) - isdir = TRUE; - else - continue; - } - else - isdir = wxDirExists(result); - - // and only return directories when flags & wxDIR - if ( !gs_findFlags || - ((gs_findFlags & wxDIR) && isdir) || - ((gs_findFlags & wxFILE) && !isdir) ) - { - return result; - } - } + wxDELETE(gs_dir); + return result; } - result.Empty(); // not found - - closedir(gs_dirStream); - gs_dirStream = (DIR *) NULL; -#endif // !VMS6.2 or earlier - - return result; -} - -#elif defined(__WXMAC__) - -struct MacDirectoryIterator -{ - CInfoPBRec m_CPB ; - wxInt16 m_index ; - long m_dirId ; - Str255 m_name ; -} ; - -static int g_iter_flags ; - -static MacDirectoryIterator g_iter ; - -wxString wxFindFirstFile(const wxChar *spec, int flags) -{ - wxString result; - - g_iter_flags = flags; /* MATTHEW: [5] Remember flags */ - - // Find path only so we can concatenate found file onto path - wxString path(wxPathOnly(spec)); - if ( !path.IsEmpty() ) - result << path << wxT('\\'); - - FSSpec fsspec ; - - wxUnixFilename2FSSpec( result , &fsspec ) ; - g_iter.m_CPB.hFileInfo.ioVRefNum = fsspec.vRefNum ; - g_iter.m_CPB.hFileInfo.ioNamePtr = g_iter.m_name ; - g_iter.m_index = 0 ; - - Boolean isDir ; - FSpGetDirectoryID( &fsspec , &g_iter.m_dirId , &isDir ) ; - if ( !isDir ) - return wxEmptyString ; - - return wxFindNextFile( ) ; + return gs_dirPath + result; } wxString wxFindNextFile() { - wxString result; - - short err = noErr ; - - while ( err == noErr ) - { - g_iter.m_index++ ; - g_iter.m_CPB.dirInfo.ioFDirIndex = g_iter.m_index; - g_iter.m_CPB.dirInfo.ioDrDirID = g_iter.m_dirId; /* we need to do this every time */ - err = PBGetCatInfoSync((CInfoPBPtr)&g_iter.m_CPB); - if ( err != noErr ) - break ; - - if ( ( g_iter.m_CPB.dirInfo.ioFlAttrib & ioDirMask) != 0 && (g_iter_flags & wxDIR) ) // we have a directory - break ; + wxASSERT_MSG( gs_dir, wxT("You must call wxFindFirstFile before!") ); - if ( ( g_iter.m_CPB.dirInfo.ioFlAttrib & ioDirMask) == 0 && !(g_iter_flags & wxFILE ) ) - continue ; + wxString result; + gs_dir->GetNext(&result); - // hit ! - break ; - } - if ( err != noErr ) + if ( result.IsEmpty() ) { - return wxEmptyString ; + wxDELETE(gs_dir); + return result; } - FSSpec spec ; - - FSMakeFSSpecCompat(g_iter.m_CPB.hFileInfo.ioVRefNum, - g_iter.m_dirId, - g_iter.m_name, - &spec) ; - return wxMacFSSpec2UnixFilename( &spec ) ; + return gs_dirPath + result; } -#elif defined(__WXMSW__) -#ifdef __WIN32__ - static HANDLE gs_hFileStruct = INVALID_HANDLE_VALUE; - static WIN32_FIND_DATA gs_findDataStruct; -#else // Win16 - #ifdef __BORLANDC__ - static struct ffblk gs_findDataStruct; - #else - static struct _find_t gs_findDataStruct; - #endif // Borland -#endif // Win32/16 - -static wxString gs_strFileSpec; -static int gs_findFlags = 0; - -wxString wxFindFirstFile(const wxChar *spec, int flags) +// Get current working directory. +// If buf is NULL, allocates space using new, else +// copies into buf. +wxChar *wxGetWorkingDirectory(wxChar *buf, int sz) { - wxString result; - - gs_strFileSpec = spec; - gs_findFlags = flags; /* MATTHEW: [5] Remember flags */ - - // Find path only so we can concatenate found file onto path - wxString path(wxPathOnly(gs_strFileSpec)); - if ( !path.IsEmpty() ) - result << path << wxT('\\'); - -#ifdef __WIN32__ - if ( gs_hFileStruct != INVALID_HANDLE_VALUE ) - FindClose(gs_hFileStruct); - - gs_hFileStruct = ::FindFirstFile(WXSTRINGCAST spec, &gs_findDataStruct); - - if ( gs_hFileStruct == INVALID_HANDLE_VALUE ) + if ( !buf ) { - result.Empty(); - - return result; + buf = new wxChar[sz + 1]; } - bool isdir = !!(gs_findDataStruct.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); + bool ok; - if (isdir && !(flags & wxDIR)) - return wxFindNextFile(); - else if (!isdir && flags && !(flags & wxFILE)) - return wxFindNextFile(); - - result += gs_findDataStruct.cFileName; - - return result; -#else // !Win32 - int flag = _A_NORMAL; - if (flags & wxDIR) - flag = _A_SUBDIR; - -#ifdef __BORLANDC__ - if (findfirst(WXSTRINGCAST spec, &gs_findDataStruct, flag) == 0) -#else - if (_dos_findfirst(WXSTRINGCAST spec, flag, &gs_findDataStruct) == 0) -#endif + // for the compilers which have Unicode version of _getcwd(), call it + // directly, for the others call the ANSI version and do the translation +#if wxUSE_UNICODE + #ifdef HAVE_WGETCWD + ok = _wgetcwd(buf, sz) != NULL; + #else // !HAVE_WGETCWD + wxCharBuffer cbuf(sz); + #endif +#endif // + +#if !wxUSE_UNICODE || !defined(HAVE_WGETCWD) + #ifdef _MSC_VER + ok = _getcwd(buf, sz) != NULL; + #elif defined(__WXMAC__) && !defined(__DARWIN__) + FSSpec cwdSpec ; + FCBPBRec pb; + OSErr error; + Str255 fileName ; + pb.ioNamePtr = (StringPtr) &fileName; + pb.ioVRefNum = 0; + pb.ioRefNum = LMGetCurApRefNum(); + pb.ioFCBIndx = 0; + error = PBGetFCBInfoSync(&pb); + if ( error == noErr ) { - char attrib; - -#ifdef __BORLANDC__ - attrib = gs_findDataStruct.ff_attrib; -#else - attrib = gs_findDataStruct.attrib; -#endif + cwdSpec.vRefNum = pb.ioFCBVRefNum; + cwdSpec.parID = pb.ioFCBParID; + cwdSpec.name[0] = 0 ; + wxString res = wxMacFSSpec2MacFilename( &cwdSpec ) ; - if (attrib & _A_SUBDIR) { - if (!(gs_findFlags & wxDIR)) - return wxFindNextFile(); - } else if (gs_findFlags && !(gs_findFlags & wxFILE)) - return wxFindNextFile(); + strcpy( buf , res ) ; + buf[res.length()]=0 ; - result += -#ifdef __BORLANDC__ - gs_findDataStruct.ff_name -#else - gs_findDataStruct.name -#endif - ; + ok = TRUE; } - - return result; -#endif // __WIN32__ -} - - -wxString wxFindNextFile() -{ - wxString result; - - // Find path only so we can concatenate found file onto path - wxString path(wxPathOnly(gs_strFileSpec)); - -try_again: - -#ifdef __WIN32__ - if (gs_hFileStruct == INVALID_HANDLE_VALUE) - return result; - - bool success = (FindNextFile(gs_hFileStruct, &gs_findDataStruct) != 0); - if (!success) - { - FindClose(gs_hFileStruct); - gs_hFileStruct = INVALID_HANDLE_VALUE; - } - else + else + { + ok = FALSE; + } + #elif defined(__VISAGECPP__) || (defined (__OS2__) && defined (__WATCOMC__)) + APIRET rc; + rc = ::DosQueryCurrentDir( 0 // current drive + ,buf + ,(PULONG)&sz + ); + ok = rc != 0; + #else // !Win32/VC++ !Mac !OS2 + ok = getcwd(buf, sz) != NULL; + #endif // platform +#endif // !wxUSE_UNICODE || !HAVE_WGETCWD + + if ( !ok ) { - bool isdir = !!(gs_findDataStruct.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); + wxLogSysError(_("Failed to get the working directory")); - if (isdir && !(gs_findFlags & wxDIR)) - goto try_again; - else if (!isdir && gs_findFlags && !(gs_findFlags & wxFILE)) - goto try_again; - - if ( !path.IsEmpty() ) - result << path << wxT('\\'); - result << gs_findDataStruct.cFileName; + // VZ: the old code used to return "." on error which didn't make any + // sense at all to me - empty string is a better error indicator + // (NULL might be even better but I'm afraid this could lead to + // problems with the old code assuming the return is never NULL) + buf[0] = _T('\0'); } - - return result; -#else // Win16 - -#ifdef __BORLANDC__ - if (findnext(&gs_findDataStruct) == 0) -#else - if (_dos_findnext(&gs_findDataStruct) == 0) -#endif + else // ok, but we might need to massage the path into the right format + { +#ifdef __DJGPP__ + // VS: DJGPP is a strange mix of DOS and UNIX API and returns paths + // with / deliminers. We don't like that. + for (wxChar *ch = buf; *ch; ch++) { - /* MATTHEW: [5] Check directory flag */ - char attrib; - -#ifdef __BORLANDC__ - attrib = gs_findDataStruct.ff_attrib; -#else - attrib = gs_findDataStruct.attrib; -#endif - - if (attrib & _A_SUBDIR) { - if (!(gs_findFlags & wxDIR)) - goto try_again; - } else if (gs_findFlags && !(gs_findFlags & wxFILE)) - goto try_again; - - - result += -#ifdef __BORLANDC__ - gs_findDataStruct.ff_name -#else - gs_findDataStruct.name -#endif - ; + if (*ch == wxT('/')) + *ch = wxT('\\'); } - - return result; -#endif // Win32/16 -} - -#elif defined(__WXPM__) - -wxString wxFindFirstFile(const wxChar *spec, int flags) -{ - wxString result; - - /* - // TODO: figure something out here for OS/2 - gs_strFileSpec = spec; - gs_findFlags = flags; - - // Find path only so we can concatenate found file onto path - wxString path(wxPathOnly(gs_strFileSpec)); - if ( !path.IsEmpty() ) - result << path << wxT('\\'); - - int flag = _A_NORMAL; - if (flags & wxDIR) - flag = _A_SUBDIR; - - if (_dos_findfirst(WXSTRINGCAST spec, flag, &gs_findDataStruct) == 0) - { - char attrib; - attrib = gs_findDataStruct.attrib; - - if (attrib & _A_SUBDIR) { - if (!(gs_findFlags & wxDIR)) - return wxFindNextFile(); - } else if (gs_findFlags && !(gs_findFlags & wxFILE)) - return wxFindNextFile(); - - result += gs_findDataStruct.name; +#endif // __DJGPP__ + +#ifdef __CYGWIN__ + // another example of DOS/Unix mix (Cygwin) + wxString pathUnix = buf; + cygwin_conv_to_full_win32_path(pathUnix, buf); +#endif // __CYGWIN__ + + // finally convert the result to Unicode if needed +#if wxUSE_UNICODE && !defined(HAVE_WGETCWD) + wxConvFile.MB2WC(buf, cbuf, sz); +#endif // wxUSE_UNICODE } - */ - return result; -} -wxString wxFindNextFile() -{ - wxString result; - // TODO: - return result; -} - -#endif // Unix/Windows/OS/2 - -// Get current working directory. -// If buf is NULL, allocates space using new, else -// copies into buf. -wxChar *wxGetWorkingDirectory(wxChar *buf, int sz) -{ - if (!buf) - buf = new wxChar[sz+1]; -#if wxUSE_UNICODE - char *cbuf = new char[sz+1]; -#ifdef _MSC_VER - if (_getcwd(cbuf, sz) == NULL) { -#elif defined( __WXMAC__) - enum - { - SFSaveDisk = 0x214, CurDirStore = 0x398 - }; - FSSpec cwdSpec ; - - FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ; - wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ; - strcpy( buf , res ) ; - if (0) { -#else - if (getcwd(cbuf, sz) == NULL) { -#endif - delete [] cbuf; -#else // wxUnicode -#ifdef _MSC_VER - if (_getcwd(buf, sz) == NULL) { -#elif defined( __WXMAC__) - enum - { - SFSaveDisk = 0x214, CurDirStore = 0x398 - }; - FSSpec cwdSpec ; - - FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ; - wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ; - strcpy( buf , res ) ; - if (0) { -#elif(__VISAGECPP__) - APIRET rc; - rc = ::DosQueryCurrentDir( 0 // current drive - ,buf - ,(PULONG)&sz - ); - if (rc != 0) { -#else - if (getcwd(buf, sz) == NULL) { -#endif -#endif - buf[0] = wxT('.'); - buf[1] = wxT('\0'); - } -#if wxUSE_UNICODE - else { - wxConvFile.MB2WC(buf, cbuf, sz); - delete [] cbuf; - } -#endif - return buf; + return buf; } wxString wxGetCwd() { - static const size_t maxPathLen = 1024; - wxString str; - wxGetWorkingDirectory(str.GetWriteBuf(maxPathLen), maxPathLen); - str.UngetWriteBuf(); + + // we can't create wxStringBuffer object inline: Sun CC generates buggy + // code in this case! + { + wxStringBuffer buf(str, _MAXPATHLEN); + wxGetWorkingDirectory(buf, _MAXPATHLEN); + } return str; } bool wxSetWorkingDirectory(const wxString& d) { -#if defined( __UNIX__ ) || defined( __WXMAC__ ) +#if defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__) return (chdir(wxFNSTRINGCAST d.fn_str()) == 0); #elif defined(__WXPM__) return (::DosSetCurrentDir((PSZ)d.c_str()) == 0); @@ -1721,7 +1533,7 @@ bool wxSetWorkingDirectory(const wxString& d) // On non-Windows platform, probably just return the empty string. wxString wxGetOSDirectory() { -#ifdef __WINDOWS__ +#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) wxChar buf[256]; GetWindowsDirectory(buf, 256); return wxString(buf); @@ -1732,11 +1544,9 @@ wxString wxGetOSDirectory() bool wxEndsWithPathSeparator(const wxChar *pszFileName) { - size_t len = wxStrlen(pszFileName); - if ( len == 0 ) - return FALSE; - else - return wxIsPathSeparator(pszFileName[len - 1]); + size_t len = wxStrlen(pszFileName); + + return len && wxIsPathSeparator(pszFileName[len - 1]); } // find a file in a list of directories, returns false if not found @@ -1789,56 +1599,7 @@ void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName, // it can be empty, but it shouldn't be NULL wxCHECK_RET( pszFileName, wxT("NULL file name in wxSplitPath") ); - const wxChar *pDot = wxStrrchr(pszFileName, wxFILE_SEP_EXT); - -#ifdef __WXMSW__ - // under Windows we understand both separators - const wxChar *pSepUnix = wxStrrchr(pszFileName, wxFILE_SEP_PATH_UNIX); - const wxChar *pSepDos = wxStrrchr(pszFileName, wxFILE_SEP_PATH_DOS); - const wxChar *pLastSeparator = pSepUnix > pSepDos ? pSepUnix : pSepDos; -#else // assume Unix - const wxChar *pLastSeparator = wxStrrchr(pszFileName, wxFILE_SEP_PATH_UNIX); - - if ( pDot ) - { - if ( (pDot == pszFileName) || (*(pDot - 1) == wxFILE_SEP_PATH_UNIX) ) - { - // under Unix, dot may be (and commonly is) the first character of the - // filename, don't treat the entire filename as extension in this case - pDot = NULL; - } - } -#endif // MSW/Unix - - if ( pDot && (pDot < pLastSeparator) ) - { - // the dot is part of the path, not the start of the extension - pDot = NULL; - } - - if ( pstrPath ) - { - if ( pLastSeparator ) - *pstrPath = wxString(pszFileName, pLastSeparator - pszFileName); - else - pstrPath->Empty(); - } - - if ( pstrName ) - { - const wxChar *start = pLastSeparator ? pLastSeparator + 1 : pszFileName; - const wxChar *end = pDot ? pDot : pszFileName + wxStrlen(pszFileName); - - *pstrName = wxString(start, end - start); - } - - if ( pstrExt ) - { - if ( pDot ) - *pstrExt = wxString(pDot + 1); - else - pstrExt->Empty(); - } + wxFileName::SplitPath(pszFileName, pstrPath, pstrName, pstrExt); } time_t WXDLLEXPORT wxFileModificationTime(const wxString& filename) @@ -1914,7 +1675,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special ) pattern++; ret_code = FALSE; while ((*str!=wxT('\0')) - && (!(ret_code=wxMatchWild(pattern, str++, FALSE)))) + && ((ret_code=wxMatchWild(pattern, str++, FALSE)) == 0)) /*loop*/; if (ret_code) { while (*str != wxT('\0')) @@ -2026,3 +1787,28 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special ) #ifdef __VISUALC__ #pragma warning(default:4706) // assignment within conditional expression #endif // VC++ + +//------------------------------------------------------------------------ +// Missing functions in Unicode for Win9x +//------------------------------------------------------------------------ + +// NB: MSLU only covers Win32 API, it doesn't provide Unicode implementation of +// libc functions. Unfortunately, some of MSVCRT wchar_t functions +// (e.g. _wopen) don't work on Windows 9x, so we have to workaround it +// by calling the char version. We still want to use wchar_t version on +// NT/2000/XP, though, because they allow for Unicode file names. +#if wxUSE_UNICODE_MSLU + + #if defined( __VISUALC__ ) \ + || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \ + || ( defined(__MWERKS__) && defined(__WXMSW__) ) + WXDLLEXPORT int wxOpen(const wxChar *name, int flags, int mode) + { + if ( wxGetOsVersion() == wxWINDOWS_NT ) + return _wopen(name, flags, mode); + else + return _open(wxConvFile.cWX2MB(name), flags, mode); + } + #endif + +#endif // wxUSE_UNICODE_MSLU