X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30984deafc05d7c6f88db736336fe73d23a08e19..fcdd53359135f790b85728c4254b97095a56dad8:/src/common/wfstream.cpp?ds=sidebyside diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp index a1b94af437..de2af11173 100644 --- a/src/common/wfstream.cpp +++ b/src/common/wfstream.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: fstream.cpp +// Name: src/common/fstream.cpp // Purpose: "File stream" classes // Author: Julian Smart // Modified by: @@ -9,23 +9,25 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "wfstream.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif -#if wxUSE_STREAMS && wxUSE_FILE +#if wxUSE_STREAMS -#include -#include "wx/stream.h" #include "wx/wfstream.h" +#ifndef WX_PRECOMP + #include "wx/stream.h" +#endif + +#include + +#if wxUSE_FILE + // ---------------------------------------------------------------------------- // wxFileInputStream // ---------------------------------------------------------------------------- @@ -35,6 +37,8 @@ wxFileInputStream::wxFileInputStream(const wxString& fileName) { m_file = new wxFile(fileName, wxFile::read); m_file_destroy = true; + if ( !m_file->IsOpened() ) + m_lasterror = wxSTREAM_READ_ERROR; } wxFileInputStream::wxFileInputStream() @@ -62,14 +66,14 @@ wxFileInputStream::~wxFileInputStream() delete m_file; } -size_t wxFileInputStream::GetSize() const +wxFileOffset wxFileInputStream::GetLength() const { return m_file->Length(); } size_t wxFileInputStream::OnSysRead(void *buffer, size_t size) { - size_t ret = m_file->Read(buffer, size); + ssize_t ret = m_file->Read(buffer, size); // NB: we can't use a switch here because HP-UX CC doesn't allow // switching over long long (which size_t is in 64bit mode) @@ -79,7 +83,7 @@ size_t wxFileInputStream::OnSysRead(void *buffer, size_t size) // nothing read, so nothing more to read m_lasterror = wxSTREAM_EOF; } - else if ( ret == (size_t)wxInvalidOffset ) + else if ( ret == wxInvalidOffset ) { m_lasterror = wxSTREAM_READ_ERROR; ret = 0; @@ -103,6 +107,11 @@ wxFileOffset wxFileInputStream::OnSysTell() const return m_file->Tell(); } +bool wxFileInputStream::IsOk() const +{ + return wxInputStream::IsOk() && m_file->IsOpened(); +} + // ---------------------------------------------------------------------------- // wxFileOutputStream // ---------------------------------------------------------------------------- @@ -113,14 +122,7 @@ wxFileOutputStream::wxFileOutputStream(const wxString& fileName) m_file_destroy = true; if (!m_file->IsOpened()) - { m_lasterror = wxSTREAM_WRITE_ERROR; - } - else - { - if (m_file->Error()) - m_lasterror = wxSTREAM_WRITE_ERROR; - } } wxFileOutputStream::wxFileOutputStream(wxFile& file) @@ -176,37 +178,89 @@ void wxFileOutputStream::Sync() m_file->Flush(); } -size_t wxFileOutputStream::GetSize() const +wxFileOffset wxFileOutputStream::GetLength() const { return m_file->Length(); } +bool wxFileOutputStream::IsOk() const +{ + return wxOutputStream::IsOk() && m_file->IsOpened(); +} + +// ---------------------------------------------------------------------------- +// wxTempFileOutputStream +// ---------------------------------------------------------------------------- + +wxTempFileOutputStream::wxTempFileOutputStream(const wxString& fileName) +{ + m_file = new wxTempFile(fileName); + + if (!m_file->IsOpened()) + m_lasterror = wxSTREAM_WRITE_ERROR; +} + +wxTempFileOutputStream::~wxTempFileOutputStream() +{ + if (m_file->IsOpened()) + Discard(); + delete m_file; +} + +size_t wxTempFileOutputStream::OnSysWrite(const void *buffer, size_t size) +{ + if (IsOk() && m_file->Write(buffer, size)) + return size; + m_lasterror = wxSTREAM_WRITE_ERROR; + return 0; +} + // ---------------------------------------------------------------------------- // wxFileStream // ---------------------------------------------------------------------------- wxFileStream::wxFileStream(const wxString& fileName) - : wxFileInputStream(fileName) + : wxFileInputStream(), + wxFileOutputStream() { - wxFileOutputStream::m_file = wxFileInputStream::m_file; + wxFileOutputStream::m_file = + wxFileInputStream::m_file = new wxFile(fileName, wxFile::read_write); + + // this is a bit ugly as streams are symmetric but we still have to delete + // the file we created above exactly once so we decide to (arbitrarily) do + // it in wxFileInputStream + wxFileInputStream::m_file_destroy = true; } +bool wxFileStream::IsOk() const +{ + return wxFileOutputStream::IsOk() && wxFileInputStream::IsOk(); +} + +#endif // wxUSE_FILE + +#if wxUSE_FFILE + // ---------------------------------------------------------------------------- // wxFFileInputStream // ---------------------------------------------------------------------------- -wxFFileInputStream::wxFFileInputStream(const wxString& fileName) - : wxInputStream() +wxFFileInputStream::wxFFileInputStream(const wxString& fileName, + const wxString& mode) + : wxInputStream() { - m_file = new wxFFile(fileName, _T("rb")); + m_file = new wxFFile(fileName, mode); m_file_destroy = true; + + if (!m_file->IsOpened()) + m_lasterror = wxSTREAM_WRITE_ERROR; } wxFFileInputStream::wxFFileInputStream() - : wxInputStream() + : wxInputStream() { - m_file_destroy = false; m_file = NULL; + m_file_destroy = false; } wxFFileInputStream::wxFFileInputStream(wxFFile& file) @@ -227,18 +281,19 @@ wxFFileInputStream::~wxFFileInputStream() delete m_file; } -size_t wxFFileInputStream::GetSize() const +wxFileOffset wxFFileInputStream::GetLength() const { return m_file->Length(); } size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size) { - size_t ret = m_file->Read(buffer, size); + ssize_t ret = m_file->Read(buffer, size); - if (m_file->Eof()) + // It is not safe to call Eof() if the file is not opened. + if (!m_file->IsOpened() || m_file->Eof()) m_lasterror = wxSTREAM_EOF; - if (ret == (size_t)wxInvalidOffset) + if (ret == wxInvalidOffset) { m_lasterror = wxSTREAM_READ_ERROR; ret = 0; @@ -249,13 +304,7 @@ size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size) wxFileOffset wxFFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) { -#ifdef __VMS -#pragma message disable intsignchange -#endif - return ( m_file->Seek(pos, mode) ? (wxFileOffset)m_file->Tell() : wxInvalidOffset ); -#ifdef __VMS -#pragma message enable intsignchange -#endif + return m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset; } wxFileOffset wxFFileInputStream::OnSysTell() const @@ -263,13 +312,19 @@ wxFileOffset wxFFileInputStream::OnSysTell() const return m_file->Tell(); } +bool wxFFileInputStream::IsOk() const +{ + return wxStreamBase::IsOk() && m_file->IsOpened(); +} + // ---------------------------------------------------------------------------- // wxFFileOutputStream // ---------------------------------------------------------------------------- -wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName) +wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName, + const wxString& mode) { - m_file = new wxFFile(fileName, _T("w+b")); + m_file = new wxFFile(fileName, mode); m_file_destroy = true; if (!m_file->IsOpened()) @@ -290,10 +345,10 @@ wxFFileOutputStream::wxFFileOutputStream(wxFFile& file) } wxFFileOutputStream::wxFFileOutputStream() - : wxOutputStream() + : wxOutputStream() { - m_file_destroy = false; m_file = NULL; + m_file_destroy = false; } wxFFileOutputStream::wxFFileOutputStream(FILE *file) @@ -314,7 +369,8 @@ wxFFileOutputStream::~wxFFileOutputStream() size_t wxFFileOutputStream::OnSysWrite(const void *buffer, size_t size) { size_t ret = m_file->Write(buffer, size); - if (m_file->Error()) + // It is not safe to call Error() if the file is not opened. + if (!m_file->IsOpened() || m_file->Error()) m_lasterror = wxSTREAM_WRITE_ERROR; else m_lasterror = wxSTREAM_NO_ERROR; @@ -328,13 +384,7 @@ wxFileOffset wxFFileOutputStream::OnSysTell() const wxFileOffset wxFFileOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) { -#ifdef __VMS -#pragma message disable intsignchange -#endif - return ( m_file->Seek(pos, mode) ? (wxFileOffset)m_file->Tell() : wxInvalidOffset ); -#ifdef __VMS -#pragma message enable intsignchange -#endif + return m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset; } void wxFFileOutputStream::Sync() @@ -343,21 +393,39 @@ void wxFFileOutputStream::Sync() m_file->Flush(); } -size_t wxFFileOutputStream::GetSize() const +wxFileOffset wxFFileOutputStream::GetLength() const { return m_file->Length(); } +bool wxFFileOutputStream::IsOk() const +{ + return wxStreamBase::IsOk() && m_file->IsOpened(); +} + // ---------------------------------------------------------------------------- // wxFFileStream // ---------------------------------------------------------------------------- -wxFFileStream::wxFFileStream(const wxString& fileName) - : wxFFileInputStream(fileName) +wxFFileStream::wxFFileStream(const wxString& fileName, const wxString& mode) + : wxFFileInputStream(), + wxFFileOutputStream() +{ + wxASSERT_MSG( mode.find_first_of('+') != wxString::npos, + "must be opened in read-write mode for this class to work" ); + + wxFFileOutputStream::m_file = + wxFFileInputStream::m_file = new wxFFile(fileName, mode); + + // see comment in wxFileStream ctor + wxFFileInputStream::m_file_destroy = true; +} + +bool wxFFileStream::IsOk() const { - wxFFileOutputStream::m_file = wxFFileInputStream::m_file; + return wxFFileOutputStream::IsOk() && wxFFileInputStream::IsOk(); } -#endif - // wxUSE_STREAMS && wxUSE_FILE +#endif //wxUSE_FFILE +#endif // wxUSE_STREAMS