X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/686a3ee080e7b5f17a3d1dbd688602f7f4bcf22a..263e3a8327f544990c7ba7edb8cd34994c908049:/src/common/file.cpp diff --git a/src/common/file.cpp b/src/common/file.cpp index 9985b9d448..f3f5025973 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: file.cpp +// Name: src/common/file.cpp // Purpose: wxFile - encapsulates low-level "file descriptor" // wxTempFile // Author: Vadim Zeitlin @@ -14,10 +14,6 @@ // 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" @@ -30,28 +26,26 @@ // standard #if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) -#ifndef __SALFORDC__ - #define WIN32_LEAN_AND_MEAN - #define NOSERVICE - #define NOIME - #define NOATOM - #define NOGDI - #define NOGDICAPMASKS - #define NOMETAFILE - #define NOMINMAX - #define NOMSG - #define NOOPENFILE - #define NORASTEROPS - #define NOSCROLL - #define NOSOUND - #define NOSYSMETRICS - #define NOTEXTMETRIC - #define NOWH - #define NOCOMM - #define NOKANJI - #define NOCRYPT - #define NOMCX -#endif +#define WIN32_LEAN_AND_MEAN +#define NOSERVICE +#define NOIME +#define NOATOM +#define NOGDI +#define NOGDICAPMASKS +#define NOMETAFILE +#define NOMINMAX +#define NOMSG +#define NOOPENFILE +#define NORASTEROPS +#define NOSCROLL +#define NOSOUND +#define NOSYSMETRICS +#define NOTEXTMETRIC +#define NOWH +#define NOCOMM +#define NOKANJI +#define NOCRYPT +#define NOMCX #elif defined(__WXMSW__) && defined(__WXWINCE__) #include "wx/msw/missing.h" @@ -86,12 +80,18 @@ char* mktemp( char * path ) { return path ;} #include #include +#elif defined(__WXPALMOS__) + #include "wx/palmos/missing.h" #else #error "Please specify the header with file functions declarations." #endif //Win/UNIX #include // SEEK_xxx constants +#ifndef __WXWINCE__ + #include +#endif + // Windows compilers don't have these constants #ifndef W_OK enum @@ -103,39 +103,24 @@ }; #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 -#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) - #define stat _stat -#else // normal compiler - #define ACCESS(access) , (access) -#endif // Salford C - // wxWidgets #ifndef WX_PRECOMP #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 @@ -144,6 +129,9 @@ #include "wx/msw/private.h" #endif +#ifndef MAX_PATH + #define MAX_PATH 512 +#endif // ============================================================================ // implementation of wxFile @@ -153,12 +141,12 @@ // 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; @@ -189,43 +177,51 @@ bool wxFile::Access(const wxChar *name, OpenMode mode) // ---------------------------------------------------------------------------- // ctors -wxFile::wxFile(const wxChar *szFileName, OpenMode mode) +wxFile::wxFile(const wxString& fileName, OpenMode mode) { m_fd = fd_invalid; - m_error = false; + m_lasterror = 0; - Open(szFileName, mode); + Open(fileName, mode); +} + +bool wxFile::CheckForError(wxFileOffset rc) const +{ + if ( rc != -1 ) + return false; + + const_cast(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 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); -#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 ) + (bOverwrite ? O_TRUNC : O_EXCL), + accessMode ); + if ( CheckForError(fd) ) { - 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; @@ -236,7 +232,7 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode) break; case write_append: - if ( wxFile::Exists(szFileName) ) + if ( wxFile::Exists(fileName) ) { flags |= O_WRONLY | O_APPEND; break; @@ -264,24 +260,23 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode) accessMode &= wxS_IRUSR | wxS_IWUSR; #endif // __WINDOWS__ - int fd = wxOpen( szFileName, flags ACCESS(accessMode)); + int fd = wxOpen( fileName, flags, accessMode); - if ( fd == -1 ) + if ( CheckForError(fd) ) { - 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 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; @@ -305,7 +300,7 @@ 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; @@ -321,30 +316,45 @@ size_t wxFile::Write(const void *pBuf, size_t nCount) 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; } return iRc; } +bool wxFile::Write(const wxString& s, const wxMBConv& conv) +{ + const wxWX2MBbuf buf = s.mb_str(conv); + if ( !buf ) + return false; + +#if wxUSE_UNICODE + const size_t size = buf.length(); +#else + const size_t size = s.length(); +#endif + + return Write(buf, size) == size; +} + // flush bool wxFile::Flush() { - if ( IsOpened() ) { -#if defined(__VISUALC__) || wxHAVE_FSYNC - if ( wxFsync(m_fd) == -1 ) +#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 ( CheckForError(wxFsync(m_fd)) ) { wxLogSysError(_("can't flush file descriptor %d"), m_fd); return false; } -#else // no fsync - // just do nothing -#endif // fsync } +#endif // HAVE_FSYNC return true; } @@ -356,15 +366,15 @@ bool wxFile::Flush() // 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(_("unknown seek origin")); + wxFAIL_MSG(wxT("unknown seek origin")); case wxFromStart: origin = SEEK_SET; @@ -380,7 +390,7 @@ wxFileOffset wxFile::Seek(wxFileOffset ofs, wxSeekMode mode) } wxFileOffset iRc = wxSeek(m_fd, ofs, origin); - if ( iRc == wxInvalidOffset ) + if ( CheckForError(iRc) ) { wxLogSysError(_("can't seek on file descriptor %d"), m_fd); } @@ -394,7 +404,7 @@ wxFileOffset wxFile::Tell() const 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); } @@ -407,10 +417,24 @@ wxFileOffset wxFile::Length() const { wxASSERT( IsOpened() ); + // we use a special method for Linux systems where files in sysfs (i.e. + // those under /sys typically) return length of 4096 bytes even when + // they're much smaller -- this is a problem as it results in errors later + // when we try reading 4KB from them +#ifdef __LINUX__ + struct stat st; + if ( fstat(m_fd, &st) == 0 ) + { + // returning 0 for the special files indicates to the caller that they + // are not seekable + return st.st_blocks ? st.st_size : 0; + } + //else: failed to stat, try the normal method +#endif // __LINUX__ + wxFileOffset iRc = Tell(); if ( iRc != wxInvalidOffset ) { - // have to use const_cast :-( - wxFileOffset iLen = ((wxFile *)this)->SeekEnd(); + wxFileOffset iLen = const_cast(this)->SeekEnd(); if ( iLen != wxInvalidOffset ) { // restore old position if ( ((wxFile *)this)->Seek(iRc) == wxInvalidOffset ) { @@ -424,6 +448,7 @@ wxFileOffset wxFile::Length() const if ( iRc == wxInvalidOffset ) { + // last error was already set by Tell() wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd); } @@ -437,7 +462,7 @@ bool wxFile::Eof() const wxFileOffset iRc; -#if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) || defined(__SALFORDC__) +#if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) // @@ this doesn't work, of course, on unseekable file descriptors wxFileOffset ofsCur = Tell(), ofsMax = Length(); @@ -449,14 +474,17 @@ bool wxFile::Eof() const 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(_("invalid eof() return value.")); + } + else if ( iRc != 1 ) + { + wxFAIL_MSG(wxT("invalid eof() return value.")); + } return true; } @@ -559,7 +587,9 @@ void wxTempFile::Discard() { m_file.Close(); if ( wxRemove(m_strTemp) != 0 ) + { wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str()); + } } #endif // wxUSE_FILE