X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55d99c7a77789ff4904bf96eddca3715eb5af9b9..424da8bdb9f05243d8888d78a56ab0cc3f615a6c:/src/common/wfstream.cpp diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp index da1651e2a5..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 ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#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 // ---------------------------------------------------------------------------- @@ -34,26 +36,28 @@ wxFileInputStream::wxFileInputStream(const wxString& fileName) : wxInputStream() { m_file = new wxFile(fileName, wxFile::read); - m_file_destroy = TRUE; + m_file_destroy = true; + if ( !m_file->IsOpened() ) + m_lasterror = wxSTREAM_READ_ERROR; } wxFileInputStream::wxFileInputStream() : wxInputStream() { - m_file_destroy = FALSE; + m_file_destroy = false; m_file = NULL; } wxFileInputStream::wxFileInputStream(wxFile& file) { m_file = &file; - m_file_destroy = FALSE; + m_file_destroy = false; } wxFileInputStream::wxFileInputStream(int fd) { m_file = new wxFile(fd); - m_file_destroy = TRUE; + m_file_destroy = true; } wxFileInputStream::~wxFileInputStream() @@ -62,17 +66,17 @@ 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) { - off_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 off_t is in 64bit mode) + // switching over long long (which size_t is in 64bit mode) if ( !ret ) { @@ -93,16 +97,21 @@ size_t wxFileInputStream::OnSysRead(void *buffer, size_t size) return ret; } -off_t wxFileInputStream::OnSysSeek(off_t pos, wxSeekMode mode) +wxFileOffset wxFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) { return m_file->Seek(pos, mode); } -off_t wxFileInputStream::OnSysTell() const +wxFileOffset wxFileInputStream::OnSysTell() const { return m_file->Tell(); } +bool wxFileInputStream::IsOk() const +{ + return wxInputStream::IsOk() && m_file->IsOpened(); +} + // ---------------------------------------------------------------------------- // wxFileOutputStream // ---------------------------------------------------------------------------- @@ -110,36 +119,29 @@ off_t wxFileInputStream::OnSysTell() const wxFileOutputStream::wxFileOutputStream(const wxString& fileName) { m_file = new wxFile(fileName, wxFile::write); - m_file_destroy = TRUE; + 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) { m_file = &file; - m_file_destroy = FALSE; + m_file_destroy = false; } wxFileOutputStream::wxFileOutputStream() : wxOutputStream() { - m_file_destroy = FALSE; + m_file_destroy = false; m_file = NULL; } wxFileOutputStream::wxFileOutputStream(int fd) { m_file = new wxFile(fd); - m_file_destroy = TRUE; + m_file_destroy = true; } wxFileOutputStream::~wxFileOutputStream() @@ -160,12 +162,12 @@ size_t wxFileOutputStream::OnSysWrite(const void *buffer, size_t size) return ret; } -off_t wxFileOutputStream::OnSysTell() const +wxFileOffset wxFileOutputStream::OnSysTell() const { return m_file->Tell(); } -off_t wxFileOutputStream::OnSysSeek(off_t pos, wxSeekMode mode) +wxFileOffset wxFileOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) { return m_file->Seek(pos, mode); } @@ -176,49 +178,101 @@ 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_destroy = TRUE; + 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) { m_file = &file; - m_file_destroy = FALSE; + m_file_destroy = false; } wxFFileInputStream::wxFFileInputStream(FILE *file) { m_file = new wxFFile(file); - m_file_destroy = TRUE; + m_file_destroy = true; } wxFFileInputStream::~wxFFileInputStream() @@ -227,18 +281,17 @@ 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) { - off_t ret; + ssize_t ret = m_file->Read(buffer, size); - 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 == wxInvalidOffset) { @@ -249,24 +302,30 @@ size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size) return ret; } -off_t wxFFileInputStream::OnSysSeek(off_t pos, wxSeekMode mode) +wxFileOffset wxFFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) { - return ( m_file->Seek(pos, mode) ? pos : wxInvalidOffset ); + return m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset; } -off_t wxFFileInputStream::OnSysTell() const +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_destroy = TRUE; + m_file = new wxFFile(fileName, mode); + m_file_destroy = true; if (!m_file->IsOpened()) { @@ -282,20 +341,20 @@ wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName) wxFFileOutputStream::wxFFileOutputStream(wxFFile& file) { m_file = &file; - m_file_destroy = FALSE; + m_file_destroy = false; } wxFFileOutputStream::wxFFileOutputStream() - : wxOutputStream() + : wxOutputStream() { - m_file_destroy = FALSE; m_file = NULL; + m_file_destroy = false; } wxFFileOutputStream::wxFFileOutputStream(FILE *file) { m_file = new wxFFile(file); - m_file_destroy = TRUE; + m_file_destroy = true; } wxFFileOutputStream::~wxFFileOutputStream() @@ -310,21 +369,22 @@ 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; return ret; } -off_t wxFFileOutputStream::OnSysTell() const +wxFileOffset wxFFileOutputStream::OnSysTell() const { return m_file->Tell(); } -off_t wxFFileOutputStream::OnSysSeek(off_t pos, wxSeekMode mode) +wxFileOffset wxFFileOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) { - return ( m_file->Seek(pos, mode) ? pos : wxInvalidOffset ); + return m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset; } void wxFFileOutputStream::Sync() @@ -333,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() { - wxFFileOutputStream::m_file = wxFFileInputStream::m_file; + 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; } -#endif - // wxUSE_STREAMS && wxUSE_FILE +bool wxFFileStream::IsOk() const +{ + return wxFFileOutputStream::IsOk() && wxFFileInputStream::IsOk(); +} + +#endif //wxUSE_FFILE +#endif // wxUSE_STREAMS