// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "file.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
};
#endif // W_OK
-// there is no distinction between text and binary files under Unix, so define
-// O_BINARY as 0 if the system headers don't do it already
-#if defined(__UNIX__) && !defined(O_BINARY)
- #define O_BINARY (0)
-#endif //__UNIX__
-
#ifdef __SALFORDC__
#include <unix.h>
#endif
-#ifndef MAX_PATH
- #define MAX_PATH 512
-#endif
-
// some broken compilers don't have 3rd argument in open() and creat()
#ifdef __SALFORDC__
#define ACCESS(access)
#include "wx/string.h"
#include "wx/intl.h"
#include "wx/log.h"
+ #include "wx/crt.h"
#endif // !WX_PRECOMP
#include "wx/filename.h"
#include "wx/file.h"
#include "wx/filefn.h"
+// there is no distinction between text and binary files under Unix, so define
+// O_BINARY as 0 if the system headers don't do it already
+#if defined(__UNIX__) && !defined(O_BINARY)
+ #define O_BINARY (0)
+#endif //__UNIX__
+
#ifdef __WXMSW__
#include "wx/msw/mslu.h"
#endif
#include "wx/msw/private.h"
#endif
+#ifndef MAX_PATH
+ #define MAX_PATH 512
+#endif
+
// ============================================================================
// implementation of wxFile
// ============================================================================
// static functions
// ----------------------------------------------------------------------------
-bool wxFile::Exists(const wxChar *name)
+bool wxFile::Exists(const wxString& name)
{
return wxFileExists(name);
}
-bool wxFile::Access(const wxChar *name, OpenMode mode)
+bool wxFile::Access(const wxString& name, OpenMode mode)
{
int how;
// ----------------------------------------------------------------------------
// ctors
-wxFile::wxFile(const wxChar *szFileName, OpenMode mode)
+wxFile::wxFile(const wxString& fileName, OpenMode mode)
{
m_fd = fd_invalid;
m_error = false;
- Open(szFileName, mode);
+ Open(fileName, mode);
}
// create the file, fail if it already exists and bOverwrite
-bool wxFile::Create(const wxChar *szFileName, bool bOverwrite, int accessMode)
+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
#if defined(__WXMAC__) && !defined(__UNIX__) && !wxUSE_UNICODE
// Dominic Mazzoni [dmazzoni+@cs.cmu.edu] reports that open is still broken on the mac, so we replace
- // int fd = open( szFileName , O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);
- int fd = creat( szFileName , accessMode);
+ // int fd = open( fileName , O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);
+ int fd = creat( fileName , accessMode);
#else
- int fd = wxOpen( szFileName,
+ int fd = wxOpen( fileName,
O_BINARY | O_WRONLY | O_CREAT |
(bOverwrite ? O_TRUNC : O_EXCL)
ACCESS(accessMode) );
#endif
if ( fd == -1 )
{
- wxLogSysError(_("can't create file '%s'"), szFileName);
+ wxLogSysError(_("can't create file '%s'"), fileName);
return false;
}
- else
- {
- Attach(fd);
- return true;
- }
+
+ Attach(fd);
+ return true;
}
// open the file
-bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode)
+bool wxFile::Open(const wxString& fileName, OpenMode mode, int accessMode)
{
int flags = O_BINARY;
break;
case write_append:
- if ( wxFile::Exists(szFileName) )
+ if ( wxFile::Exists(fileName) )
{
flags |= O_WRONLY | O_APPEND;
break;
accessMode &= wxS_IRUSR | wxS_IWUSR;
#endif // __WINDOWS__
- int fd = wxOpen( szFileName, flags ACCESS(accessMode));
+ int fd = wxOpen( fileName, flags ACCESS(accessMode));
if ( fd == -1 )
{
- wxLogSysError(_("can't open file '%s'"), szFileName);
+ wxLogSysError(_("can't open file '%s'"), fileName);
return false;
}
- else {
- Attach(fd);
- return true;
- }
+
+ Attach(fd);
+ return true;
}
// close
// ----------------------------------------------------------------------------
// read
-wxFileSize_t wxFile::Read(void *pBuf, wxFileSize_t nCount)
+ssize_t wxFile::Read(void *pBuf, size_t nCount)
{
wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
- wxFileOffset iRc = wxRead(m_fd, pBuf, nCount);
+ ssize_t iRc = wxRead(m_fd, pBuf, nCount);
- if ( iRc == -1 ) {
+ if ( iRc == -1 )
+ {
wxLogSysError(_("can't read from file descriptor %d"), m_fd);
return wxInvalidOffset;
}
- else
- return (wxFileSize_t)iRc;
+
+ return iRc;
}
// write
-wxFileSize_t wxFile::Write(const void *pBuf, wxFileSize_t nCount)
+size_t wxFile::Write(const void *pBuf, size_t nCount)
{
wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
- int iRc = wxWrite(m_fd, pBuf, nCount);
+ ssize_t iRc = wxWrite(m_fd, pBuf, nCount);
- if ( iRc == -1 ) {
+ if ( iRc == -1 )
+ {
wxLogSysError(_("can't write to file descriptor %d"), m_fd);
m_error = true;
- return 0;
+ iRc = 0;
}
- else
- return (wxFileSize_t)iRc;
+
+ return iRc;
+}
+
+bool wxFile::Write(const wxString& s, const wxMBConv& conv)
+{
+ const wxWX2MBbuf buf = s.mb_str(conv);
+ if ( !buf )
+ return false;
+
+ const size_t size = strlen(buf); // FIXME: use buf.length() when available
+ return Write(buf, size) == size;
}
// flush
bool wxFile::Flush()
{
- if ( IsOpened() ) {
-#if defined(__VISUALC__) || wxHAVE_FSYNC
+#ifdef HAVE_FSYNC
+ // fsync() only works on disk files and returns errors for pipes, don't
+ // call it then
+ if ( IsOpened() && GetKind() == wxFILE_KIND_DISK )
+ {
if ( wxFsync(m_fd) == -1 )
{
wxLogSysError(_("can't flush file descriptor %d"), m_fd);
return false;
}
-#else // no fsync
- // just do nothing
-#endif // fsync
}
+#endif // HAVE_FSYNC
return true;
}
// seek
wxFileOffset wxFile::Seek(wxFileOffset ofs, wxSeekMode mode)
{
- wxASSERT( IsOpened() );
+ wxASSERT_MSG( IsOpened(), _T("can't seek on closed file") );
+ wxCHECK_MSG( ofs != wxInvalidOffset || mode != wxFromStart,
+ wxInvalidOffset,
+ _T("invalid absolute file offset") );
int origin;
switch ( mode ) {
default:
- wxFAIL_MSG(_("unknown seek origin"));
+ wxFAIL_MSG(_T("unknown seek origin"));
case wxFromStart:
origin = SEEK_SET;
break;
}
- if (ofs == wxInvalidOffset)
- {
- wxLogSysError(_("can't seek on file descriptor %d, large files support is not enabled."), m_fd);
- return wxInvalidOffset;
- }
wxFileOffset iRc = wxSeek(m_fd, ofs, origin);
- if ( iRc == -1 ) {
+ if ( iRc == wxInvalidOffset )
+ {
wxLogSysError(_("can't seek on file descriptor %d"), m_fd);
- return wxInvalidOffset;
}
- else
- return iRc;
+
+ return iRc;
}
-// get current wxFileOffset
+// get current file offset
wxFileOffset wxFile::Tell() const
{
wxASSERT( IsOpened() );
wxFileOffset iRc = wxTell(m_fd);
- if ( iRc == -1 ) {
+ if ( iRc == wxInvalidOffset )
+ {
wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd);
- return wxInvalidOffset;
}
- else
- return iRc;
+
+ return iRc;
}
// get current file length
wxASSERT( IsOpened() );
wxFileOffset iRc = Tell();
- if ( iRc != -1 ) {
- // @ have to use const_cast :-(
+ if ( iRc != wxInvalidOffset ) {
+ // have to use const_cast :-(
wxFileOffset iLen = ((wxFile *)this)->SeekEnd();
- if ( iLen != -1 ) {
+ if ( iLen != wxInvalidOffset ) {
// restore old position
- if ( ((wxFile *)this)->Seek(iRc) == -1 ) {
+ if ( ((wxFile *)this)->Seek(iRc) == wxInvalidOffset ) {
// error
- iLen = -1;
+ iLen = wxInvalidOffset;
}
}
iRc = iLen;
}
- if ( iRc == -1 ) {
+ if ( iRc == wxInvalidOffset )
+ {
wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd);
- return wxInvalidOffset;
}
- else
- return iRc;
+
+ return iRc;
}
// is end of file reached?
{
wxASSERT( IsOpened() );
- int iRc;
+ wxFileOffset iRc;
#if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) || defined(__SALFORDC__)
// @@ this doesn't work, of course, on unseekable file descriptors
wxFileOffset ofsCur = Tell(),
ofsMax = Length();
if ( ofsCur == wxInvalidOffset || ofsMax == wxInvalidOffset )
- iRc = -1;
+ iRc = wxInvalidOffset;
else
iRc = ofsCur == ofsMax;
#else // Windows and "native" compiler
iRc = wxEof(m_fd);
#endif // Windows/Unix
- switch ( iRc ) {
- case 1:
- break;
-
- case 0:
- return false;
-
- case -1:
- wxLogSysError(_("can't determine if the end of file is reached on descriptor %d"), m_fd);
- break;
-
- default:
- wxFAIL_MSG(_("invalid eof() return value."));
- }
+ if ( iRc == 1)
+ {}
+ else if ( iRc == 0 )
+ return false;
+ else 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;
}
projects / wxWidgets.git / blobdiff