X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eb4642a989aca1aa6c1291a73d43d1247961a234..7fa4dc1cfcc55b0fe425a3ebe5e992ff8255481b:/src/common/wfstream.cpp?ds=sidebyside diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp index f9694ca306..296f205b2e 100644 --- a/src/common/wfstream.cpp +++ b/src/common/wfstream.cpp @@ -5,11 +5,11 @@ // 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__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "wfstream.h" #endif @@ -33,64 +33,74 @@ wxFileInputStream::wxFileInputStream(const wxString& fileName) : wxInputStream() { - m_file = new wxFile(fileName, wxFile::read); - m_file_destroy = TRUE; + m_file = new wxFile(fileName, wxFile::read); + m_file_destroy = TRUE; } wxFileInputStream::wxFileInputStream() : wxInputStream() { - m_file_destroy = FALSE; - m_file = NULL; + m_file_destroy = FALSE; + m_file = NULL; } wxFileInputStream::wxFileInputStream(wxFile& file) { - m_file = &file; - m_file_destroy = FALSE; + m_file = &file; + m_file_destroy = FALSE; } wxFileInputStream::wxFileInputStream(int fd) { - m_file = new wxFile(fd); - m_file_destroy = TRUE; + m_file = new wxFile(fd); + m_file_destroy = TRUE; } wxFileInputStream::~wxFileInputStream() { - if (m_file_destroy) - delete m_file; + if (m_file_destroy) + delete m_file; } size_t wxFileInputStream::GetSize() const { - return m_file->Length(); + return m_file->Length(); } size_t wxFileInputStream::OnSysRead(void *buffer, size_t size) { - off_t ret; - - ret = m_file->Read(buffer, size); - - if (m_file->Eof()) - m_lasterror = wxStream_EOF; - if (ret == wxInvalidOffset) { - m_lasterror = wxStream_READ_ERR; - ret = 0; - } - - return ret; + off_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) + + 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) { - return m_file->Seek(pos, mode); + return m_file->Seek(pos, mode); } off_t wxFileInputStream::OnSysTell() const { - return m_file->Tell(); + return m_file->Tell(); } // ---------------------------------------------------------------------------- @@ -99,74 +109,255 @@ off_t wxFileInputStream::OnSysTell() const wxFileOutputStream::wxFileOutputStream(const wxString& fileName) { - m_file = new wxFile(fileName, wxFile::write); - m_file_destroy = TRUE; + m_file = new wxFile(fileName, wxFile::write); + 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 = &file; + m_file_destroy = FALSE; } wxFileOutputStream::wxFileOutputStream() - : wxOutputStream() + : wxOutputStream() { - 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; + 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); - if (m_file->Error()) - m_lasterror = wxStream_WRITE_ERR; - else - m_lasterror = wxStream_NOERROR; - 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 { - return m_file->Tell(); + return m_file->Tell(); } off_t wxFileOutputStream::OnSysSeek(off_t 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(); } size_t wxFileOutputStream::GetSize() const { - return m_file->Length(); + return m_file->Length(); } // ---------------------------------------------------------------------------- // wxFileStream // ---------------------------------------------------------------------------- + wxFileStream::wxFileStream(const wxString& fileName) - : wxFileInputStream(fileName), wxFileOutputStream(*wxFileInputStream::m_file) + : wxFileInputStream(fileName) +{ + wxFileOutputStream::m_file = wxFileInputStream::m_file; +} + +// ---------------------------------------------------------------------------- +// wxFFileInputStream +// ---------------------------------------------------------------------------- + +wxFFileInputStream::wxFFileInputStream(const wxString& fileName) + : wxInputStream() +{ + m_file = new wxFFile(fileName, _T("rb")); + m_file_destroy = TRUE; +} + +wxFFileInputStream::wxFFileInputStream() + : wxInputStream() +{ + m_file_destroy = FALSE; + m_file = NULL; +} + +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; +} + +size_t wxFFileInputStream::GetSize() const +{ + return m_file->Length(); +} + +size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size) +{ + off_t ret; + + ret = m_file->Read(buffer, size); + + if (m_file->Eof()) + m_lasterror = wxSTREAM_EOF; + if (ret == wxInvalidOffset) + { + m_lasterror = wxSTREAM_READ_ERROR; + ret = 0; + } + + return ret; +} + +off_t wxFFileInputStream::OnSysSeek(off_t pos, wxSeekMode mode) +{ +#ifdef __VMS +#pragma message disable intsignchange +#endif + return ( m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset ); +#ifdef __VMS +#pragma message enable intsignchange +#endif +} + +off_t wxFFileInputStream::OnSysTell() const +{ + return m_file->Tell(); +} + +// ---------------------------------------------------------------------------- +// wxFFileOutputStream +// ---------------------------------------------------------------------------- + +wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName) +{ + m_file = new wxFFile(fileName, _T("w+b")); + 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_destroy = FALSE; + m_file = NULL; +} + +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); + if (m_file->Error()) + m_lasterror = wxSTREAM_WRITE_ERROR; + else + m_lasterror = wxSTREAM_NO_ERROR; + return ret; +} + +off_t wxFFileOutputStream::OnSysTell() const +{ + return m_file->Tell(); +} + +off_t wxFFileOutputStream::OnSysSeek(off_t pos, wxSeekMode mode) +{ +#ifdef __VMS +#pragma message disable intsignchange +#endif + return ( m_file->Seek(pos, mode) ? m_file->Tell() : wxInvalidOffset ); +#ifdef __VMS +#pragma message enable intsignchange +#endif +} + +void wxFFileOutputStream::Sync() +{ + wxOutputStream::Sync(); + m_file->Flush(); +} + +size_t wxFFileOutputStream::GetSize() const +{ + return m_file->Length(); +} + +// ---------------------------------------------------------------------------- +// wxFFileStream +// ---------------------------------------------------------------------------- + +wxFFileStream::wxFFileStream(const wxString& fileName) + : wxFFileInputStream(fileName) { + wxFFileOutputStream::m_file = wxFFileInputStream::m_file; } #endif