X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/769627d79e2dd6b27183a06c5537e0362ce3d460..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/common/file.cpp?ds=inline diff --git a/src/common/file.cpp b/src/common/file.cpp index b44087c38b..a6d96d6a8e 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 @@ -26,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" @@ -82,6 +80,8 @@ 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 @@ -99,39 +99,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 @@ -140,6 +125,9 @@ #include "wx/msw/private.h" #endif +#ifndef MAX_PATH + #define MAX_PATH 512 +#endif // ============================================================================ // implementation of wxFile @@ -149,12 +137,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; @@ -185,32 +173,26 @@ 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; - 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); -#else - int fd = wxOpen( szFileName, + int fd = wxOpen( fileName, O_BINARY | O_WRONLY | O_CREAT | - (bOverwrite ? O_TRUNC : O_EXCL) - ACCESS(accessMode) ); -#endif + (bOverwrite ? O_TRUNC : O_EXCL), + accessMode ); if ( fd == -1 ) { - wxLogSysError(_("can't create file '%s'"), szFileName); + wxLogSysError(_("can't create file '%s'"), fileName); return false; } @@ -219,7 +201,7 @@ bool wxFile::Create(const wxChar *szFileName, bool bOverwrite, int accessMode) } // 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; @@ -230,7 +212,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; @@ -258,11 +240,11 @@ 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 ) { - wxLogSysError(_("can't open file '%s'"), szFileName); + wxLogSysError(_("can't open file '%s'"), fileName); return false; } @@ -324,10 +306,20 @@ size_t wxFile::Write(const void *pBuf, size_t nCount) 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 defined(__VISUALC__) || defined(HAVE_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 ) @@ -338,7 +330,7 @@ bool wxFile::Flush() return false; } } -#endif // fsync +#endif // HAVE_FSYNC return true; } @@ -358,7 +350,7 @@ wxFileOffset wxFile::Seek(wxFileOffset ofs, wxSeekMode mode) int origin; switch ( mode ) { default: - wxFAIL_MSG(_("unknown seek origin")); + wxFAIL_MSG(_T("unknown seek origin")); case wxFromStart: origin = SEEK_SET; @@ -431,7 +423,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(); @@ -450,7 +442,7 @@ bool wxFile::Eof() const else 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.")); + wxFAIL_MSG(_T("invalid eof() return value.")); return true; }