X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1239ac2e28ff365856aa19e7e775962d6ba4fc93..6fb99eb3b7063388672255335abf7a34405f51bf:/include/wx/filefn.h diff --git a/include/wx/filefn.h b/include/wx/filefn.h index def21bb847..8835bdb28c 100644 --- a/include/wx/filefn.h +++ b/include/wx/filefn.h @@ -107,7 +107,7 @@ #endif #endif -#if defined(__VISUALC__) || ( defined(__MWERKS__) && defined( __INTEL__) ) +#if (defined(__VISUALC__) && !defined(__WXWINCE__)) || ( defined(__MWERKS__) && defined( __INTEL__) ) typedef _off_t off_t; #elif defined(__SYMANTEC__) typedef long off_t; @@ -129,7 +129,7 @@ enum wxSeekMode // Wrappers around Win32 api functions like CreateFile, ReadFile and such // Implemented in filefnwce.cpp -#if defined( __WINCE__) +#if defined( __WXWINCE__) typedef __int64 wxFileOffset; #define wxFileOffsetFmtSpec _("I64") int wxOpen(const wxChar *filename, int oflag, int WXUNUSED(pmode)); @@ -175,15 +175,17 @@ enum wxSeekMode // Digital Mars doesn't) #include "wx/msw/private.h" - #undef __HUGEFILES_SUPPORTED + #undef wxHAS_HUGE_FILES #if defined(__MINGW32__) - #define __HUGEFILES_SUPPORTED 1 + #define wxHAS_HUGE_FILES 1 + #elif defined(__MWERKS__) + #define wxHAS_HUGE_FILES 0 #elif defined(__DMC__) - #define __HUGEFILES_SUPPORTED 0 + #define wxHAS_HUGE_FILES 0 #elif ((_INTEGRAL_MAX_BITS >= 64) || defined(_LARGE_FILES)) - #define __HUGEFILES_SUPPORTED 1 + #define wxHAS_HUGE_FILES 1 #else - #define __HUGEFILES_SUPPORTED 0 + #define wxHAS_HUGE_FILES 0 #endif // functions @@ -191,7 +193,7 @@ enum wxSeekMode #define _tell tell #endif - #if __HUGEFILES_SUPPORTED + #if wxHAS_HUGE_FILES typedef wxLongLong_t wxFileOffset; #define wxFileOffsetFmtSpec wxLongLongFmtSpec #else @@ -203,11 +205,13 @@ enum wxSeekMode #if defined(__MWERKS__) #if __MSL__ >= 0x6000 - #define wxRead _read(fd, (void *)buf, nCount) - #define wxWrite _write(fd, (void *)buf, nCount) + #define wxRead(fd, buf, nCount) _read(fd, (void *)buf, nCount) + #define wxWrite(fd, buf, nCount) _write(fd, (void *)buf, nCount) #else - #define wxRead _read(fd, (const char *)buf, nCount) - #define wxWrite _write(fd, (const char *)buf, nCount) + #define wxRead(fd, buf, nCount)\ + _read(fd, (const char *)buf, nCount) + #define wxWrite(fd, buf, nCount)\ + _write(fd, (const char *)buf, nCount) #endif #else #if defined(__DMC__) || defined(__WATCOMC__) @@ -218,7 +222,7 @@ enum wxSeekMode #define wxWrite _write #endif #endif - #if __HUGEFILES_SUPPORTED + #if wxHAS_HUGE_FILES #define wxSeek _lseeki64 #define wxLseek _lseeki64 #define wxTell _telli64 @@ -241,7 +245,7 @@ enum wxSeekMode #define wxAccess wxMSLU__waccess #define wxMkDir wxMSLU__wmkdir #define wxRmDir wxMSLU__wrmdir - #if __HUGEFILES_SUPPORTED + #if wxHAS_HUGE_FILES #define wxStat wxMSLU__wstati64 #else #define wxStat wxMSLU__wstat @@ -251,7 +255,7 @@ enum wxSeekMode #define wxAccess _waccess #define wxMkDir _wmkdir #define wxRmDir _wrmdir - #if __HUGEFILES_SUPPORTED + #if wxHAS_HUGE_FILES #define wxStat _wstati64 #else #define wxStat _wstat @@ -270,7 +274,7 @@ enum wxSeekMode #else #define wxRmDir _rmdir #endif - #if __HUGEFILES_SUPPORTED + #if wxHAS_HUGE_FILES #define wxStat _stati64 #else #define wxStat _stat @@ -279,7 +283,7 @@ enum wxSeekMode // types: notice that Watcom is the only compiler to have a wide char // version of struct stat as well as a wide char stat function variant - #if __HUGEFILES_SUPPORTED + #if wxHAS_HUGE_FILES #if wxUSE_UNICODE && defined(__WATCOMC__) #define wxStructStat struct _wstati64 #else @@ -294,23 +298,25 @@ enum wxSeekMode #endif // constants (unless already defined by the user code) - #if !defined(O_RDONLY) && !defined(__BORLANDC__) && !defined(__WATCOMC__) - #define O_RDONLY _O_RDONLY - #define O_WRONLY _O_WRONLY - #define O_RDWR _O_RDWR - #define O_EXCL _O_EXCL - #define O_CREAT _O_CREAT - #define O_BINARY _O_BINARY - #endif - #if !defined(__BORLANDC__) && !defined(__WATCOMC__) - #define S_IFMT _S_IFMT - #define S_IFDIR _S_IFDIR - #define S_IFREG _S_IFREG - #endif // O_RDONLY + #ifndef O_RDONLY + #define O_RDONLY _O_RDONLY + #define O_WRONLY _O_WRONLY + #define O_RDWR _O_RDWR + #define O_EXCL _O_EXCL + #define O_CREAT _O_CREAT + #define O_BINARY _O_BINARY + #endif + + #ifndef S_IFMT + #define S_IFMT _S_IFMT + #define S_IFDIR _S_IFDIR + #define S_IFREG _S_IFREG + #endif + #endif // It's a private define, undefine it so nobody gets tempted to use it - #undef __HUGEFILES_SUPPORTED + #undef wxHAS_HUGE_FILES #else // Unix platforms using configure typedef off_t wxFileOffset; #ifdef _LARGE_FILES @@ -545,6 +551,41 @@ WXDLLIMPEXP_BASE int wxParseCommonDialogsFilter(const wxString& wildCard, wxArra // classes // ---------------------------------------------------------------------------- +#ifdef __UNIX__ + +// set umask to the given value in ctor and reset it to the old one in dtor +class WXDLLIMPEXP_BASE wxUmaskChanger +{ +public: + // change the umask to the given one if it is not -1: this allows to write + // the same code whether you really want to change umask or not, as is in + // wxFileConfig::Flush() for example + wxUmaskChanger(int umaskNew) + { + m_umaskOld = umaskNew == -1 ? -1 : (int)umask((mode_t)umaskNew); + } + + ~wxUmaskChanger() + { + if ( m_umaskOld != -1 ) + umask((mode_t)m_umaskOld); + } + +private: + int m_umaskOld; +}; + +// this macro expands to an "anonymous" wxUmaskChanger object under Unix and +// nothing elsewhere +#define wxCHANGE_UMASK(m) wxUmaskChanger wxMAKE_UNIQUE_NAME(umaskChanger_)(m) + +#else // !__UNIX__ + +#define wxCHANGE_UMASK(m) + +#endif // __UNIX__/!__UNIX__ + + // Path searching class WXDLLIMPEXP_BASE wxPathList : public wxStringList {