X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/593d4b0dffa77c74444dca03eb1e01c7b5f8a220..11bf9fea53d75b460aaa4028a591917b6dd6fe54:/src/common/wfstream.cpp?ds=inline diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp index 4d798f3c79..1eca40cd08 100644 --- a/src/common/wfstream.cpp +++ b/src/common/wfstream.cpp @@ -1,28 +1,33 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: fstream.cpp +// Name: src/common/wfstream.cpp // Purpose: "File stream" classes // Author: Julian Smart // Modified by: // Created: 11/07/98 // RCS-ID: $Id$ -// Copyright: (c) Guilhem Lavaux -// Licence: wxWindows license +// Copyright: (c) Guilhem Lavaux +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "wfstream.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include -#include -#include #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_STREAMS + +#include "wx/wfstream.h" + +#ifndef WX_PRECOMP + #include "wx/stream.h" +#endif + +#include + +#if wxUSE_FILE + // ---------------------------------------------------------------------------- // wxFileInputStream // ---------------------------------------------------------------------------- @@ -30,47 +35,81 @@ wxFileInputStream::wxFileInputStream(const wxString& fileName) : wxInputStream() { - m_file = new wxFile(fileName, wxFile::read); - m_file_destroy = TRUE; - m_i_streambuf->SetBufferIO(1024); + m_file = new wxFile(fileName, wxFile::read); + m_file_destroy = true; + if ( !m_file->IsOpened() ) + m_lasterror = wxSTREAM_READ_ERROR; } wxFileInputStream::wxFileInputStream() : wxInputStream() { - m_file_destroy = FALSE; - m_file = NULL; + m_file_destroy = false; + m_file = NULL; } -wxFileInputStream::~wxFileInputStream() +wxFileInputStream::wxFileInputStream(wxFile& file) { - if (m_file_destroy) - delete m_file; + m_file = &file; + m_file_destroy = false; } -char wxFileInputStream::Peek() +wxFileInputStream::wxFileInputStream(int fd) { - return 0; + m_file = new wxFile(fd); + m_file_destroy = true; } -size_t wxFileInputStream::StreamSize() const +wxFileInputStream::~wxFileInputStream() { - return m_file->Length(); + if (m_file_destroy) + delete m_file; +} + +wxFileOffset wxFileInputStream::GetLength() const +{ + return m_file->Length(); } size_t wxFileInputStream::OnSysRead(void *buffer, size_t size) { - return 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) + + if ( !ret ) + { + // nothing read, so nothing more to read + m_lasterror = wxSTREAM_EOF; + } + else if ( ret == wxInvalidOffset ) + { + m_lasterror = wxSTREAM_READ_ERROR; + ret = 0; + } + else + { + // normal case + m_lasterror = wxSTREAM_NO_ERROR; + } + + return ret; } -off_t wxFileInputStream::OnSysSeek(off_t pos, wxSeekMode mode) +wxFileOffset wxFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) { - return m_file->Seek(pos, mode); + return m_file->Seek(pos, mode); } -off_t wxFileInputStream::OnSysTell() const +wxFileOffset wxFileInputStream::OnSysTell() const { - return m_file->Tell(); + return m_file->Tell(); +} + +bool wxFileInputStream::IsOk() const +{ + return wxInputStream::IsOk() && m_file->IsOpened(); } // ---------------------------------------------------------------------------- @@ -79,66 +118,314 @@ off_t wxFileInputStream::OnSysTell() const wxFileOutputStream::wxFileOutputStream(const wxString& fileName) { - m_file = new wxFile(fileName, wxFile::write); - m_file_destroy = TRUE; - m_o_streambuf->SetBufferIO(1024); + m_file = new wxFile(fileName, wxFile::write); + m_file_destroy = true; + + if (!m_file->IsOpened()) + m_lasterror = wxSTREAM_WRITE_ERROR; } wxFileOutputStream::wxFileOutputStream(wxFile& file) { - m_file = &file; - m_file_destroy = FALSE; - m_o_streambuf->SetBufferIO(1024); + m_file = &file; + m_file_destroy = false; } wxFileOutputStream::wxFileOutputStream() - : wxOutputStream() + : wxOutputStream() { - m_o_streambuf->SetBufferIO(1024); - m_file_destroy = FALSE; - m_file = NULL; + m_file_destroy = false; + m_file = NULL; +} + +wxFileOutputStream::wxFileOutputStream(int fd) +{ + m_file = new wxFile(fd); + m_file_destroy = true; } wxFileOutputStream::~wxFileOutputStream() { - if (m_file_destroy) { - Sync(); - delete m_file; - } + if (m_file_destroy) + { + Sync(); + delete m_file; + } } size_t wxFileOutputStream::OnSysWrite(const void *buffer, size_t size) { - size_t ret = m_file->Write(buffer, size); - m_lasterror = wxStream_EOF; // TODO - return ret; + size_t ret = m_file->Write(buffer, size); + + m_lasterror = m_file->Error() ? wxSTREAM_WRITE_ERROR : wxSTREAM_NO_ERROR; + + return ret; } -off_t wxFileOutputStream::OnSysTell() const +wxFileOffset wxFileOutputStream::OnSysTell() const { - return m_file->Tell(); + 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); + return m_file->Seek(pos, mode); } void wxFileOutputStream::Sync() { - wxOutputStream::Sync(); - m_file->Flush(); + wxOutputStream::Sync(); + m_file->Flush(); +} + +wxFileOffset wxFileOutputStream::GetLength() const +{ + return m_file->Length(); +} + +bool wxFileOutputStream::IsOk() const +{ + return wxOutputStream::IsOk() && m_file->IsOpened(); } -size_t wxFileOutputStream::StreamSize() const +// ---------------------------------------------------------------------------- +// 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) { - return m_file->Length(); + if (IsOk() && m_file->Write(buffer, size)) + return size; + m_lasterror = wxSTREAM_WRITE_ERROR; + return 0; } // ---------------------------------------------------------------------------- // wxFileStream // ---------------------------------------------------------------------------- + wxFileStream::wxFileStream(const wxString& fileName) - : wxFileInputStream(fileName), wxFileOutputStream(*wxFileInputStream::m_file) + : wxFileInputStream(), + wxFileOutputStream() { + 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, + const wxString& mode) + : wxInputStream() +{ + m_file = new wxFFile(fileName, mode); + m_file_destroy = true; + + if (!m_file->IsOpened()) + m_lasterror = wxSTREAM_WRITE_ERROR; +} + +wxFFileInputStream::wxFFileInputStream() + : wxInputStream() +{ + m_file = NULL; + m_file_destroy = false; +} + +wxFFileInputStream::wxFFileInputStream(wxFFile& file) +{ + m_file = &file; + m_file_destroy = false; +} + +wxFFileInputStream::wxFFileInputStream(FILE *file) +{ + m_file = new wxFFile(file); + m_file_destroy = true; +} + +wxFFileInputStream::~wxFFileInputStream() +{ + if (m_file_destroy) + delete m_file; +} + +wxFileOffset wxFFileInputStream::GetLength() const +{ + return m_file->Length(); +} + +size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size) +{ + ssize_t ret = m_file->Read(buffer, size); + + // 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) + { + m_lasterror = wxSTREAM_READ_ERROR; + ret = 0; + } + + return ret; +} + +wxFileOffset wxFFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) +{ + return m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset; +} + +wxFileOffset wxFFileInputStream::OnSysTell() const +{ + return m_file->Tell(); +} + +bool wxFFileInputStream::IsOk() const +{ + return wxStreamBase::IsOk() && m_file->IsOpened(); +} + +// ---------------------------------------------------------------------------- +// wxFFileOutputStream +// ---------------------------------------------------------------------------- + +wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName, + const wxString& mode) +{ + m_file = new wxFFile(fileName, mode); + m_file_destroy = true; + + if (!m_file->IsOpened()) + { + m_lasterror = wxSTREAM_WRITE_ERROR; + } + else + { + if (m_file->Error()) + m_lasterror = wxSTREAM_WRITE_ERROR; + } +} + +wxFFileOutputStream::wxFFileOutputStream(wxFFile& file) +{ + m_file = &file; + m_file_destroy = false; +} + +wxFFileOutputStream::wxFFileOutputStream() + : wxOutputStream() +{ + m_file = NULL; + m_file_destroy = false; +} + +wxFFileOutputStream::wxFFileOutputStream(FILE *file) +{ + m_file = new wxFFile(file); + m_file_destroy = true; +} + +wxFFileOutputStream::~wxFFileOutputStream() +{ + if (m_file_destroy) + { + Sync(); + delete m_file; + } +} + +size_t wxFFileOutputStream::OnSysWrite(const void *buffer, size_t size) +{ + size_t ret = m_file->Write(buffer, size); + // 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; +} + +wxFileOffset wxFFileOutputStream::OnSysTell() const +{ + return m_file->Tell(); +} + +wxFileOffset wxFFileOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode) +{ + return m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset; +} + +void wxFFileOutputStream::Sync() +{ + wxOutputStream::Sync(); + m_file->Flush(); +} + +wxFileOffset wxFFileOutputStream::GetLength() const +{ + return m_file->Length(); +} + +bool wxFFileOutputStream::IsOk() const +{ + return wxStreamBase::IsOk() && m_file->IsOpened(); +} + +// ---------------------------------------------------------------------------- +// wxFFileStream +// ---------------------------------------------------------------------------- + +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 +{ + return wxFFileOutputStream::IsOk() && wxFFileInputStream::IsOk(); +} + +#endif //wxUSE_FFILE + +#endif // wxUSE_STREAMS