X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/844f90fba68fc9fbd3e839825d406839ee9fb9fb..93d2bf4406e5f850189f827275c66ef99bb64791:/src/common/filefn.cpp diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 1046ffd340..5b59a1baba 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -31,7 +31,8 @@ #include "wx/utils.h" #include "wx/intl.h" -#include "wx/ffile.h" +#include "wx/file.h" +#include "wx/filename.h" // there are just too many of those... #ifdef __VISUALC__ @@ -56,6 +57,7 @@ #else #include #include + #include #endif #ifdef __UNIX__ @@ -71,10 +73,12 @@ #if !defined( __GNUWIN32__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__) #include #include + #include #endif // __WINDOWS__ #endif // native Win compiler #ifdef __GNUWIN32__ + #include #ifndef __TWIN32__ #include #endif @@ -111,11 +115,11 @@ extern wxChar *wxBuffer; -#ifdef __WXMAC__ -#include "morefile.h" -#include "moreextr.h" -#include "fullpath.h" -#include "fspcompa.h" +#if defined(__WXMAC__) && !defined(__UNIX__) + #include "morefile.h" + #include "moreextr.h" + #include "fullpath.h" + #include "fspcompa.h" #endif IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList) @@ -139,11 +143,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 // ============================================================================ // implementation @@ -272,8 +272,11 @@ wxString wxPathList::FindAbsoluteValidPath (const wxString& file) bool wxFileExists (const wxString& filename) { -#ifdef __GNUWIN32__ // (fix a B20 bug) - return GetFileAttributes(filename) != 0xFFFFFFFF; +#ifdef __WINDOWS__ + // 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 ) @@ -286,6 +289,18 @@ wxFileExists (const wxString& filename) bool wxIsAbsolutePath (const wxString& filename) { +#ifdef __WXMAC__ + if (filename != wxT("")) + { + // 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 ; + } + return FALSE ; +#else if (filename != wxT("")) { if (filename[0] == wxT('/') @@ -300,6 +315,7 @@ wxIsAbsolutePath (const wxString& filename) return TRUE; } return FALSE; +#endif } /* @@ -441,7 +457,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 +513,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 +533,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 +541,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++; @@ -588,13 +593,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); @@ -666,11 +665,15 @@ wxChar *wxFileNameFromPath (wxChar *path) tcp = path + wxStrlen (path); while (--tcp >= path) { +#ifdef __WXMAC__ + if (*tcp == wxT(':') ) +#else if (*tcp == wxT('/') || *tcp == wxT('\\') #ifdef __VMS__ || *tcp == wxT(':') || *tcp == wxT(']')) #else ) +#endif #endif return tcp + 1; } /* while */ @@ -693,11 +696,15 @@ wxString wxFileNameFromPath (const wxString& path1) tcp = path + wxStrlen (path); while (--tcp >= path) { +#ifdef __WXMAC__ + if (*tcp == wxT(':') ) +#else if (*tcp == wxT('/') || *tcp == wxT('\\') #ifdef __VMS__ || *tcp == wxT(':') || *tcp == wxT(']')) #else ) +#endif #endif return wxString(tcp + 1); } /* while */ @@ -731,7 +738,11 @@ wxPathOnly (wxChar *path) while (!done && i > -1) { // ] is for VMS +#ifdef __WXMAC__ + if (path[i] == wxT(':') ) +#else if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']')) +#endif { done = TRUE; #ifdef __VMS__ @@ -780,7 +791,11 @@ wxString wxPathOnly (const wxString& path) while (!done && i > -1) { // ] is for VMS +#ifdef __WXMAC__ + if (path[i] == wxT(':') ) +#else if (path[i] == wxT('/') || path[i] == wxT('\\') || path[i] == wxT(']')) +#endif { done = TRUE; #ifdef __VMS__ @@ -814,7 +829,29 @@ wxString wxPathOnly (const wxString& path) // 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__) && !defined(__UNIX__) +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 ; +} + +void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) +{ + FSpLocationFromFullPath( strlen(path ) , path , spec ) ; +} static char sMacFileNameConversion[ 1000 ] ; @@ -882,34 +919,11 @@ wxString wxUnix2MacFilename (const char *str) 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 ; -} - 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 ) ; @@ -964,9 +978,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); @@ -993,16 +1007,59 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil // 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; +#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 ( ;; ) @@ -1019,14 +1076,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 @@ -1040,7 +1115,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)); @@ -1051,18 +1129,19 @@ 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(__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++ + (void)perm; if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 ) #endif // !MSW/MSW { @@ -1103,13 +1182,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__ +#ifdef __WINDOWS__ + // 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 + wxStructStat st; #ifndef __VISAGECPP__ return wxStat(wxFNSTRINGCAST strPath.fn_str(), &st) == 0 && @@ -1120,12 +1206,13 @@ bool wxPathExists(const wxChar *pszPathName) (st.st_mode == S_IFDIR); #endif +#endif } // Get a temporary filename, opening and closing the file. wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf) { -#ifdef __WINDOWS__ +#if defined(__WINDOWS__) && !defined(__WXMICROWIN__) #ifndef __WIN32__ wxChar tmp[144]; @@ -1347,7 +1434,7 @@ wxString wxFindFirstFile(const wxChar *spec, int flags) FSSpec fsspec ; - wxUnixFilename2FSSpec( result , &fsspec ) ; + wxMacFilename2FSSpec( 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 ; @@ -1395,7 +1482,7 @@ wxString wxFindNextFile() g_iter.m_name, &spec) ; - return wxMacFSSpec2UnixFilename( &spec ) ; + return wxMacFSSpec2MacFilename( &spec ) ; } #elif defined(__WXMSW__) @@ -1616,7 +1703,7 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz) char *cbuf = new char[sz+1]; #ifdef _MSC_VER if (_getcwd(cbuf, sz) == NULL) { -#elif defined( __WXMAC__) +#elif defined(__WXMAC__) && !defined(__UNIX__) enum { SFSaveDisk = 0x214, CurDirStore = 0x398 @@ -1634,17 +1721,41 @@ 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(__UNIX__) + 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()-1]=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(__VISAGECPP__) APIRET rc; rc = ::DosQueryCurrentDir( 0 // current drive @@ -1720,7 +1831,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); @@ -1788,56 +1899,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) @@ -1913,7 +1975,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'))