X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32e768ae94bbb7039cb2efa073591e37f3d4f56f..f17fb297676dd3231b849ab7e55486473aa6ee21:/src/common/filefn.cpp?ds=sidebyside diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 2a1694b0a7..6c359eba15 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -29,12 +29,10 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP - #include "wx/defs.h" -#endif - #include "wx/utils.h" #include "wx/intl.h" +#include "wx/file.h" +#include "wx/filename.h" // there are just too many of those... #ifdef __VISUALC__ @@ -59,6 +57,7 @@ #else #include #include + #include #endif #ifdef __UNIX__ @@ -66,18 +65,26 @@ #include #endif -#ifdef __OS2__ - #include +#ifdef __WXPM__ #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 +#if defined(__DOS__) && defined(__WATCOMC__) + #include + #include + #include +#endif + #ifdef __GNUWIN32__ + #include #ifndef __TWIN32__ #include #endif @@ -103,7 +110,7 @@ #endif #ifdef __WINDOWS__ - #include "windows.h" + #include #endif // ---------------------------------------------------------------------------- @@ -115,14 +122,13 @@ 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) +IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList) // ---------------------------------------------------------------------------- // private globals @@ -138,6 +144,13 @@ static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN]; const off_t wxInvalidOffset = (off_t)-1; #endif +// ---------------------------------------------------------------------------- +// macros +// ---------------------------------------------------------------------------- + +// we need to translate Mac filenames before passing them to OS functions +#define OS_FILENAME(s) (s.fn_str()) + // ============================================================================ // implementation // ============================================================================ @@ -265,59 +278,50 @@ wxString wxPathList::FindAbsoluteValidPath (const wxString& file) bool wxFileExists (const wxString& filename) { -#ifdef __GNUWIN32__ // (fix a B20 bug) - if (GetFileAttributes(filename) == 0xFFFFFFFF) - return FALSE; - else - return TRUE; -#elif defined(__WXMAC__) - struct stat stbuf; - if (filename && stat (wxUnix2MacFilename(filename), &stbuf) == 0 ) - return TRUE; - return FALSE ; +#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) + // GetFileAttributes can copy with network paths + DWORD ret = GetFileAttributes(filename); + DWORD isDir = (ret & FILE_ATTRIBUTE_DIRECTORY); + return ((ret != 0xffffffff) && (isDir == 0)); #else + wxStructStat stbuf; + if ( !filename.empty() && wxStat (OS_FILENAME(filename), &stbuf) == 0 ) + return TRUE; -#ifdef __SALFORDC__ - struct _stat stbuf; -#else - struct stat stbuf; -#endif - - if ((filename != wxT("")) && stat (wxFNSTRINGCAST filename.fn_str(), &stbuf) == 0) - return TRUE; - return FALSE; + return FALSE; #endif } -/* Vadim's alternative implementation - -// does the file exist? -bool wxFileExists(const char *pszFileName) -{ - struct stat st; - return !access(pszFileName, 0) && - !stat(pszFileName, &st) && - (st.st_mode & S_IFREG); -} -*/ - 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 ; } /* @@ -459,7 +463,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"); @@ -515,7 +519,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)) { @@ -535,13 +539,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 @@ -549,12 +547,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++; @@ -570,7 +563,7 @@ wxChar *wxExpandPath(wxChar *buf, const wxChar *name) /* prefix ~ */ if (nm[1] == SEP || nm[1] == 0) { /* ~/filename */ - // FIXME: wxGetUserHome could return temporary storage in Unicode mode + // FIXME: wxGetUserHome could return temporary storage in Unicode mode if ((s = WXSTRINGCAST wxGetUserHome(wxT(""))) != NULL) { if (*++nm) nm++; @@ -584,7 +577,7 @@ 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 + // 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; @@ -606,13 +599,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); @@ -677,262 +664,324 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin // (basename) wxChar *wxFileNameFromPath (wxChar *path) { - if (path) + if (path) { - register wxChar *tcp; - - tcp = path + wxStrlen (path); - while (--tcp >= path) + register wxChar *tcp; + + 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; - - tcp = path + wxStrlen (path); - while (--tcp >= path) - { - if (*tcp == wxT('/') || *tcp == wxT('\\') -#ifdef __VMS__ - || *tcp == wxT(':') || *tcp == wxT(']')) + if (path1 != wxT("")) + { + wxChar *path = WXSTRINGCAST path1 ; + register wxChar *tcp; + + 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); - - int l = wxStrlen(path); - bool done = FALSE; - - 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(']')) + static wxChar buf[_MAXPATHLEN]; + + // Local copy + wxStrcpy (buf, path); + + int l = wxStrlen(path); + int i = l - 1; + + // Search backward for a backward or forward slash + while (i > -1) { - done = TRUE; -#ifdef __VMS__ - buf[i+1] = 0; +#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 - buf[i] = 0; + // Unix like or Windows + if (path[i] == wxT('/') || path[i] == wxT('\\')) + { + buf[i] = 0; + return buf; + } #endif - - return buf; +#ifdef __VMS__ + if (path[i] == wxT(']')) + { + buf[i+1] = 0; + return buf; + } +#endif + 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]; - - // Local copy - wxStrcpy (buf, WXSTRINGCAST path); - - int l = path.Length(); - bool done = FALSE; - - 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(']')) + wxChar buf[_MAXPATHLEN]; + + // Local copy + wxStrcpy (buf, WXSTRINGCAST path); + + int l = path.Length(); + int i = l - 1; + + // Search backward for a backward or forward slash + while (i > -1) { - done = TRUE; -#ifdef __VMS__ - buf[i+1] = 0; +#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 - buf[i] = 0; + // Unix like or Windows + if (path[i] == wxT('/') || path[i] == wxT('\\')) + { + buf[i] = 0; + return wxString(buf); + } #endif - - return wxString(buf); +#ifdef __VMS__ + if (path[i] == wxT(']')) + { + buf[i+1] = 0; + return wxString(buf); + } +#endif + 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 ] ; wxString wxMac2UnixFilename (const char *str) { - char *s = sMacFileNameConversion ; - strcpy( s , str ) ; - if (s) - { - memmove( s+1 , s ,strlen( s ) + 1) ; - if ( *s == ':' ) + char *s = sMacFileNameConversion ; + strcpy( s , str ) ; + 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 == '/' ) + char *s = sMacFileNameConversion ; + strcpy( s , str ) ; + 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++ ; + 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 ) { - return wxMac2UnixFilename( wxMacFSSpec2MacFilename( spec) ) ; -} - -void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) -{ - FSpLocationFromFullPath( strlen(path ) , path , spec ) ; + return wxMac2UnixFilename( wxMacFSSpec2MacFilename( spec) ) ; } void wxUnixFilename2FSSpec( const char *path , FSSpec *spec ) { - wxString var = wxUnix2MacFilename( path ) ; - wxMacFilename2FSSpec( var , spec ) ; + wxString var = wxUnix2MacFilename( path ) ; + wxMacFilename2FSSpec( var , spec ) ; } +#endif // ! __DARWIN__ + +#endif // __WXMAC__ -#endif void wxDos2UnixFilename (char *s) { @@ -972,21 +1021,17 @@ wxUnix2DosFilename (wxChar *WXUNUSED(s) ) bool wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3) { - wxChar *outfile = wxGetTempFileName("cat"); + wxString outfile; + if ( !wxGetTempFileName("cat", outfile) ) + return FALSE; FILE *fp1 = (FILE *) NULL; FILE *fp2 = (FILE *) NULL; FILE *fp3 = (FILE *) NULL; // Open the inputs and outputs -#ifdef __WXMAC__ - if ((fp1 = fopen (wxUnix2MacFilename( file1 ), "rb")) == NULL || - (fp2 = fopen (wxUnix2MacFilename( file2 ), "rb")) == NULL || - (fp3 = fopen (wxUnix2MacFilename( outfile ), "wb")) == NULL) -#else - if ((fp1 = wxFopen (WXSTRINGCAST file1, wxT("rb"))) == NULL || - (fp2 = wxFopen (WXSTRINGCAST file2, wxT("rb"))) == NULL || - (fp3 = wxFopen (outfile, wxT("wb"))) == NULL) -#endif + 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); @@ -1008,51 +1053,113 @@ 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) { - FILE *fd1; - FILE *fd2; - int ch; +#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; -#ifdef __WXMAC__ - if ((fd1 = fopen (wxUnix2MacFilename( file1 ), "rb")) == NULL) - return FALSE; - if ((fd2 = fopen (wxUnix2MacFilename( file2 ), "wb")) == NULL) -#else - if ((fd1 = wxFopen (WXSTRINGCAST file1, wxT("rb"))) == NULL) - return FALSE; - if ((fd2 = wxFopen (WXSTRINGCAST file2, wxT("wb"))) == NULL) -#endif + // get permissions of file1 + if ( wxStat(OS_FILENAME(file1), &fbuf) != 0 ) { - fclose (fd1); - return FALSE; + // 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; } - while ((ch = getc (fd1)) != EOF) - (void) putc (ch, fd2); + // open file1 for reading + wxFile fileIn(file1, wxFile::read); + if ( !fileIn.IsOpened() ) + return FALSE; - fclose (fd1); - fclose (fd2); - return TRUE; + // 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 ( ;; ) + { + count = fileIn.Read(buf, WXSIZEOF(buf)); + if ( fileIn.Error() ) + return FALSE; + + // end of file? + if ( !count ) + break; + + if ( fileOut.Write(buf, count) < 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 + 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) { -#ifdef __WXMAC__ - if (0 == rename (wxUnix2MacFilename( file1 ), wxUnix2MacFilename( file2 ))) - return TRUE; -#else // Normal system call - if (0 == rename (wxFNSTRINGCAST file1.fn_str(), wxFNSTRINGCAST file2.fn_str())) + if ( wxRename (file1, file2) == 0 ) return TRUE; -#endif + // Try to copy if (wxCopyFile(file1, file2)) { wxRemoveFile(file1); @@ -1064,29 +1171,34 @@ wxRenameFile (const wxString& file1, const wxString& file2) bool wxRemoveFile(const wxString& file) { -#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__) - int flag = remove(wxFNSTRINGCAST file.fn_str()); -#elif defined( __WXMAC__ ) - int flag = unlink(wxUnix2MacFilename( file )); +#if defined(__VISUALC__) \ + || defined(__BORLANDC__) \ + || defined(__WATCOMC__) \ + || defined(__GNUWIN32__) + int res = wxRemove(file); #else - int flag = unlink(wxFNSTRINGCAST file.fn_str()); + int res = unlink(OS_FILENAME(file)); #endif - return (flag == 0) ; + + return res == 0; } 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(__OS2__))) || (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++ - if ( mkdir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 ) + (void)perm; + if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 ) #endif // !MSW/MSW { wxLogSysError(_("Directory '%s' couldn't be created"), dirname); @@ -1102,144 +1214,82 @@ bool wxRmdir(const wxString& dir, int WXUNUSED(flags)) { #ifdef __VMS__ return FALSE; //to be changed since rmdir exists in VMS7.x -#elif defined( __WXMAC__ ) - return (rmdir(wxUnix2MacFilename( dir )) == 0); +#elif defined(__WXPM__) + return (::DosDeleteDir((PSZ)dir.c_str()) == 0); #else #ifdef __SALFORDC__ return FALSE; // What to do? #else - return (rmdir(wxFNSTRINGCAST dir.fn_str()) == 0); + return (wxRmDir(OS_FILENAME(dir)) == 0); #endif #endif } -#if 0 -bool wxDirExists(const wxString& dir) +// does the path exists? (may have or not '/' or '\\' at the end) +bool wxPathExists(const wxChar *pszPathName) { -#ifdef __VMS__ - return FALSE; //To be changed since stat exists in VMS7.x -#elif !defined(__WXMSW__) - struct stat sbuf; - return (stat(dir.fn_str(), &sbuf) != -1) && S_ISDIR(sbuf.st_mode) ? TRUE : FALSE; -#else - - /* MATTHEW: [6] Always use same code for Win32, call FindClose */ -#if defined(__WIN32__) - WIN32_FIND_DATA fileInfo; -#else -#ifdef __BORLANDC__ - struct ffblk fileInfo; -#else - struct find_t fileInfo; -#endif -#endif + 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 + // the pathes "d:\" (which are different from "d:") nor for just "\" + while ( wxEndsWithPathSeparator(strPath) ) + { + size_t len = strPath.length(); + if ( len == 1 || (len == 3 && strPath[len - 2] == _T(':')) ) + break; -#if defined(__WIN32__) - HANDLE h = FindFirstFile((LPTSTR) WXSTRINGCAST dir,(LPWIN32_FIND_DATA)&fileInfo); + strPath.Truncate(len - 1); + } +#endif // __WINDOWS__ - if (h==INVALID_HANDLE_VALUE) - return FALSE; - else { - FindClose(h); - return ((fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY); - } -#else - // In Borland findfirst has a different argument - // ordering from _dos_findfirst. But _dos_findfirst - // _should_ be ok in both MS and Borland... why not? -#ifdef __BORLANDC__ - return ((findfirst(WXSTRINGCAST dir, &fileInfo, _A_SUBDIR) == 0 && (fileInfo.ff_attrib & _A_SUBDIR) != 0)); +#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) + // Stat can't cope with network paths + DWORD ret = GetFileAttributes(strPath.c_str()); + DWORD isDir = (ret & FILE_ATTRIBUTE_DIRECTORY); + return ((ret != 0xffffffff) && (isDir != 0)); #else - return (((_dos_findfirst(WXSTRINGCAST dir, _A_SUBDIR, &fileInfo) == 0) && (fileInfo.attrib & _A_SUBDIR)) != 0); -#endif -#endif - -#endif -} - -#endif - -// 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. */ - wxString strPath(pszPathName); - if ( wxEndsWithPathSeparator(pszPathName) && pszPathName[1] != wxT('\0') ) - strPath.Last() = wxT('\0'); -#ifdef __SALFORDC__ - struct _stat st; + wxStructStat st; +#ifndef __VISAGECPP__ + return wxStat(wxFNSTRINGCAST strPath.fn_str(), &st) == 0 && + ((st.st_mode & S_IFMT) == S_IFDIR); #else - struct stat st; + // S_IFMT not supported in VA compilers.. st_mode is a 2byte value only + return wxStat(wxFNSTRINGCAST strPath.fn_str(), &st) == 0 && + (st.st_mode == S_IFDIR); #endif - return stat(wxFNSTRINGCAST strPath.fn_str(), &st) == 0 && (st.st_mode & S_IFDIR); +#endif } // 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; + buf = wxFileName::CreateTempFileName(prefix); + + return !buf.empty(); } // Get first file name matching given wild card. -#ifdef __UNIX__ +#if defined(__UNIX__) // Get first file name matching given wild card. // Flags are reserved for future use. @@ -1253,6 +1303,9 @@ bool wxGetTempFileName(const wxString& prefix, wxString& buf) wxString wxFindFirstFile(const wxChar *spec, int flags) { wxString result; +#ifdef __VMS + wxChar *specvms = NULL; +#endif #if !defined( __VMS__ ) || ( __VMS_VER >= 70000000 ) if (gs_dirStream) @@ -1268,10 +1321,28 @@ wxString wxFindFirstFile(const wxChar *spec, int flags) // special case: path is really "/" if ( !path && gs_strFileSpec[0u] == wxT('/') ) - path = wxT('/'); - // path is empty => Local directory +#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 ) - path = wxT('.'); +#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 ) @@ -1311,8 +1382,8 @@ wxString wxFindNextFile() nextDir = readdir(gs_dirStream) ) { if (wxMatchWild(name, nextDir->d_name, FALSE) && // RR: added FALSE to find hidden files - strcmp(nextDir->d_name, ".") && - strcmp(nextDir->d_name, "..") ) + strcmp(nextDir->d_name, ".") && + strcmp(nextDir->d_name, "..") ) { result.Empty(); if ( !path.IsEmpty() ) @@ -1360,78 +1431,85 @@ wxString wxFindNextFile() struct MacDirectoryIterator { - CInfoPBRec m_CPB ; - wxInt16 m_index ; - long m_dirId ; - Str255 m_name ; + CInfoPBRec m_CPB ; + wxInt16 m_index ; + long m_dirId ; + Str255 m_name ; } ; static int g_iter_flags ; static MacDirectoryIterator g_iter ; +wxString g_iter_spec ; wxString wxFindFirstFile(const wxChar *spec, int flags) { wxString result; + g_iter_spec = spec ; + g_iter_spec.MakeUpper() ; 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 ; + + wxMacFilename2FSSpec( path , &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 ; - 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 wxFindNextFile( ) ; } 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 ; - - if ( ( g_iter.m_CPB.dirInfo.ioFlAttrib & ioDirMask) == 0 && !(g_iter_flags & wxFILE ) ) - continue ; - - // hit ! - break ; - } - if ( err != noErr ) - { - return wxEmptyString ; - } - FSSpec spec ; - - FSMakeFSSpecCompat(g_iter.m_CPB.hFileInfo.ioVRefNum, - g_iter.m_dirId, - g_iter.m_name, - &spec) ; - - return wxMacFSSpec2UnixFilename( &spec ) ; + short err = noErr ; + wxString name ; + + while(1) + { + 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 ; + + if ( ( g_iter.m_CPB.dirInfo.ioFlAttrib & ioDirMask) == 0 && !(g_iter_flags & wxFILE ) ) + continue ; + + // hit ! + break ; + } + if ( err != noErr ) + { + return wxEmptyString ; + } + FSSpec spec ; + + FSMakeFSSpecCompat(g_iter.m_CPB.hFileInfo.ioVRefNum, + g_iter.m_dirId, + g_iter.m_name, + &spec) ; + + wxString name = wxMacFSSpec2MacFilename( &spec ) ; + if ( g_iter_spec.Right(4)==(":*.*") || g_iter_spec.Right(2)==(":*") || name.Upper().Matches(g_iter_spec) ) + return name ; + } + return wxEmptyString ; } #elif defined(__WXMSW__) @@ -1485,9 +1563,9 @@ wxString wxFindFirstFile(const wxChar *spec, int flags) result += gs_findDataStruct.cFileName; return result; -#else +#else // !Win32 int flag = _A_NORMAL; - if (flags & wxDIR) /* MATTHEW: [5] Use & */ + if (flags & wxDIR) flag = _A_SUBDIR; #ifdef __BORLANDC__ @@ -1496,7 +1574,6 @@ wxString wxFindFirstFile(const wxChar *spec, int flags) if (_dos_findfirst(WXSTRINGCAST spec, flag, &gs_findDataStruct) == 0) #endif { - /* MATTHEW: [5] Check directory flag */ char attrib; #ifdef __BORLANDC__ @@ -1519,9 +1596,9 @@ wxString wxFindFirstFile(const wxChar *spec, int flags) #endif ; } -#endif // __WIN32__ return result; +#endif // __WIN32__ } @@ -1591,9 +1668,9 @@ try_again: #endif ; } -#endif // Win32/16 return result; +#endif // Win32/16 } #elif defined(__WXPM__) @@ -1653,17 +1730,17 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz) 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) { +#elif defined(__WXMAC__) && !defined(__DARWIN__) + 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 @@ -1671,17 +1748,48 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz) #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 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 ) + { + cwdSpec.vRefNum = pb.ioFCBVRefNum; + cwdSpec.parID = pb.ioFCBParID; + cwdSpec.name[0] = 0 ; + wxString res = wxMacFSSpec2MacFilename( &cwdSpec ) ; + + strcpy( buf , res ) ; + buf[res.length()]=0 ; + } + else + buf[0] = 0 ; + /* + this version will not always give back the application directory on mac + enum + { + SFSaveDisk = 0x214, CurDirStore = 0x398 + }; + FSSpec cwdSpec ; + + FSMakeFSSpec( - *(short *) SFSaveDisk , *(long *) CurDirStore , NULL , &cwdSpec ) ; + wxString res = wxMacFSSpec2UnixFilename( &cwdSpec ) ; + strcpy( buf , res ) ; + */ + if (0) { +#elif defined(__VISAGECPP__) || (defined (__OS2__) && defined (__WATCOMC__)) + APIRET rc; + rc = ::DosQueryCurrentDir( 0 // current drive + ,buf + ,(PULONG)&sz + ); + if (rc != 0) { #else if (getcwd(buf, sz) == NULL) { #endif @@ -1711,8 +1819,10 @@ wxString wxGetCwd() bool wxSetWorkingDirectory(const wxString& d) { -#if defined( __UNIX__ ) || defined( __WXMAC__ ) || defined(__WXPM__) +#if defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__) return (chdir(wxFNSTRINGCAST d.fn_str()) == 0); +#elif defined(__WXPM__) + return (::DosSetCurrentDir((PSZ)d.c_str()) == 0); #elif defined(__WINDOWS__) #ifdef __WIN32__ @@ -1748,7 +1858,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); @@ -1771,7 +1881,7 @@ bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFi { // we assume that it's not empty wxCHECK_MSG( !wxIsEmpty(pszFile), FALSE, - _("empty file name in wxFindFileInPath")); + _T("empty file name in wxFindFileInPath")); // skip path separator in the beginning of the file name if present if ( wxIsPathSeparator(*pszFile) ) @@ -1816,65 +1926,14 @@ 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) { - struct stat buf; + wxStructStat buf; - stat(filename.fn_str(), &buf); + wxStat(filename.fn_str(), &buf); return buf.st_mtime; } @@ -1943,7 +2002,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'))