X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30a5be975dbda4e27c94de1b67bc0342970f4afc..bd0df01f3f59940fdbca7a3472c256be2d034ab9:/src/common/file.cpp diff --git a/src/common/file.cpp b/src/common/file.cpp index d4a0e13551..1e3734b5d6 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -7,7 +7,7 @@ // Created: 29/01/98 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// // ---------------------------------------------------------------------------- @@ -27,7 +27,7 @@ #endif // standard -#if defined(__WXMSW__) && !defined(__GNUWIN32__) +#if defined(__WXMSW__) && !defined(__GNUWIN32__) #include #define WIN32_LEAN_AND_MEAN @@ -54,7 +54,7 @@ #elif (defined(__UNIX__) || defined(__GNUWIN32__)) #include #else - #error "Please specify the header with file functions declarations." + #error "Please specify the header with file functions declarations." #endif //Win/UNIX #include // SEEK_xxx constants @@ -87,17 +87,14 @@ #define S_IFDIR _S_IFDIR #define S_IFREG _S_IFREG - - #define S_IREAD _S_IREAD - #define S_IWRITE _S_IWRITE #else #define tell(fd) lseek(fd, 0, SEEK_CUR) #endif //_MSC_VER // there is no distinction between text and binary files under Unix -#ifdef __UNIX__ - #define O_BINARY (0) -#endif //__UNIX__ +#ifdef __UNIX__ + #define O_BINARY (0) +#endif //__UNIX__ // wxWindows #include @@ -105,6 +102,9 @@ #include #include +#ifndef MAX_PATH +#define MAX_PATH 512 +#endif // ============================================================================ // implementation of wxFile @@ -114,8 +114,8 @@ // static functions // ---------------------------------------------------------------------------- bool wxFile::Exists(const char *sz) -{ - struct stat st; +{ + struct stat st; return !access(sz, 0) && !stat(sz, &st) && (st.st_mode & S_IFREG); } @@ -139,11 +139,11 @@ wxFile::~wxFile() } // create the file, fail if it already exists and bOverwrite -bool wxFile::Create(const char *szFileName, bool bOverwrite) +bool wxFile::Create(const char *szFileName, bool bOverwrite, int access) { // 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 = open(szFileName, O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL)); + int fd = open(szFileName, O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access); if ( fd == -1 ) { wxLogSysError("can't create file '%s'", szFileName); @@ -156,29 +156,29 @@ bool wxFile::Create(const char *szFileName, bool bOverwrite) } // open the file -bool wxFile::Open(const char *szFileName, OpenMode mode) +bool wxFile::Open(const char *szFileName, OpenMode mode, int access) { int flags = O_BINARY; switch ( mode ) { - case read: - flags |= O_RDONLY; + case read: + flags |= O_RDONLY; break; - case write: - flags |= O_WRONLY | O_CREAT | O_TRUNC; + case write: + flags |= O_WRONLY | O_CREAT | O_TRUNC; break; case write_append: flags |= O_WRONLY | O_APPEND; break; - case read_write: + case read_write: flags |= O_RDWR; break; } - int fd = open(szFileName, flags, S_IREAD | S_IWRITE); + int fd = open(szFileName, flags, access); if ( fd == -1 ) { wxLogSysError("can't open file '%s'", szFileName); @@ -218,7 +218,7 @@ off_t wxFile::Read(void *pBuf, off_t nCount) int iRc = ::read(m_fd, pBuf, nCount); if ( iRc == -1 ) { wxLogSysError("can't read from file descriptor %d", m_fd); - return ofsInvalid; + return wxInvalidOffset; } else return (uint)iRc; @@ -284,7 +284,7 @@ off_t wxFile::Seek(off_t ofs, wxSeekMode mode) int iRc = lseek(m_fd, ofs, flag); if ( iRc == -1 ) { wxLogSysError("can't seek on file descriptor %d", m_fd); - return ofsInvalid; + return wxInvalidOffset; } else return (off_t)iRc; @@ -298,7 +298,7 @@ off_t wxFile::Tell() const int iRc = tell(m_fd); if ( iRc == -1 ) { wxLogSysError("can't get seek position on file descriptor %d", m_fd); - return ofsInvalid; + return wxInvalidOffset; } else return (off_t)iRc; @@ -314,7 +314,7 @@ off_t wxFile::Length() const #else int iRc = tell(m_fd); if ( iRc != -1 ) { - // @ have to use const_cast :-( + // @ have to use const_cast :-( int iLen = ((wxFile *)this)->SeekEnd(); if ( iLen != -1 ) { // restore old position @@ -331,7 +331,7 @@ off_t wxFile::Length() const if ( iRc == -1 ) { wxLogSysError("can't find length of file on file descriptor %d", m_fd); - return ofsInvalid; + return wxInvalidOffset; } else return (off_t)iRc; @@ -348,7 +348,7 @@ bool wxFile::Eof() const // @@ this doesn't work, of course, on unseekable file descriptors off_t ofsCur = Tell(), ofsMax = Length(); - if ( ofsCur == ofsInvalid || ofsMax == ofsInvalid ) + if ( ofsCur == wxInvalidOffset || ofsMax == wxInvalidOffset ) iRc = -1; else iRc = ofsCur == ofsMax; @@ -390,7 +390,7 @@ wxTempFile::wxTempFile(const wxString& strName) bool wxTempFile::Open(const wxString& strName) { m_strName = strName; - + // we want to create the file in the same directory as strName because // otherwise rename() in Commit() might not work (if the files are on // different partitions for example). Unfortunately, the only standard @@ -404,11 +404,16 @@ bool wxTempFile::Open(const wxString& strName) wxSplitPath(strName, &strPath, NULL, NULL); if ( strPath.IsEmpty() ) strPath = '.'; // GetTempFileName will fail if we give it empty string +#ifdef __WIN32__ if ( !GetTempFileName(strPath, "wx_",0, m_strTemp.GetWriteBuf(MAX_PATH)) ) +#else + // Not sure why MSVC++ 1.5 header defines first param as BYTE - bug? + if ( !GetTempFileName((BYTE) (const char*) strPath, "wx_",0, m_strTemp.GetWriteBuf(MAX_PATH)) ) +#endif wxLogLastError("GetTempFileName"); m_strTemp.UngetWriteBuf(); #endif // Windows/Unix - + return m_file.Open(m_strTemp, wxFile::write); }