X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..cc437b9654244bfb8b638f98252aa34145323b9c:/src/common/file.cpp diff --git a/src/common/file.cpp b/src/common/file.cpp index 1063e45293..d6b4620e7d 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -24,7 +24,7 @@ #if wxUSE_FILE // standard -#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) +#if defined(__WINDOWS__) && !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) #define WIN32_LEAN_AND_MEAN #define NOSERVICE @@ -47,7 +47,7 @@ #define NOCRYPT #define NOMCX -#elif defined(__WXMSW__) && defined(__WXWINCE__) +#elif defined(__WINDOWS__) && defined(__WXWINCE__) #include "wx/msw/missing.h" #elif (defined(__OS2__)) #include @@ -80,14 +80,16 @@ char* mktemp( char * path ) { return path ;} #include #include -#elif defined(__WXPALMOS__) - #include "wx/palmos/missing.h" #else #error "Please specify the header with file functions declarations." #endif //Win/UNIX #include // SEEK_xxx constants +#ifndef __WXWINCE__ + #include +#endif + // Windows compilers don't have these constants #ifndef W_OK enum @@ -117,7 +119,7 @@ #define O_BINARY (0) #endif //__UNIX__ -#ifdef __WXMSW__ +#ifdef __WINDOWS__ #include "wx/msw/mslu.h" #endif @@ -176,27 +178,43 @@ bool wxFile::Access(const wxString& name, OpenMode mode) wxFile::wxFile(const wxString& fileName, OpenMode mode) { m_fd = fd_invalid; - m_error = false; + m_lasterror = 0; Open(fileName, mode); } +bool wxFile::CheckForError(wxFileOffset rc) const +{ + if ( rc != -1 ) + return false; + + const_cast(this)->m_lasterror = +#ifndef __WXWINCE__ + errno +#else + ::GetLastError() +#endif + ; + + return true; +} + // create the file, fail if it already exists and bOverwrite bool wxFile::Create(const wxString& fileName, 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 - int fd = wxOpen( fileName, + int fildes = wxOpen( fileName, O_BINARY | O_WRONLY | O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), accessMode ); - if ( fd == -1 ) + if ( CheckForError(fildes) ) { wxLogSysError(_("can't create file '%s'"), fileName); return false; } - Attach(fd); + Attach(fildes); return true; } @@ -240,15 +258,15 @@ bool wxFile::Open(const wxString& fileName, OpenMode mode, int accessMode) accessMode &= wxS_IRUSR | wxS_IWUSR; #endif // __WINDOWS__ - int fd = wxOpen( fileName, flags, accessMode); + int fildes = wxOpen( fileName, flags, accessMode); - if ( fd == -1 ) + if ( CheckForError(fildes) ) { wxLogSysError(_("can't open file '%s'"), fileName); return false; } - Attach(fd); + Attach(fildes); return true; } @@ -256,7 +274,7 @@ bool wxFile::Open(const wxString& fileName, OpenMode mode, int accessMode) bool wxFile::Close() { if ( IsOpened() ) { - if (wxClose(m_fd) == -1) + if ( CheckForError(wxClose(m_fd)) ) { wxLogSysError(_("can't close file descriptor %d"), m_fd); m_fd = fd_invalid; @@ -273,6 +291,38 @@ bool wxFile::Close() // read/write // ---------------------------------------------------------------------------- +bool wxFile::ReadAll(wxString *str, const wxMBConv& conv) +{ + wxCHECK_MSG( str, false, wxS("Output string must be non-NULL") ); + + ssize_t length = Length(); + wxCHECK_MSG( (wxFileOffset)length == Length(), false, wxT("huge file not supported") ); + + wxCharBuffer buf(length); + char* p = buf.data(); + for ( ;; ) + { + static const ssize_t READSIZE = 4096; + + ssize_t nread = Read(p, length > READSIZE ? READSIZE : length); + if ( nread == wxInvalidOffset ) + return false; + + p += nread; + if ( length <= nread ) + break; + + length -= nread; + } + + *p = 0; + + wxString strTmp(buf, conv); + str->swap(strTmp); + + return true; +} + // read ssize_t wxFile::Read(void *pBuf, size_t nCount) { @@ -280,7 +330,7 @@ ssize_t wxFile::Read(void *pBuf, size_t nCount) ssize_t iRc = wxRead(m_fd, pBuf, nCount); - if ( iRc == -1 ) + if ( CheckForError(iRc) ) { wxLogSysError(_("can't read from file descriptor %d"), m_fd); return wxInvalidOffset; @@ -296,10 +346,9 @@ size_t wxFile::Write(const void *pBuf, size_t nCount) ssize_t iRc = wxWrite(m_fd, pBuf, nCount); - if ( iRc == -1 ) + if ( CheckForError(iRc) ) { wxLogSysError(_("can't write to file descriptor %d"), m_fd); - m_error = true; iRc = 0; } @@ -312,7 +361,12 @@ bool wxFile::Write(const wxString& s, const wxMBConv& conv) if ( !buf ) return false; - const size_t size = strlen(buf); // FIXME: use buf.length() when available +#if wxUSE_UNICODE + const size_t size = buf.length(); +#else + const size_t size = s.length(); +#endif + return Write(buf, size) == size; } @@ -324,7 +378,7 @@ bool wxFile::Flush() // call it then if ( IsOpened() && GetKind() == wxFILE_KIND_DISK ) { - if ( wxFsync(m_fd) == -1 ) + if ( CheckForError(wxFsync(m_fd)) ) { wxLogSysError(_("can't flush file descriptor %d"), m_fd); return false; @@ -366,7 +420,7 @@ wxFileOffset wxFile::Seek(wxFileOffset ofs, wxSeekMode mode) } wxFileOffset iRc = wxSeek(m_fd, ofs, origin); - if ( iRc == wxInvalidOffset ) + if ( CheckForError(iRc) ) { wxLogSysError(_("can't seek on file descriptor %d"), m_fd); } @@ -380,7 +434,7 @@ wxFileOffset wxFile::Tell() const wxASSERT( IsOpened() ); wxFileOffset iRc = wxTell(m_fd); - if ( iRc == wxInvalidOffset ) + if ( CheckForError(iRc) ) { wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd); } @@ -410,8 +464,7 @@ wxFileOffset wxFile::Length() const wxFileOffset iRc = Tell(); if ( iRc != wxInvalidOffset ) { - // have to use const_cast :-( - wxFileOffset iLen = ((wxFile *)this)->SeekEnd(); + wxFileOffset iLen = const_cast(this)->SeekEnd(); if ( iLen != wxInvalidOffset ) { // restore old position if ( ((wxFile *)this)->Seek(iRc) == wxInvalidOffset ) { @@ -425,6 +478,7 @@ wxFileOffset wxFile::Length() const if ( iRc == wxInvalidOffset ) { + // last error was already set by Tell() wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd); } @@ -438,7 +492,7 @@ bool wxFile::Eof() const wxFileOffset iRc; -#if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) +#if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__) // @@ this doesn't work, of course, on unseekable file descriptors wxFileOffset ofsCur = Tell(), ofsMax = Length(); @@ -457,10 +511,6 @@ bool wxFile::Eof() const { wxLogSysError(_("can't determine if the end of file is reached on descriptor %d"), m_fd); } - else if ( iRc != 1 ) - { - wxFAIL_MSG(wxT("invalid eof() return value.")); - } return true; }