// 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
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
+wxFileOffset wxFileInputStream::GetLength() const
{
- return m_file->Length();
+ return m_file->Length();
}
size_t wxFileInputStream::OnSysRead(void *buffer, size_t size)
{
- off_t ret;
+ ssize_t ret = m_file->Read(buffer, size);
- 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 (m_file->Eof())
- m_lasterror = wxStream_EOF;
- if (ret == wxInvalidOffset) {
- m_lasterror = wxStream_READ_ERR;
- ret = 0;
- }
+ 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;
+ 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();
}
// ----------------------------------------------------------------------------
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
+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();
}
-size_t wxFileOutputStream::GetSize() const
+wxFileOffset wxFileOutputStream::GetLength() 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(const wxString& fileName)
: wxInputStream()
{
- m_file = new wxFFile(fileName, "r");
- m_file_destroy = TRUE;
+ m_file = new wxFFile(fileName, _T("rb"));
+ m_file_destroy = true;
}
wxFFileInputStream::wxFFileInputStream()
: wxInputStream()
{
- m_file_destroy = FALSE;
- m_file = NULL;
+ m_file_destroy = false;
+ m_file = NULL;
}
wxFFileInputStream::wxFFileInputStream(wxFFile& file)
{
- m_file = &file;
- m_file_destroy = FALSE;
+ m_file = &file;
+ m_file_destroy = false;
}
wxFFileInputStream::wxFFileInputStream(FILE *file)
{
- m_file = new wxFFile(file);
- m_file_destroy = TRUE;
+ m_file = new wxFFile(file);
+ m_file_destroy = true;
}
wxFFileInputStream::~wxFFileInputStream()
{
- if (m_file_destroy)
- delete m_file;
+ if (m_file_destroy)
+ delete m_file;
}
-size_t wxFFileInputStream::GetSize() const
+wxFileOffset wxFFileInputStream::GetLength() const
{
- return m_file->Length();
+ return m_file->Length();
}
size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size)
{
- off_t ret;
-
- ret = m_file->Read(buffer, size);
+ ssize_t ret = m_file->Read(buffer, size);
- if (m_file->Eof())
- m_lasterror = wxStream_EOF;
- if (ret == wxInvalidOffset) {
- m_lasterror = wxStream_READ_ERR;
- ret = 0;
- }
+ // 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;
+ return ret;
}
-off_t wxFFileInputStream::OnSysSeek(off_t pos, wxSeekMode mode)
+wxFileOffset wxFFileInputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
{
- return m_file->Seek(pos, mode);
+#ifdef __VMS
+#pragma message disable intsignchange
+#endif
+ wxASSERT_MSG( pos >= LONG_MIN && pos <= LONG_MAX, _T("no huge wxFFile support") );
+ return ( m_file->Seek((long)pos, mode) ? (wxFileOffset)m_file->Tell() : wxInvalidOffset );
+#ifdef __VMS
+#pragma message enable intsignchange
+#endif
}
-off_t wxFFileInputStream::OnSysTell() const
+wxFileOffset wxFFileInputStream::OnSysTell() const
{
- return m_file->Tell();
+ return m_file->Tell();
}
// ----------------------------------------------------------------------------
wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName)
{
- m_file = new wxFFile(fileName, "w+");
- m_file_destroy = TRUE;
+ 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;
+ m_file = &file;
+ m_file_destroy = false;
}
wxFFileOutputStream::wxFFileOutputStream()
: wxOutputStream()
{
- m_file_destroy = FALSE;
- m_file = NULL;
+ m_file_destroy = false;
+ m_file = NULL;
}
wxFFileOutputStream::wxFFileOutputStream(FILE *file)
{
- m_file = new wxFFile(file);
- m_file_destroy = TRUE;
+ m_file = new wxFFile(file);
+ m_file_destroy = true;
}
wxFFileOutputStream::~wxFFileOutputStream()
{
- if (m_file_destroy) {
- Sync();
- delete m_file;
- }
+ 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_ERR;
- else
- m_lasterror = wxStream_NOERROR;
- return ret;
+ 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;
}
-off_t wxFFileOutputStream::OnSysTell() const
+wxFileOffset wxFFileOutputStream::OnSysTell() const
{
- return m_file->Tell();
+ 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);
+#ifdef __VMS
+#pragma message disable intsignchange
+#endif
+ wxASSERT_MSG( pos >= LONG_MIN && pos <= LONG_MAX, _T("no huge wxFFile support") );
+ return ( m_file->Seek((long)pos, mode) ? (wxFileOffset)m_file->Tell() : wxInvalidOffset );
+#ifdef __VMS
+#pragma message enable intsignchange
+#endif
}
void wxFFileOutputStream::Sync()
{
- wxOutputStream::Sync();
- m_file->Flush();
+ wxOutputStream::Sync();
+ m_file->Flush();
}
-size_t wxFFileOutputStream::GetSize() const
+wxFileOffset wxFFileOutputStream::GetLength() const
{
- return m_file->Length();
+ return m_file->Length();
}
// ----------------------------------------------------------------------------
// wxFFileStream
// ----------------------------------------------------------------------------
+
wxFFileStream::wxFFileStream(const wxString& fileName)
- : wxFFileInputStream(fileName), wxFFileOutputStream(*wxFFileInputStream::m_file)
+ : wxFFileInputStream(fileName)
{
+ wxFFileOutputStream::m_file = wxFFileInputStream::m_file;
}
+
#endif
// wxUSE_STREAMS && wxUSE_FILE
projects / wxWidgets.git / blobdiff