X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7f411dd9be23d3550ec2e092ae14d5a327acbcd..9ca7505f1243ed1d2a2012caa09a52d41115c069:/src/common/file.cpp diff --git a/src/common/file.cpp b/src/common/file.cpp index 17b5627877..b8d659f833 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -7,14 +7,14 @@ // Created: 29/01/98 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "file.h" #endif @@ -28,8 +28,7 @@ #if wxUSE_FILE // standard -#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__) - #include +#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) #ifndef __SALFORDC__ #define WIN32_LEAN_AND_MEAN @@ -54,18 +53,27 @@ #define NOMCX #endif +#elif defined(__WXMSW__) && defined(__WXWINCE__) + #include "wx/msw/missing.h" +#elif (defined(__OS2__)) + #include #elif (defined(__UNIX__) || defined(__GNUWIN32__)) #include + #include + #include #ifdef __GNUWIN32__ - #include + #include "wx/msw/wrapwin.h" + #endif +#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(__DOS__) && defined(__WATCOMC__) - #include - char* mktemp(char *path) { return _mktemp(path); } -#elif (defined(__WXPM__)) - #include - #define W_OK 2 - #define R_OK 4 #elif (defined(__WXSTUBS__)) // Have to ifdef this for different environments #include @@ -77,28 +85,23 @@ #endif char* mktemp( char * path ) { return path ;} #include - #define W_OK 2 - #define R_OK 4 - #include + #include #else #error "Please specify the header with file functions declarations." #endif //Win/UNIX #include // SEEK_xxx constants -#include // O_RDONLY &c - -#ifndef __MWERKS__ - #include // needed for stat - #include // stat -#elif ( 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 @@ -122,7 +125,7 @@ #define ACCESS(access) , (access) #endif // Salford C -// wxWindows +// wxWidgets #ifndef WX_PRECOMP #include "wx/string.h" #include "wx/intl.h" @@ -131,6 +134,15 @@ #include "wx/filename.h" #include "wx/file.h" +#include "wx/filefn.h" + +#ifdef __WXMSW__ + #include "wx/msw/mslu.h" +#endif + +#ifdef __WXWINCE__ + #include "wx/msw/private.h" +#endif // ============================================================================ // implementation of wxFile @@ -139,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; @@ -169,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; } // ---------------------------------------------------------------------------- @@ -184,7 +191,7 @@ bool wxFile::Access(const wxChar *name, OpenMode mode) wxFile::wxFile(const wxChar *szFileName, OpenMode mode) { m_fd = fd_invalid; - m_error = FALSE; + m_error = false; Open(szFileName, mode); } @@ -194,23 +201,25 @@ 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); +#if defined(__WXMAC__) && !defined(__UNIX__) && !wxUSE_UNICODE + // Dominic Mazzoni [dmazzoni+@cs.cmu.edu] reports that open is still broken on the mac, so we replace + // int fd = open( 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; + return false; } - else { + else + { Attach(fd); - return TRUE; + return true; } } @@ -219,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; @@ -246,14 +256,23 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode) break; } - int fd = wxOpen(wxFNCONV(szFileName), flags ACCESS(accessMode)); - if ( fd == -1 ) { +#ifdef __WINDOWS__ + // only read/write bits for "all" are supported by this function under + // Windows, and VC++ 8 returns EINVAL if any other bits are used in + // accessMode, so clear them as they have at best no effect anyhow + accessMode &= wxS_IRUSR | wxS_IWUSR; +#endif // __WINDOWS__ + + int fd = wxOpen( szFileName, flags ACCESS(accessMode)); + + if ( fd == -1 ) + { wxLogSysError(_("can't open file '%s'"), szFileName); - return FALSE; + return false; } else { Attach(fd); - return TRUE; + return true; } } @@ -261,16 +280,17 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode) bool wxFile::Close() { if ( IsOpened() ) { - if ( close(m_fd) == -1 ) { + if (wxClose(m_fd) == -1) + { wxLogSysError(_("can't close file descriptor %d"), m_fd); m_fd = fd_invalid; - return FALSE; + return false; } else m_fd = fd_invalid; } - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -278,18 +298,15 @@ bool wxFile::Close() // ---------------------------------------------------------------------------- // read -off_t wxFile::Read(void *pBuf, off_t nCount) +size_t wxFile::Read(void *pBuf, size_t nCount) { wxCHECK( (pBuf != NULL) && IsOpened(), 0 ); -#ifdef __MWERKS__ - int iRc = ::read(m_fd, (char*) pBuf, nCount); -#else - int iRc = ::read(m_fd, pBuf, nCount); -#endif + int iRc = wxRead(m_fd, pBuf, nCount); + if ( iRc == -1 ) { wxLogSysError(_("can't read from file descriptor %d"), m_fd); - return wxInvalidOffset; + return (size_t)wxInvalidOffset; } else return (size_t)iRc; @@ -300,18 +317,11 @@ size_t wxFile::Write(const void *pBuf, size_t nCount) { wxCHECK( (pBuf != NULL) && IsOpened(), 0 ); -#ifdef __MWERKS__ -#if __MSL__ >= 0x6000 - int iRc = ::write(m_fd, (void*) pBuf, nCount); -#else - int iRc = ::write(m_fd, (const char*) pBuf, nCount); -#endif -#else - int iRc = ::write(m_fd, pBuf, nCount); -#endif + int iRc = wxWrite(m_fd, pBuf, nCount); + if ( iRc == -1 ) { wxLogSysError(_("can't write to file descriptor %d"), m_fd); - m_error = TRUE; + m_error = true; return 0; } else @@ -326,14 +336,14 @@ bool wxFile::Flush() if ( wxFsync(m_fd) == -1 ) { wxLogSysError(_("can't flush file descriptor %d"), m_fd); - return FALSE; + return false; } #else // no fsync // just do nothing #endif // fsync } - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -341,7 +351,7 @@ bool wxFile::Flush() // ---------------------------------------------------------------------------- // seek -off_t wxFile::Seek(off_t ofs, wxSeekMode mode) +wxFileOffset wxFile::Seek(wxFileOffset ofs, wxSeekMode mode) { wxASSERT( IsOpened() ); @@ -363,41 +373,43 @@ off_t wxFile::Seek(off_t ofs, wxSeekMode mode) break; } - int iRc = lseek(m_fd, ofs, origin); + if (ofs == wxInvalidOffset) + { + wxLogSysError(_("can't seek on file descriptor %d, large files support is not enabled."), m_fd); + return wxInvalidOffset; + } + wxFileOffset iRc = wxSeek(m_fd, ofs, origin); if ( iRc == -1 ) { wxLogSysError(_("can't seek on file descriptor %d"), m_fd); return wxInvalidOffset; } else - return (off_t)iRc; + return iRc; } -// get current off_t -off_t wxFile::Tell() const +// get current wxFileOffset +wxFileOffset wxFile::Tell() const { wxASSERT( IsOpened() ); - int iRc = wxTell(m_fd); + wxFileOffset iRc = wxTell(m_fd); if ( iRc == -1 ) { wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd); return wxInvalidOffset; } else - return (off_t)iRc; + return iRc; } // get current file length -off_t wxFile::Length() const +wxFileOffset wxFile::Length() const { wxASSERT( IsOpened() ); -#ifdef __VISUALC__ - int iRc = _filelength(m_fd); -#else // !VC++ - int iRc = wxTell(m_fd); + wxFileOffset iRc = Tell(); if ( iRc != -1 ) { // @ have to use const_cast :-( - int iLen = ((wxFile *)this)->SeekEnd(); + wxFileOffset iLen = ((wxFile *)this)->SeekEnd(); if ( iLen != -1 ) { // restore old position if ( ((wxFile *)this)->Seek(iRc) == -1 ) { @@ -408,14 +420,13 @@ off_t wxFile::Length() const iRc = iLen; } -#endif // VC++ if ( iRc == -1 ) { wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd); return wxInvalidOffset; } else - return (off_t)iRc; + return iRc; } // is end of file reached? @@ -425,16 +436,16 @@ 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(), + wxFileOffset ofsCur = Tell(), ofsMax = Length(); if ( ofsCur == wxInvalidOffset || ofsMax == wxInvalidOffset ) iRc = -1; else iRc = ofsCur == ofsMax; #else // Windows and "native" compiler - iRc = eof(m_fd); + iRc = wxEof(m_fd); #endif // Windows/Unix switch ( iRc ) { @@ -442,7 +453,7 @@ bool wxFile::Eof() const break; case 0: - return FALSE; + return false; case -1: wxLogSysError(_("can't determine if the end of file is reached on descriptor %d"), m_fd); @@ -452,7 +463,7 @@ bool wxFile::Eof() const wxFAIL_MSG(_("invalid eof() return value.")); } - return TRUE; + return true; } // ============================================================================ @@ -462,6 +473,7 @@ bool wxFile::Eof() const // ---------------------------------------------------------------------------- // construction // ---------------------------------------------------------------------------- + wxTempFile::wxTempFile(const wxString& strName) { Open(strName); @@ -469,21 +481,27 @@ 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() ) { // CreateTempFileName() failed - 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; + return false; } #ifdef __UNIX__ @@ -491,7 +509,7 @@ bool wxTempFile::Open(const wxString& strName) 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; } @@ -504,13 +522,15 @@ 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 ) { +#ifndef __OS2__ wxLogSysError(_("Failed to set temporary file permissions")); +#endif } #endif // Unix - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -529,15 +549,15 @@ bool wxTempFile::Commit() if ( wxFile::Exists(m_strName) && wxRemove(m_strName) != 0 ) { wxLogSysError(_("can't remove file '%s'"), m_strName.c_str()); - return FALSE; + return false; } - if ( wxRename(m_strTemp, m_strName) != 0 ) { + if ( !wxRenameFile(m_strTemp, m_strName) ) { wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str()); - return FALSE; + return false; } - return TRUE; + return true; } void wxTempFile::Discard()