// 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 <io.h>
#ifndef __SALFORDC__
#ifdef __GNUWIN32__
#include <windows.h>
#endif
+#elif (defined(__WXPM__))
+ #include <io.h>
+ #include <direct.h>
+ #define W_OK 2
+ #define R_OK 4
#elif (defined(__WXSTUBS__))
// Have to ifdef this for different environments
#include <io.h>
#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__
#endif
// wxWindows
-#include <wx/string.h>
-#include <wx/intl.h>
-#include <wx/file.h>
-#include <wx/log.h>
+#include "wx/string.h"
+#include "wx/intl.h"
+#include "wx/file.h"
+#include "wx/log.h"
#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)
{
struct stat st;
#if wxUSE_UNICODE && wxMBFILES
- wxCharBuffer fname = wxConv_file.cWC2MB(name);
+ wxCharBuffer fname = wxConvFile.cWC2MB(name);
+#ifdef __WXMAC__
+ return !access(wxUnix2MacFilename( name ) , 0) && !stat(wxUnix2MacFilename( name ), &st) && (st.st_mode & S_IFREG);
+#else
return !access(fname, 0) &&
- !stat(MBSTRINGCAST fname, &st) &&
+ !stat(wxMBSTRINGCAST fname, &st) &&
(st.st_mode & S_IFREG);
+#endif
+#else
+#ifdef __WXMAC__
+ return !access(wxUnix2MacFilename( name ) , 0) && !stat(wxUnix2MacFilename( name ), &st) && (st.st_mode & S_IFREG);
#else
return !access(name, 0) &&
!stat((wxChar*) name, &st) &&
(st.st_mode & S_IFREG);
#endif
+#endif
}
bool wxFile::Access(const wxChar *name, OpenMode mode)
break;
default:
- wxFAIL_MSG(_T("bad wxFile::Access mode parameter."));
+ wxFAIL_MSG(wxT("bad wxFile::Access mode parameter."));
}
return access(wxFNCONV(name), how) == 0;
Open(szFileName, mode);
}
-// dtor
-wxFile::~wxFile()
-{
- Close();
-}
-
// create the file, fail if it already exists and bOverwrite
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
+#ifdef __WXMAC__
+ int fd = open(wxUnix2MacFilename( szFileName ), O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);
+#else
int fd = open(wxFNCONV(szFileName),
- O_WRONLY | O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL)
+ 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;
break;
}
+#ifdef __WXMAC__
+ int fd = open(wxUnix2MacFilename( szFileName ), flags, access);
+#else
int fd = open(wxFNCONV(szFileName), flags ACCESS(accessMode));
-
+#endif
if ( fd == -1 ) {
wxLogSysError(_("can't open file '%s'"), szFileName);
return FALSE;
{
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;
// 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 = _T("XXXXXX");
+ static const wxChar *szMktempSuffix = wxT("XXXXXX");
+ m_strTemp << strName << szMktempSuffix;
+ // 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;
- mktemp(MBSTRINGCAST m_strTemp.mb_str()); // will do because length doesn't change
+ mkdir(m_strTemp.GetWriteBuf(MAX_PATH));
#else // Windows
wxString strPath;
wxSplitPath(strName, &strPath, NULL, NULL);
if ( strPath.IsEmpty() )
- strPath = _T('.'); // 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, _T("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 wxChar*) strPath, _T("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )
+ if ( !GetTempFileName((BYTE) (DWORD)(const wxChar*) strPath, wxT("wx_"),0, m_strTemp.GetWriteBuf(MAX_PATH)) )
#endif
- wxLogLastError(_T("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
+ mode_t umaskOld = 0; // just to suppress compiler warning
+ bool changedUmask;
+
struct stat st;
if ( stat(strName.fn_str(), &st) == 0 )
{
// 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(_T("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;
{
m_file.Close();
+#ifndef __WXMAC__
if ( wxFile::Exists(m_strName) && remove(m_strName.fn_str()) != 0 ) {
wxLogSysError(_("can't remove file '%s'"), m_strName.c_str());
return FALSE;
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(wxUnix2MacFilename( m_strTemp ), wxUnix2MacFilename( m_strName )) != 0 ) {
+ wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());
+ return FALSE;
+ }
+#endif
return TRUE;
}
void wxTempFile::Discard()
{
m_file.Close();
+#ifndef __WXMAC__
if ( remove(m_strTemp.fn_str()) != 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
+
projects / wxWidgets.git / blobdiff