X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/49d5d881d4cfacbf5a7b902612ac01a348f6809f..3baaf31317b1380ba9f33f8a23ff04bd20356d63:/src/common/file.cpp?ds=inline diff --git a/src/common/file.cpp b/src/common/file.cpp index 366a3842d7..b662a72b34 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -20,14 +20,15 @@ // 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__) && !defined(__WXMICROWIN__) #include #ifndef __SALFORDC__ @@ -59,16 +60,24 @@ #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 #elif (defined(__WXMAC__)) +#if __MSL__ < 0x6000 int access( const char *path, int mode ) { return 0 ; } +#else + int _access( const char *path, int mode ) { return 0 ; } +#endif char* mktemp( char * path ) { return path ;} - #include - #include + #include #define W_OK 2 #define R_OK 4 + #include #else #error "Please specify the header with file functions declarations." #endif //Win/UNIX @@ -81,43 +90,14 @@ #include // stat #endif -// Microsoft compiler loves underscores, feed them to it -#ifdef __VISUALC__ - // 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 -#else - #define tell(fd) lseek(fd, 0, SEEK_CUR) -#endif // VC++ - #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__ +// 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__ @@ -125,22 +105,10 @@ #include #endif -// wxWindows -#include -#include -#include -#include - #ifndef MAX_PATH #define MAX_PATH 512 #endif -#ifdef __WXMAC__ - char gwxMacFileName[ MAX_PATH ] ; - char gwxMacFileName2[ MAX_PATH ] ; - char gwxMacFileName3[ MAX_PATH ] ; -#endif - // some broken compilers don't have 3rd argument in open() and creat() #ifdef __SALFORDC__ #define ACCESS(access) @@ -149,6 +117,12 @@ #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 // ============================================================================ @@ -156,16 +130,24 @@ // ---------------------------------------------------------------------------- // static functions // ---------------------------------------------------------------------------- -bool wxFile::Exists(const char *name) +bool wxFile::Exists(const wxChar *name) { - struct stat st; + wxStructStat st; +#if wxUSE_UNICODE && wxMBFILES + wxCharBuffer fname = wxConvFile.cWC2MB(name); - return !access(name, 0) && - !stat((char*) name, &st) && + return !wxAccess(fname, 0) && + !wxStat(wxMBSTRINGCAST fname, &st) && + (st.st_mode & S_IFREG); + +#else + return !wxAccess(name, 0) && + !wxStat(name, &st) && (st.st_mode & S_IFREG); +#endif } -bool wxFile::Access(const char *name, OpenMode mode) +bool wxFile::Access(const wxChar *name, OpenMode mode) { int how = 0; @@ -179,10 +161,10 @@ bool wxFile::Access(const char *name, OpenMode mode) break; default: - wxFAIL_MSG("bad wxFile::Access mode parameter."); + wxFAIL_MSG(wxT("bad wxFile::Access mode parameter.")); } - return access(name, how) == 0; + return wxAccess(wxFNCONV(name), how) == 0; } // ---------------------------------------------------------------------------- @@ -190,7 +172,7 @@ 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; @@ -198,21 +180,21 @@ wxFile::wxFile(const char *szFileName, OpenMode mode) Open(szFileName, mode); } -// dtor -wxFile::~wxFile() -{ - Close(); -} - // create the file, fail if it already exists and bOverwrite -bool wxFile::Create(const char *szFileName, bool bOverwrite, int accessMode) +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(accessMode)); - +#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( 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; @@ -224,7 +206,7 @@ bool wxFile::Create(const char *szFileName, bool bOverwrite, int accessMode) } // open the file -bool wxFile::Open(const char *szFileName, OpenMode mode, int accessMode) +bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode) { int flags = O_BINARY; @@ -233,21 +215,25 @@ bool wxFile::Open(const char *szFileName, OpenMode mode, int accessMode) 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 write_append: - flags |= O_WRONLY | O_APPEND; - break; - case read_write: flags |= O_RDWR; break; } - int fd = open(szFileName, flags ACCESS(accessMode)); - + int fd = wxOpen(wxFNCONV(szFileName), flags ACCESS(accessMode)); if ( fd == -1 ) { wxLogSysError(_("can't open file '%s'"), szFileName); return FALSE; @@ -302,7 +288,11 @@ size_t wxFile::Write(const void *pBuf, size_t nCount) wxCHECK( (pBuf != NULL) && IsOpened(), 0 ); #ifdef __MWERKS__ +#if __MSL__ >= 0x6000 + int iRc = ::write(m_fd, (void*) pBuf, nCount); +#else int iRc = ::write(m_fd, (const char*) pBuf, nCount); +#endif #else int iRc = ::write(m_fd, pBuf, nCount); #endif @@ -320,7 +310,7 @@ bool wxFile::Flush() { if ( IsOpened() ) { #if defined(__VISUALC__) || wxHAVE_FSYNC - if ( fsync(m_fd) == -1 ) + if ( wxFsync(m_fd) == -1 ) { wxLogSysError(_("can't flush file descriptor %d"), m_fd); return FALSE; @@ -342,25 +332,25 @@ off_t wxFile::Seek(off_t ofs, wxSeekMode mode) { wxASSERT( IsOpened() ); - int flag = -1; + int origin; switch ( mode ) { + default: + wxFAIL_MSG(_("unknown seek origin")); + case wxFromStart: - flag = SEEK_SET; + origin = SEEK_SET; break; case wxFromCurrent: - flag = SEEK_CUR; + origin = SEEK_CUR; break; case wxFromEnd: - flag = SEEK_END; + origin = SEEK_END; break; - - default: - wxFAIL_MSG(_("unknown seek origin")); } - int iRc = lseek(m_fd, ofs, flag); + int iRc = lseek(m_fd, ofs, origin); if ( iRc == -1 ) { wxLogSysError(_("can't seek on file descriptor %d"), m_fd); return wxInvalidOffset; @@ -374,7 +364,7 @@ off_t wxFile::Tell() const { wxASSERT( IsOpened() ); - int iRc = tell(m_fd); + int iRc = wxTell(m_fd); if ( iRc == -1 ) { wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd); return wxInvalidOffset; @@ -391,7 +381,7 @@ off_t wxFile::Length() const #ifdef __VISUALC__ int iRc = _filelength(m_fd); #else // !VC++ - int iRc = tell(m_fd); + int iRc = wxTell(m_fd); if ( iRc != -1 ) { // @ have to use const_cast :-( int iLen = ((wxFile *)this)->SeekEnd(); @@ -442,8 +432,7 @@ bool wxFile::Eof() const return FALSE; case -1: - wxLogSysError(_("can't determine if the end of file is reached on \ - descriptor %d"), m_fd); + wxLogSysError(_("can't determine if the end of file is reached on descriptor %d"), m_fd); break; default: @@ -474,51 +463,68 @@ bool wxTempFile::Open(const wxString& strName) // 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"; + static const wxChar *szMktempSuffix = wxT("XXXXXX"); m_strTemp << strName << szMktempSuffix; - mktemp((char *)m_strTemp.c_str()); // will do because length doesn't change + // 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)) ) + 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 int access = wxS_DEFAULT; #ifdef __UNIX__ // create the file with the same mode as the original one under Unix - struct stat st; - if ( stat(strName, &st) == 0 ) + 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 { - wxLogLastError("stat"); + // file probably didn't exist, just create with default mode _using_ + // user's umask (new files creation should respet umask) + changedUmask = FALSE; } - - // 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 - mode_t umaskOld = umask(0); #endif // Unix - bool ok = m_file.Open(m_strTemp, wxFile::write, access); + bool ok = m_file.Open(m_strTemp, wxFile::write, access); #ifdef __UNIX__ - // restore umask now that the file is created - (void)umask(umaskOld); + if ( changedUmask ) + { + // restore umask now that the file is created + (void)umask(umaskOld); + } #endif // Unix return ok; @@ -538,12 +544,12 @@ bool wxTempFile::Commit() { m_file.Close(); - if ( wxFile::Exists(m_strName) && remove(m_strName) != 0 ) { + if ( wxFile::Exists(m_strName) && wxRemove(m_strName) != 0 ) { wxLogSysError(_("can't remove file '%s'"), m_strName.c_str()); return FALSE; } - if ( rename(m_strTemp, m_strName) != 0 ) { + if ( wxRename(m_strTemp, m_strName) != 0 ) { wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str()); return FALSE; } @@ -554,6 +560,9 @@ bool wxTempFile::Commit() void wxTempFile::Discard() { m_file.Close(); - if ( remove(m_strTemp) != 0 ) + if ( wxRemove(m_strTemp) != 0 ) wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str()); } + +#endif +