#if wxUSE_FILE
// standard
-#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+#if defined(__WINDOWS__) && !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
#define WIN32_LEAN_AND_MEAN
#define NOSERVICE
#define NOCRYPT
#define NOMCX
-#elif defined(__WXMSW__) && defined(__WXWINCE__)
+#elif defined(__WINDOWS__) && defined(__WXWINCE__)
#include "wx/msw/missing.h"
#elif (defined(__OS2__))
#include <io.h>
char* mktemp( char * path ) { return path ;}
#include <stat.h>
#include <unistd.h>
-#elif defined(__WXPALMOS__)
- #include "wx/palmos/missing.h"
#else
#error "Please specify the header with file functions declarations."
#endif //Win/UNIX
#include <stdio.h> // SEEK_xxx constants
+#ifndef __WXWINCE__
+ #include <errno.h>
+#endif
+
// Windows compilers don't have these constants
#ifndef W_OK
enum
#define O_BINARY (0)
#endif //__UNIX__
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
#include "wx/msw/mslu.h"
#endif
wxFile::wxFile(const wxString& fileName, OpenMode mode)
{
m_fd = fd_invalid;
- m_error = false;
+ m_lasterror = 0;
Open(fileName, mode);
}
+bool wxFile::CheckForError(wxFileOffset rc) const
+{
+ if ( rc != -1 )
+ return false;
+
+ const_cast<wxFile *>(this)->m_lasterror =
+#ifndef __WXWINCE__
+ errno
+#else
+ ::GetLastError()
+#endif
+ ;
+
+ return true;
+}
+
// create the file, fail if it already exists and bOverwrite
bool wxFile::Create(const wxString& fileName, bool bOverwrite, int accessMode)
{
// if bOverwrite we create a new file or truncate the existing one,
// otherwise we only create the new file and fail if it already exists
- int fd = wxOpen( fileName,
+ int fildes = wxOpen( fileName,
O_BINARY | O_WRONLY | O_CREAT |
(bOverwrite ? O_TRUNC : O_EXCL),
accessMode );
- if ( fd == -1 )
+ if ( CheckForError(fildes) )
{
wxLogSysError(_("can't create file '%s'"), fileName);
return false;
}
- Attach(fd);
+ Attach(fildes);
return true;
}
accessMode &= wxS_IRUSR | wxS_IWUSR;
#endif // __WINDOWS__
- int fd = wxOpen( fileName, flags, accessMode);
+ int fildes = wxOpen( fileName, flags, accessMode);
- if ( fd == -1 )
+ if ( CheckForError(fildes) )
{
wxLogSysError(_("can't open file '%s'"), fileName);
return false;
}
- Attach(fd);
+ Attach(fildes);
return true;
}
bool wxFile::Close()
{
if ( IsOpened() ) {
- if (wxClose(m_fd) == -1)
+ if ( CheckForError(wxClose(m_fd)) )
{
wxLogSysError(_("can't close file descriptor %d"), m_fd);
m_fd = fd_invalid;
// read/write
// ----------------------------------------------------------------------------
+bool wxFile::ReadAll(wxString *str, const wxMBConv& conv)
+{
+ wxCHECK_MSG( str, false, wxS("Output string must be non-NULL") );
+
+ ssize_t length = Length();
+ wxCHECK_MSG( (wxFileOffset)length == Length(), false, wxT("huge file not supported") );
+
+ wxCharBuffer buf(length);
+ char* p = buf.data();
+ for ( ;; )
+ {
+ static const ssize_t READSIZE = 4096;
+
+ ssize_t nread = Read(p, length > READSIZE ? READSIZE : length);
+ if ( nread == wxInvalidOffset )
+ return false;
+
+ p += nread;
+ if ( length <= nread )
+ break;
+
+ length -= nread;
+ }
+
+ *p = 0;
+
+ wxString strTmp(buf, conv);
+ str->swap(strTmp);
+
+ return true;
+}
+
// read
ssize_t wxFile::Read(void *pBuf, size_t nCount)
{
ssize_t iRc = wxRead(m_fd, pBuf, nCount);
- if ( iRc == -1 )
+ if ( CheckForError(iRc) )
{
wxLogSysError(_("can't read from file descriptor %d"), m_fd);
return wxInvalidOffset;
ssize_t iRc = wxWrite(m_fd, pBuf, nCount);
- if ( iRc == -1 )
+ if ( CheckForError(iRc) )
{
wxLogSysError(_("can't write to file descriptor %d"), m_fd);
- m_error = true;
iRc = 0;
}
if ( !buf )
return false;
- const size_t size = strlen(buf); // FIXME: use buf.length() when available
+#if wxUSE_UNICODE
+ const size_t size = buf.length();
+#else
+ const size_t size = s.length();
+#endif
+
return Write(buf, size) == size;
}
// call it then
if ( IsOpened() && GetKind() == wxFILE_KIND_DISK )
{
- if ( wxFsync(m_fd) == -1 )
+ if ( CheckForError(wxFsync(m_fd)) )
{
wxLogSysError(_("can't flush file descriptor %d"), m_fd);
return false;
// seek
wxFileOffset wxFile::Seek(wxFileOffset ofs, wxSeekMode mode)
{
- wxASSERT_MSG( IsOpened(), _T("can't seek on closed file") );
+ wxASSERT_MSG( IsOpened(), wxT("can't seek on closed file") );
wxCHECK_MSG( ofs != wxInvalidOffset || mode != wxFromStart,
wxInvalidOffset,
- _T("invalid absolute file offset") );
+ wxT("invalid absolute file offset") );
int origin;
switch ( mode ) {
default:
- wxFAIL_MSG(_T("unknown seek origin"));
+ wxFAIL_MSG(wxT("unknown seek origin"));
case wxFromStart:
origin = SEEK_SET;
}
wxFileOffset iRc = wxSeek(m_fd, ofs, origin);
- if ( iRc == wxInvalidOffset )
+ if ( CheckForError(iRc) )
{
wxLogSysError(_("can't seek on file descriptor %d"), m_fd);
}
wxASSERT( IsOpened() );
wxFileOffset iRc = wxTell(m_fd);
- if ( iRc == wxInvalidOffset )
+ if ( CheckForError(iRc) )
{
wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd);
}
wxFileOffset iRc = Tell();
if ( iRc != wxInvalidOffset ) {
- // have to use const_cast :-(
- wxFileOffset iLen = ((wxFile *)this)->SeekEnd();
+ wxFileOffset iLen = const_cast<wxFile *>(this)->SeekEnd();
if ( iLen != wxInvalidOffset ) {
// restore old position
if ( ((wxFile *)this)->Seek(iRc) == wxInvalidOffset ) {
if ( iRc == wxInvalidOffset )
{
+ // last error was already set by Tell()
wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd);
}
wxFileOffset iRc;
-#if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ )
+#if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__)
// @@ this doesn't work, of course, on unseekable file descriptors
wxFileOffset ofsCur = Tell(),
ofsMax = Length();
iRc = wxEof(m_fd);
#endif // Windows/Unix
- if ( iRc == 1)
- {}
- else if ( iRc == 0 )
+ if ( iRc == 0 )
return false;
- else if ( iRc == wxInvalidOffset )
+
+ if ( iRc == wxInvalidOffset )
+ {
wxLogSysError(_("can't determine if the end of file is reached on descriptor %d"), m_fd);
- else
- wxFAIL_MSG(_T("invalid eof() return value."));
+ }
return true;
}
{
m_file.Close();
if ( wxRemove(m_strTemp) != 0 )
+ {
wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
+ }
}
#endif // wxUSE_FILE
projects / wxWidgets.git / blobdiff