X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dccaf280564efabd524f8432aa2e448a3fb341ed..c5c04fabb02c27bcc8115bff024d74ddd48f8175:/src/common/file.cpp?ds=sidebyside diff --git a/src/common/file.cpp b/src/common/file.cpp index b7ce74c794..504bdbceea 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -7,7 +7,7 @@ // Created: 29/01/98 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ---------------------------------------------------------------------------- @@ -28,7 +28,7 @@ #if wxUSE_FILE // standard -#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__) +#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) #include #ifndef __SALFORDC__ @@ -56,15 +56,22 @@ #elif (defined(__UNIX__) || defined(__GNUWIN32__)) #include + #include #ifdef __GNUWIN32__ #include #endif -#elif defined(__DOS__) && defined(__WATCOMC__) - #include +#elif defined(__DOS__) + #if defined(__WATCOMC__) + #include + #elif defined(__DJGPP__) + #include + #include + #include + #else + #error "Please specify the header with file functions declarations." + #endif #elif (defined(__WXPM__)) #include - #define W_OK 2 - #define R_OK 4 #elif (defined(__WXSTUBS__)) // Have to ifdef this for different environments #include @@ -76,8 +83,6 @@ #endif char* mktemp( char * path ) { return path ;} #include - #define W_OK 2 - #define R_OK 4 #include #else #error "Please specify the header with file functions declarations." @@ -86,18 +91,21 @@ #include // SEEK_xxx constants #include // O_RDONLY &c -#ifndef __MWERKS__ - #include // needed for stat - #include // stat -#elif ( defined(__MWERKS__) && defined(__WXMSW__) ) +#if !defined(__MWERKS__) || defined(__WXMSW__) #include // needed for stat #include // stat #endif -#if defined(__BORLANDC__) || defined(_MSC_VER) - #define W_OK 2 - #define R_OK 4 -#endif +// Windows compilers don't have these constants +#ifndef W_OK + enum + { + F_OK = 0, // test for existence + X_OK = 1, // execute permission + W_OK = 2, // write + R_OK = 4 // read + }; +#endif // W_OK // there is no distinction between text and binary files under Unix, so define // O_BINARY as 0 if the system headers don't do it already @@ -130,6 +138,11 @@ #include "wx/filename.h" #include "wx/file.h" +#include "wx/filefn.h" + +#ifdef __WXMSW__ + #include "wx/msw/mslu.h" +#endif // ============================================================================ // implementation of wxFile @@ -138,28 +151,22 @@ // ---------------------------------------------------------------------------- // static functions // ---------------------------------------------------------------------------- + bool wxFile::Exists(const wxChar *name) { - wxStructStat st; -#if wxUSE_UNICODE && wxMBFILES - wxCharBuffer fname = wxConvFile.cWC2MB(name); - - return !wxAccess(fname, 0) && - !wxStat(wxMBSTRINGCAST fname, &st) && - (st.st_mode & S_IFREG); - -#else - return !wxAccess(name, 0) && - !wxStat(name, &st) && - (st.st_mode & S_IFREG); -#endif + return wxFileExists(name); } bool wxFile::Access(const wxChar *name, OpenMode mode) { - int how = 0; + int how; + + switch ( mode ) + { + default: + wxFAIL_MSG(wxT("bad wxFile::Access mode parameter.")); + // fall through - switch ( mode ) { case read: how = R_OK; break; @@ -168,11 +175,12 @@ bool wxFile::Access(const wxChar *name, OpenMode mode) how = W_OK; break; - default: - wxFAIL_MSG(wxT("bad wxFile::Access mode parameter.")); + case read_write: + how = R_OK | W_OK; + break; } - return wxAccess(wxFNCONV(name), how) == 0; + return wxAccess(name, how) == 0; } // ---------------------------------------------------------------------------- @@ -194,20 +202,22 @@ bool wxFile::Create(const wxChar *szFileName, bool bOverwrite, int accessMode) // if bOverwrite we create a new file or truncate the existing one, // otherwise we only create the new file and fail if it already exists #if defined(__WXMAC__) && !defined(__UNIX__) - // Dominic Mazzoni [dmazzoni+@cs.cmu.edu] reports that open is still broken on the mac, so we replace - // int fd = open(wxUnix2MacFilename( szFileName ), O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access); - int fd = creat( szFileName , accessMode); + // Dominic Mazzoni [dmazzoni+@cs.cmu.edu] reports that open is still broken on the mac, so we replace + // int fd = open(wxUnix2MacFilename( szFileName ), O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access); + int fd = creat( szFileName , accessMode); #else - int fd = wxOpen(wxFNCONV(szFileName), - O_BINARY | O_WRONLY | O_CREAT | - (bOverwrite ? O_TRUNC : O_EXCL) - ACCESS(accessMode)); + int fd = wxOpen( szFileName, + O_BINARY | O_WRONLY | O_CREAT | + (bOverwrite ? O_TRUNC : O_EXCL) + ACCESS(accessMode) ); #endif - if ( fd == -1 ) { + if ( fd == -1 ) + { wxLogSysError(_("can't create file '%s'"), szFileName); return FALSE; } - else { + else + { Attach(fd); return TRUE; } @@ -218,7 +228,8 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode) { int flags = O_BINARY; - switch ( mode ) { + switch ( mode ) + { case read: flags |= O_RDONLY; break; @@ -245,8 +256,9 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode) break; } - int fd = wxOpen(wxFNCONV(szFileName), flags ACCESS(accessMode)); - if ( fd == -1 ) { + int fd = wxOpen( szFileName, flags ACCESS(accessMode)); + if ( fd == -1 ) + { wxLogSysError(_("can't open file '%s'"), szFileName); return FALSE; } @@ -424,7 +436,7 @@ bool wxFile::Eof() const int iRc; -#if defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) || defined(__SALFORDC__) +#if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) || defined(__SALFORDC__) // @@ this doesn't work, of course, on unseekable file descriptors off_t ofsCur = Tell(), ofsMax = Length(); @@ -461,6 +473,7 @@ bool wxFile::Eof() const // ---------------------------------------------------------------------------- // construction // ---------------------------------------------------------------------------- + wxTempFile::wxTempFile(const wxString& strName) { Open(strName); @@ -468,9 +481,22 @@ wxTempFile::wxTempFile(const wxString& strName) bool wxTempFile::Open(const wxString& strName) { - m_strName = strName; + // we must have an absolute filename because otherwise CreateTempFileName() + // would create the temp file in $TMP (i.e. the system standard location + // for the temp files) which might be on another volume/drive/mount and + // wxRename()ing it later to m_strName from Commit() would then fail + // + // with the absolute filename, the temp file is created in the same + // directory as this one which ensures that wxRename() may work later + wxFileName fn(strName); + if ( !fn.IsAbsolute() ) + { + fn.Normalize(wxPATH_NORM_ABSOLUTE); + } - m_strTemp = wxFileName::CreateTempFileName(strName); + m_strName = fn.GetFullPath(); + + m_strTemp = wxFileName::CreateTempFileName(m_strName, &m_file); if ( m_strTemp.empty() ) { @@ -478,19 +504,12 @@ bool wxTempFile::Open(const wxString& strName) return FALSE; } - // actually open the file now (it must already exist) - if ( !m_file.Open(m_strTemp, wxFile::write) ) - { - // opening existing file failed? - return FALSE; - } - #ifdef __UNIX__ // the temp file should have the same permissions as the original one mode_t mode; - + wxStructStat st; - if ( stat(strName.fn_str(), &st) == 0 ) + if ( stat( (const char*) m_strName.fn_str(), &st) == 0 ) { mode = st.st_mode; } @@ -503,7 +522,7 @@ bool wxTempFile::Open(const wxString& strName) umask(mask); } - if ( chmod(m_strTemp.mb_str(), mode) == -1 ) + if ( chmod( (const char*) m_strTemp.fn_str(), mode) == -1 ) { wxLogSysError(_("Failed to set temporary file permissions")); }