X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17dff81c7141e142765b168ab225e5c61475669f..4def3b359546ee186b3db723db719f85b761f36a:/src/common/file.cpp?ds=sidebyside diff --git a/src/common/file.cpp b/src/common/file.cpp index 30bc2d13d7..243bdc0373 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -15,123 +15,114 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ -#pragma implementation "file.h" + #pragma implementation "file.h" #endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_FILE + // standard -#if defined(__WXMSW__) && !defined(__GNUWIN32__) +#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXWINE__) #include - #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 - #include // for GetTempFileName +#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 + + #include // for GetTempFileName #elif (defined(__UNIX__) || defined(__GNUWIN32__)) - #include + #include + #ifdef __GNUWIN32__ + #include + #endif +#elif (defined(__WXPM__)) + #include + #define W_OK 2 + #define R_OK 4 #elif (defined(__WXSTUBS__)) - // Have to ifdef this for different environments - #include + // Have to ifdef this for different environments + #include #elif (defined(__WXMAC__)) - int access( const char *path, int mode ) { return 0 ; } - char* mktemp( char * path ) { return path ;} - #include - #include - #define W_OK 2 - #define R_OK 4 +#if __MSL__ < 0x6000 + int access( const char *path, int mode ) { return 0 ; } #else - #error "Please specify the header with file functions declarations." + int _access( const char *path, int mode ) { return 0 ; } +#endif + char* mktemp( char * path ) { return path ;} + #include + #define W_OK 2 + #define R_OK 4 + #include +#else + #error "Please specify the header with file functions declarations." #endif //Win/UNIX #include // SEEK_xxx constants #include // O_RDONLY &c + #ifndef __MWERKS__ -#include // needed for stat -#include // stat + #include // needed for stat + #include // stat #endif -// Microsoft compiler loves underscores, feed them to it -#ifdef _MSC_VER - - #ifndef __MWERKS__ - - // functions - #define open _open - #define close _close - #define read _read - #define write _write - #define lseek _lseek - #define fsync _commit - #define access _access - #define eof _eof - - // types - #define stat _stat - - // constants - - #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 - - #define S_IFDIR _S_IFDIR - #define S_IFREG _S_IFREG - - #endif - - #define W_OK 2 - #define R_OK 4 -#else - #define tell(fd) lseek(fd, 0, SEEK_CUR) -#endif //_MSC_VER - -#ifdef __BORLANDC__ - #define W_OK 2 - #define R_OK 4 +#if defined(__BORLANDC__) || defined(_MSC_VER) + #define W_OK 2 + #define R_OK 4 #endif -// there is no distinction between text and binary files under Unix -#ifdef __UNIX__ - #define O_BINARY (0) +// 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__ -// wxWindows -#include -#include -#include -#include +#ifdef __SALFORDC__ + #include +#endif #ifndef MAX_PATH -#define MAX_PATH 512 + #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 + +// wxWindows +#include "wx/string.h" +#include "wx/intl.h" +#include "wx/file.h" +#include "wx/log.h" + // ============================================================================ // implementation of wxFile // ============================================================================ @@ -139,30 +130,48 @@ // ---------------------------------------------------------------------------- // static functions // ---------------------------------------------------------------------------- -bool wxFile::Exists(const char *name) +bool wxFile::Exists(const wxChar *name) { - struct stat st; - return !access(name, 0) && !stat(name, &st) && (st.st_mode & S_IFREG); + wxStructStat st; +#if wxUSE_UNICODE && wxMBFILES + wxCharBuffer fname = wxConvFile.cWC2MB(name); + +#if defined(__WXMAC__) && !defined(__UNIX__) + return !access(wxUnix2MacFilename( name ) , 0) && !stat(wxUnix2MacFilename( name ), &st) && (st.st_mode & S_IFREG); +#else + return !wxAccess(fname, 0) && + !wxStat(wxMBSTRINGCAST fname, &st) && + (st.st_mode & S_IFREG); +#endif +#else +#if defined(__WXMAC__) && !defined(__UNIX__) + return !access(wxUnix2MacFilename( name ) , 0) && !stat(wxUnix2MacFilename( name ), &st) && (st.st_mode & S_IFREG); +#else + return !wxAccess(name, 0) && + !wxStat(name, &st) && + (st.st_mode & S_IFREG); +#endif +#endif } -bool wxFile::Access(const char *name, OpenMode mode) +bool wxFile::Access(const wxChar *name, OpenMode mode) { - int how = 0; + int how = 0; - switch ( mode ) { - case read: - how = R_OK; - break; + switch ( mode ) { + case read: + how = R_OK; + break; - case write: - how = W_OK; - break; + case write: + how = W_OK; + break; - default: - wxFAIL_MSG("bad wxFile::Access mode parameter."); - } + default: + wxFAIL_MSG(wxT("bad wxFile::Access mode parameter.")); + } - return access(name, how) == 0; + return wxAccess(wxFNCONV(name), how) == 0; } // ---------------------------------------------------------------------------- @@ -170,87 +179,96 @@ bool wxFile::Access(const char *name, OpenMode mode) // ---------------------------------------------------------------------------- // ctors -wxFile::wxFile(const char *szFileName, OpenMode mode) +wxFile::wxFile(const wxChar *szFileName, OpenMode mode) { - m_fd = fd_invalid; - m_error = FALSE; + m_fd = fd_invalid; + m_error = FALSE; - Open(szFileName, mode); -} - -// dtor -wxFile::~wxFile() -{ - Close(); + Open(szFileName, mode); } // create the file, fail if it already exists and bOverwrite -bool wxFile::Create(const char *szFileName, bool bOverwrite, int access) +bool wxFile::Create(const wxChar *szFileName, 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 - int fd = open(szFileName, O_WRONLY | O_CREAT | - (bOverwrite ? O_TRUNC : O_EXCL), access); - - if ( fd == -1 ) { - wxLogSysError(_("can't create file '%s'"), szFileName); - return FALSE; - } - else { - Attach(fd); - return TRUE; - } + // 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__) + // Dominic Mazzoni [dmazzoni+@cs.cmu.edu] reports that open is still broken on the mac, so we replace + // int fd = open(wxUnix2MacFilename( szFileName ), O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access); + int fd = creat(wxUnix2MacFilename( szFileName ), accessMode); +#else + int fd = wxOpen(wxFNCONV(szFileName), + O_BINARY | O_WRONLY | O_CREAT | + (bOverwrite ? O_TRUNC : O_EXCL) + ACCESS(accessMode)); +#endif + if ( fd == -1 ) { + wxLogSysError(_("can't create file '%s'"), szFileName); + return FALSE; + } + else { + Attach(fd); + return TRUE; + } } // open the file -bool wxFile::Open(const char *szFileName, OpenMode mode, int access) +bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode) { - int flags = O_BINARY; - - switch ( mode ) { - case read: - flags |= O_RDONLY; - break; - - case write: - flags |= O_WRONLY | O_CREAT | O_TRUNC; - break; - - case write_append: - flags |= O_WRONLY | O_APPEND; - break; - - case read_write: - flags |= O_RDWR; - break; - } - - int fd = open(szFileName, flags, access); + int flags = O_BINARY; + + switch ( mode ) { + case read: + flags |= O_RDONLY; + break; + + case write_append: + if ( wxFile::Exists(szFileName) ) + { + flags |= O_WRONLY | O_APPEND; + break; + } + //else: fall through as write_append is the same as write if the + // file doesn't exist + + case write: + flags |= O_WRONLY | O_CREAT | O_TRUNC; + break; + + case read_write: + flags |= O_RDWR; + break; + } - if ( fd == -1 ) { - wxLogSysError(_("can't open file '%s'"), szFileName); - return FALSE; - } - else { - Attach(fd); - return TRUE; - } +#if defined(__WXMAC__) && !defined(__UNIX__) + int fd = open(wxUnix2MacFilename( szFileName ), flags, access); +#else + int fd = wxOpen(wxFNCONV(szFileName), flags ACCESS(accessMode)); +#endif + if ( fd == -1 ) { + wxLogSysError(_("can't open file '%s'"), szFileName); + return FALSE; + } + else { + Attach(fd); + return TRUE; + } } // close bool wxFile::Close() { - if ( IsOpened() ) { - if ( close(m_fd) == -1 ) { - wxLogSysError(_("can't close file descriptor %d"), m_fd); - m_fd = fd_invalid; - return FALSE; + if ( IsOpened() ) { + if ( close(m_fd) == -1 ) { + wxLogSysError(_("can't close file descriptor %d"), m_fd); + m_fd = fd_invalid; + return FALSE; + } + else + m_fd = fd_invalid; } - else - m_fd = fd_invalid; - } - return TRUE; + return TRUE; } // ---------------------------------------------------------------------------- @@ -260,53 +278,60 @@ bool wxFile::Close() // read off_t wxFile::Read(void *pBuf, off_t nCount) { - wxCHECK( (pBuf != NULL) && IsOpened(), 0 ); + wxCHECK( (pBuf != NULL) && IsOpened(), 0 ); #ifdef __MWERKS__ - int iRc = ::read(m_fd, (char*) pBuf, nCount); + int iRc = ::read(m_fd, (char*) pBuf, nCount); #else - int iRc = ::read(m_fd, pBuf, nCount); + int iRc = ::read(m_fd, pBuf, nCount); #endif - if ( iRc == -1 ) { - wxLogSysError(_("can't read from file descriptor %d"), m_fd); - return wxInvalidOffset; - } - else - return (size_t)iRc; + if ( iRc == -1 ) { + wxLogSysError(_("can't read from file descriptor %d"), m_fd); + return wxInvalidOffset; + } + else + return (size_t)iRc; } // write size_t wxFile::Write(const void *pBuf, size_t nCount) { - wxCHECK( (pBuf != NULL) && IsOpened(), 0 ); + wxCHECK( (pBuf != NULL) && IsOpened(), 0 ); #ifdef __MWERKS__ - int iRc = ::write(m_fd, (const char*) pBuf, nCount); +#if __MSL__ >= 0x6000 + int iRc = ::write(m_fd, (void*) pBuf, nCount); #else - int iRc = ::write(m_fd, pBuf, nCount); + int iRc = ::write(m_fd, (const char*) pBuf, nCount); #endif - if ( iRc == -1 ) { - wxLogSysError(_("can't write to file descriptor %d"), m_fd); - m_error = TRUE; - return 0; - } - else - return iRc; +#else + int iRc = ::write(m_fd, pBuf, nCount); +#endif + if ( iRc == -1 ) { + wxLogSysError(_("can't write to file descriptor %d"), m_fd); + m_error = TRUE; + return 0; + } + else + return iRc; } // flush bool wxFile::Flush() { - if ( IsOpened() ) { - // @@@ fsync() is not ANSI (BSDish) -// if ( fsync(m_fd) == -1 ) { // TODO - if (wxTrue) { - wxLogSysError(_("can't flush file descriptor %d"), m_fd); - return FALSE; + if ( IsOpened() ) { +#if defined(__VISUALC__) || wxHAVE_FSYNC + if ( wxFsync(m_fd) == -1 ) + { + wxLogSysError(_("can't flush file descriptor %d"), m_fd); + return FALSE; + } +#else // no fsync + // just do nothing +#endif // fsync } - } - return TRUE; + return TRUE; } // ---------------------------------------------------------------------------- @@ -316,118 +341,116 @@ bool wxFile::Flush() // seek off_t wxFile::Seek(off_t ofs, wxSeekMode mode) { - wxASSERT( IsOpened() ); + wxASSERT( IsOpened() ); - int flag = -1; - switch ( mode ) { - case wxFromStart: - flag = SEEK_SET; - break; + int origin; + switch ( mode ) { + default: + wxFAIL_MSG(_("unknown seek origin")); - case wxFromCurrent: - flag = SEEK_CUR; - break; + case wxFromStart: + origin = SEEK_SET; + break; - case wxFromEnd: - flag = SEEK_END; - break; + case wxFromCurrent: + origin = SEEK_CUR; + break; - default: - wxFAIL_MSG(_("unknown seek origin")); - } + case wxFromEnd: + origin = SEEK_END; + break; + } - int iRc = lseek(m_fd, ofs, flag); - if ( iRc == -1 ) { - wxLogSysError(_("can't seek on file descriptor %d"), m_fd); - return wxInvalidOffset; - } - else - return (off_t)iRc; + int iRc = lseek(m_fd, ofs, origin); + if ( iRc == -1 ) { + wxLogSysError(_("can't seek on file descriptor %d"), m_fd); + return wxInvalidOffset; + } + else + return (off_t)iRc; } // get current off_t off_t wxFile::Tell() const { - wxASSERT( IsOpened() ); + wxASSERT( IsOpened() ); - int iRc = tell(m_fd); - if ( iRc == -1 ) { - wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd); - return wxInvalidOffset; - } - else - return (off_t)iRc; + int iRc = wxTell(m_fd); + if ( iRc == -1 ) { + wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd); + return wxInvalidOffset; + } + else + return (off_t)iRc; } // get current file length off_t wxFile::Length() const { - wxASSERT( IsOpened() ); + wxASSERT( IsOpened() ); - #if defined( _MSC_VER ) && !defined( __MWERKS__ ) +#ifdef __VISUALC__ int iRc = _filelength(m_fd); - #else - int iRc = tell(m_fd); +#else // !VC++ + int iRc = wxTell(m_fd); if ( iRc != -1 ) { - // @ have to use const_cast :-( - int iLen = ((wxFile *)this)->SeekEnd(); - if ( iLen != -1 ) { - // restore old position - if ( ((wxFile *)this)->Seek(iRc) == -1 ) { - // error - iLen = -1; + // @ have to use const_cast :-( + int iLen = ((wxFile *)this)->SeekEnd(); + if ( iLen != -1 ) { + // restore old position + if ( ((wxFile *)this)->Seek(iRc) == -1 ) { + // error + iLen = -1; + } } - } - iRc = iLen; + iRc = iLen; } +#endif // VC++ - #endif //_MSC_VER - - if ( iRc == -1 ) { - wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd); - return wxInvalidOffset; - } - else - return (off_t)iRc; + if ( iRc == -1 ) { + wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd); + return wxInvalidOffset; + } + else + return (off_t)iRc; } // is end of file reached? bool wxFile::Eof() const { - wxASSERT( IsOpened() ); + wxASSERT( IsOpened() ); - int iRc; + int iRc; - #if defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) +#if defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) || defined(__SALFORDC__) // @@ this doesn't work, of course, on unseekable file descriptors off_t ofsCur = Tell(), - ofsMax = Length(); + ofsMax = Length(); if ( ofsCur == wxInvalidOffset || ofsMax == wxInvalidOffset ) - iRc = -1; + iRc = -1; else - iRc = ofsCur == ofsMax; - #else // Windows and "native" compiler + iRc = ofsCur == ofsMax; +#else // Windows and "native" compiler iRc = eof(m_fd); - #endif // Windows/Unix +#endif // Windows/Unix - switch ( iRc ) { - case 1: - break; + switch ( iRc ) { + case 1: + break; - case 0: - return FALSE; + case 0: + return FALSE; - case -1: - wxLogSysError(_("can't determine if the end of file is reached on \ -descriptor %d"), m_fd); - break; + 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.")); - } + default: + wxFAIL_MSG(_("invalid eof() return value.")); + } - return TRUE; + return TRUE; } // ============================================================================ @@ -439,37 +462,83 @@ descriptor %d"), m_fd); // ---------------------------------------------------------------------------- wxTempFile::wxTempFile(const wxString& strName) { - Open(strName); + Open(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 - // (POSIX) temp file creation function tmpnam() can't do it. - #if defined(__UNIX__) || defined(__WXSTUBS__)|| defined( __WXMAC__ ) - static const char *szMktempSuffix = "XXXXXX"; + 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 + // (POSIX) temp file creation function tmpnam() can't do it. +#if defined(__UNIX__) || defined(__WXSTUBS__)|| defined( __WXMAC__ ) + static const wxChar *szMktempSuffix = wxT("XXXXXX"); m_strTemp << strName << szMktempSuffix; - mktemp((char *)m_strTemp.c_str()); // will do because length doesn't change - #else // Windows + // can use the cast because length doesn't change + mktemp(wxMBSTRINGCAST m_strTemp.mb_str()); +#elif defined(__WXPM__) + // for now just create a file + // future enhancements can be to set some extended attributes for file systems + // OS/2 supports that have them (HPFS, FAT32) and security (HPFS386) + static const wxChar *szMktempSuffix = wxT("XXX"); + m_strTemp << strName << szMktempSuffix; + ::DosCreateDir(m_strTemp.GetWriteBuf(MAX_PATH), NULL); +#else // Windows wxString strPath; wxSplitPath(strName, &strPath, NULL, NULL); if ( strPath.IsEmpty() ) - strPath = '.'; // GetTempFileName will fail if we give it empty string + strPath = wxT('.'); // GetTempFileName will fail if we give it empty string #ifdef __WIN32__ - if ( !GetTempFileName(strPath, "wx_",0, m_strTemp.GetWriteBuf(MAX_PATH)) ) + if ( !GetTempFileName(strPath, wxT("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)) ) + // Not sure why MSVC++ 1.5 header defines first param as BYTE - bug? + if ( !GetTempFileName((BYTE) (DWORD)(const wxChar*) strPath, wxT("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) ) #endif - wxLogLastError("GetTempFileName"); + wxLogLastError(wxT("GetTempFileName")); m_strTemp.UngetWriteBuf(); - #endif // Windows/Unix +#endif // Windows/Unix + + int access = wxS_DEFAULT; +#ifdef __UNIX__ + // create the file with the same mode as the original one under Unix + mode_t umaskOld = 0; // just to suppress compiler warning + bool changedUmask; + + wxStructStat st; + if ( stat(strName.fn_str(), &st) == 0 ) + { + // this assumes that only lower bits of st_mode contain the access + // rights, but it's true for at least all Unices which have S_IXXXX() + // macros, so should not be less portable than using (not POSIX) + // S_IFREG &c + access = st.st_mode & 0777; + + // we want to create the file with exactly the same access rights as + // the original one, so disable the user's umask for the moment + umaskOld = umask(0); + changedUmask = TRUE; + } + else + { + // file probably didn't exist, just create with default mode _using_ + // user's umask (new files creation should respet umask) + changedUmask = FALSE; + } +#endif // Unix + + bool ok = m_file.Open(m_strTemp, wxFile::write, access); + +#ifdef __UNIX__ + if ( changedUmask ) + { + // restore umask now that the file is created + (void)umask(umaskOld); + } +#endif // Unix - return m_file.Open(m_strTemp, wxFile::write); + return ok; } // ---------------------------------------------------------------------------- @@ -478,30 +547,50 @@ bool wxTempFile::Open(const wxString& strName) wxTempFile::~wxTempFile() { - if ( IsOpened() ) - Discard(); + if ( IsOpened() ) + Discard(); } bool wxTempFile::Commit() { - m_file.Close(); + m_file.Close(); + +#if !defined(__WXMAC__) || defined(__UNIX__) + if ( wxFile::Exists(m_strName) && wxRemove(m_strName) != 0 ) { + wxLogSysError(_("can't remove file '%s'"), m_strName.c_str()); + return FALSE; + } - if ( wxFile::Exists(m_strName) && remove(m_strName) != 0 ) { + if ( wxRename(m_strTemp, m_strName) != 0 ) { + wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str()); + return FALSE; + } +#else + if ( wxFile::Exists(m_strName) && remove(wxUnix2MacFilename( m_strName )) != 0 ) { wxLogSysError(_("can't remove file '%s'"), m_strName.c_str()); return FALSE; } - if ( rename(m_strTemp, m_strName) != 0 ) { + if ( rename(wxUnix2MacFilename( m_strTemp ), wxUnix2MacFilename( m_strName )) != 0 ) { wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str()); return FALSE; } +#endif - return TRUE; + return TRUE; } void wxTempFile::Discard() { - m_file.Close(); - if ( remove(m_strTemp) != 0 ) - wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str()); + m_file.Close(); +#if !defined(__WXMAC__) || defined(__UNIX__) + if ( wxRemove(m_strTemp) != 0 ) + wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str()); +#else + if ( remove( wxUnix2MacFilename(m_strTemp.fn_str())) != 0 ) + wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str()); +#endif } + +#endif +