X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/87b6002d7c48dea4ebd53bbf60996d1a87a0a5c6..8482e4bdb9928fe9982ac214aee345b19894b39b:/src/common/file.cpp diff --git a/src/common/file.cpp b/src/common/file.cpp index cf35fd1486..b8d659f833 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -10,11 +10,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -/* - TODO: remove all the WinCE ugliness from here, implement the wxOpen(), - wxSeek(), ... functions in a separate file for WinCE instead!!! - */ - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -34,7 +29,6 @@ // standard #if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) - #include #ifndef __SALFORDC__ #define WIN32_LEAN_AND_MEAN @@ -60,7 +54,7 @@ #endif #elif defined(__WXMSW__) && defined(__WXWINCE__) - // TODO: what to include? + #include "wx/msw/missing.h" #elif (defined(__OS2__)) #include #elif (defined(__UNIX__) || defined(__GNUWIN32__)) @@ -91,27 +85,13 @@ #endif char* mktemp( char * path ) { return path ;} #include - #include + #include #else #error "Please specify the header with file functions declarations." #endif //Win/UNIX #include // SEEK_xxx constants -#ifndef __WXWINCE__ -#include // O_RDONLY &c -#endif - -#ifdef __WXWINCE__ -// Nothing -#elif !defined(__MWERKS__) - #include // needed for stat - #include // stat -#elif defined(__MWERKS__) && ( defined(__WXMSW__) || defined(__MACH__) ) - #include // needed for stat - #include // stat -#endif - // Windows compilers don't have these constants #ifndef W_OK enum @@ -200,12 +180,7 @@ bool wxFile::Access(const wxChar *name, OpenMode mode) break; } -#ifdef __WXWINCE__ - // FIXME: use CreateFile with 0 access to query the file - return TRUE; -#else return wxAccess(name, how) == 0; -#endif } // ---------------------------------------------------------------------------- @@ -216,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); } @@ -228,93 +203,29 @@ bool wxFile::Create(const wxChar *szFileName, bool bOverwrite, int accessMode) // otherwise we only create the new file and fail if it already exists #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(wxUnix2MacFilename( szFileName ), O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access); + // int fd = open( szFileName , O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access); int fd = creat( szFileName , accessMode); -#else -#ifdef __WXWINCE__ - HANDLE fileHandle = ::CreateFile(szFileName, GENERIC_WRITE, 0, NULL, - bOverwrite ? CREATE_ALWAYS : CREATE_NEW, FILE_ATTRIBUTE_NORMAL, - 0); - int fd = 0; - if (fileHandle == INVALID_HANDLE_VALUE) - fd = (int) fileHandle; - else - fd = -1; #else int fd = wxOpen( szFileName, O_BINARY | O_WRONLY | O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL) ACCESS(accessMode) ); -#endif #endif if ( fd == -1 ) { wxLogSysError(_("can't create file '%s'"), szFileName); - return FALSE; + return false; } else { Attach(fd); - return TRUE; + return true; } } // open the file bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode) { -#ifdef __WXWINCE__ - DWORD access = 0; - DWORD shareMode = 0; - DWORD disposition = 0; - - int flags = O_BINARY; - - switch ( mode ) - { - case read: - access = GENERIC_READ; - shareMode = FILE_SHARE_READ|FILE_SHARE_WRITE; - disposition = OPEN_EXISTING; - break; - - case write_append: - if ( wxFile::Exists(szFileName) ) - { - access = GENERIC_READ|GENERIC_WRITE; - shareMode = FILE_SHARE_READ; - disposition = 0; - break; - } - //else: fall through as write_append is the same as write if the - // file doesn't exist - - case write: - access = GENERIC_WRITE; - shareMode = 0; - disposition = TRUNCATE_EXISTING; - break; - - case write_excl: - access = GENERIC_WRITE; - shareMode = 0; - disposition = TRUNCATE_EXISTING; - break; - - case read_write: - access = GENERIC_READ|GENERIC_WRITE; - shareMode = 0; - disposition = 0; - break; - } - - int fd = 0; - HANDLE fileHandle = ::CreateFile(szFileName, access, shareMode, NULL, - disposition, FILE_ATTRIBUTE_NORMAL, 0); - if (fileHandle == INVALID_HANDLE_VALUE) - fd = -1; - else - fd = (int) fileHandle; -#else int flags = O_BINARY; switch ( mode ) @@ -345,16 +256,23 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode) break; } +#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)); -#endif + if ( fd == -1 ) { wxLogSysError(_("can't open file '%s'"), szFileName); - return FALSE; + return false; } else { Attach(fd); - return TRUE; + return true; } } @@ -362,21 +280,17 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode) bool wxFile::Close() { if ( IsOpened() ) { -#ifdef __WXWINCE__ - if (!CloseHandle((HANDLE) m_fd)) -#else - if ( close(m_fd) == -1 ) -#endif + 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; } // ---------------------------------------------------------------------------- @@ -384,25 +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 __WXWINCE__ - DWORD bytesRead = 0; - int iRc = 0; - if (ReadFile((HANDLE) m_fd, pBuf, (DWORD) nCount, & bytesRead, NULL)) - iRc = bytesRead; - else - iRc = -1; -#elif defined(__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; @@ -413,25 +317,11 @@ size_t wxFile::Write(const void *pBuf, size_t nCount) { wxCHECK( (pBuf != NULL) && IsOpened(), 0 ); -#ifdef __WXWINCE__ - DWORD bytesWritten = 0; - int iRc = 0; - if (WriteFile((HANDLE) m_fd, pBuf, (DWORD) nCount, & bytesWritten, NULL)) - iRc = bytesWritten; - else - iRc = -1; -#elif defined(__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 @@ -442,20 +332,18 @@ size_t wxFile::Write(const void *pBuf, size_t nCount) bool wxFile::Flush() { if ( IsOpened() ) { -#ifdef __WXWINCE__ - // Do nothing -#elif defined(__VISUALC__) || wxHAVE_FSYNC +#if defined(__VISUALC__) || wxHAVE_FSYNC 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; } // ---------------------------------------------------------------------------- @@ -463,38 +351,10 @@ bool wxFile::Flush() // ---------------------------------------------------------------------------- // seek -off_t wxFile::Seek(off_t ofs, wxSeekMode mode) +wxFileOffset wxFile::Seek(wxFileOffset ofs, wxSeekMode mode) { wxASSERT( IsOpened() ); -#ifdef __WXWINCE__ - int origin; - switch ( mode ) { - default: - wxFAIL_MSG(_("unknown seek origin")); - - case wxFromStart: - origin = FILE_BEGIN; - break; - - case wxFromCurrent: - origin = FILE_CURRENT; - break; - - case wxFromEnd: - origin = FILE_END; - break; - } - - DWORD res = SetFilePointer((HANDLE) m_fd, ofs, 0, origin) ; - if (res == 0xFFFFFFFF && GetLastError() != NO_ERROR) - { - wxLogSysError(_("can't seek on file descriptor %d"), m_fd); - return wxInvalidOffset; - } - else - return (off_t)res; -#else int origin; switch ( mode ) { default: @@ -513,62 +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; -#endif + return iRc; } -// get current off_t -off_t wxFile::Tell() const +// get current wxFileOffset +wxFileOffset wxFile::Tell() const { wxASSERT( IsOpened() ); -#ifdef __WXWINCE__ - DWORD res = SetFilePointer((HANDLE) m_fd, 0, 0, FILE_CURRENT) ; - if (res == 0xFFFFFFFF && GetLastError() != NO_ERROR) - { - wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd); - return wxInvalidOffset; - } - else - return (off_t)res; -#else - 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; -#endif + return iRc; } // get current file length -off_t wxFile::Length() const +wxFileOffset wxFile::Length() const { wxASSERT( IsOpened() ); -#ifdef __WXWINCE__ - DWORD off0 = SetFilePointer((HANDLE) m_fd, 0, 0, FILE_CURRENT); - DWORD off1 = SetFilePointer((HANDLE) m_fd, 0, 0, FILE_END); - off_t len = off1; - - // Restore position - SetFilePointer((HANDLE) m_fd, off0, 0, FILE_BEGIN); - return len; -#else -#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 ) { @@ -579,15 +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; -#endif + return iRc; } // is end of file reached? @@ -595,29 +434,18 @@ bool wxFile::Eof() const { wxASSERT( IsOpened() ); -#ifdef __WXWINCE__ - DWORD off0 = SetFilePointer((HANDLE) m_fd, 0, 0, FILE_CURRENT); - DWORD off1 = SetFilePointer((HANDLE) m_fd, 0, 0, FILE_END); - if (off0 == off1) - return TRUE; - else - { - SetFilePointer((HANDLE) m_fd, off0, 0, FILE_BEGIN); - return FALSE; - } -#else int iRc; #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 ) { @@ -625,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); @@ -635,8 +463,7 @@ bool wxFile::Eof() const wxFAIL_MSG(_("invalid eof() return value.")); } - return TRUE; -#endif + return true; } // ============================================================================ @@ -674,13 +501,13 @@ bool wxTempFile::Open(const wxString& strName) if ( m_strTemp.empty() ) { // CreateTempFileName() failed - return FALSE; + return false; } #ifdef __UNIX__ // the temp file should have the same permissions as the original one mode_t mode; - + wxStructStat st; if ( stat( (const char*) m_strName.fn_str(), &st) == 0 ) { @@ -703,7 +530,7 @@ bool wxTempFile::Open(const wxString& strName) } #endif // Unix - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -722,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 ( !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()