#if wxUSE_FILE
// standard
-#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXWINE__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__WXMICROWIN__)
#include <io.h>
#ifndef __SALFORDC__
#define NOMCX
#endif
- #include <windows.h> // for GetTempFileName
#elif (defined(__UNIX__) || defined(__GNUWIN32__))
#include <unistd.h>
#ifdef __GNUWIN32__
#include <windows.h>
#endif
+#elif defined(__DOS__)
+ #if defined(__WATCOMC__)
+ #include <io.h>
+ #elif defined(__DJGPP__)
+ #include <io.h>
+ #include <unistd.h>
+ #include <stdio.h>
+ #else
+ #error "Please specify the header with file functions declarations."
+ #endif
+#elif (defined(__WXPM__))
+ #include <io.h>
+ #define W_OK 2
+ #define R_OK 4
#elif (defined(__WXSTUBS__))
// Have to ifdef this for different environments
#include <io.h>
#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 <unistd.h>
- #include <unix.h>
+ #include <stat.h>
#define W_OK 2
#define R_OK 4
+ #include <unistd.h>
#else
#error "Please specify the header with file functions declarations."
#endif //Win/UNIX
#ifndef __MWERKS__
#include <sys/types.h> // needed for stat
#include <sys/stat.h> // stat
+#elif ( defined(__MWERKS__) && defined(__WXMSW__) )
+ #include <sys/types.h> // needed for stat
+ #include <sys/stat.h> // 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__
#include <unix.h>
#endif
-// wxWindows
-#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)
#define ACCESS(access) , (access)
#endif // Salford C
+// wxWindows
+#ifndef WX_PRECOMP
+ #include "wx/string.h"
+ #include "wx/intl.h"
+ #include "wx/log.h"
+#endif // !WX_PRECOMP
+
+#include "wx/filename.h"
+#include "wx/file.h"
+
+#ifdef __WXMSW__
+ #include "wx/msw/mslu.h"
+#endif
+
// ============================================================================
// implementation of wxFile
// ============================================================================
// ----------------------------------------------------------------------------
bool wxFile::Exists(const wxChar *name)
{
- struct stat st;
+ wxStructStat st;
#if wxUSE_UNICODE && wxMBFILES
wxCharBuffer fname = wxConvFile.cWC2MB(name);
- return !access(fname, 0) &&
- !stat(MBSTRINGCAST fname, &st) &&
+ return !wxAccess(fname, 0) &&
+ !wxStat(wxMBSTRINGCAST fname, &st) &&
(st.st_mode & S_IFREG);
+
#else
- return !access(name, 0) &&
- !stat((wxChar*) name, &st) &&
+ return !wxAccess(name, 0) &&
+ !wxStat(name, &st) &&
(st.st_mode & S_IFREG);
#endif
}
break;
default:
- wxFAIL_MSG(_T("bad wxFile::Access mode parameter."));
+ wxFAIL_MSG(wxT("bad wxFile::Access mode parameter."));
}
- return access(wxFNCONV(name), how) == 0;
+ return wxAccess(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
- int fd = open(wxFNCONV(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;
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;
+ case write_excl:
+ flags |= O_WRONLY | O_CREAT | O_EXCL;
break;
case read_write:
break;
}
- int fd = open(wxFNCONV(szFileName), flags ACCESS(accessMode));
-
+ int fd = wxOpen(wxFNCONV(szFileName), flags ACCESS(accessMode));
if ( fd == -1 ) {
wxLogSysError(_("can't open file '%s'"), szFileName);
return FALSE;
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
{
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;
{
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;
{
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;
#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();
int iRc;
-#if defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) || defined(__SALFORDC__)
+#if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) || defined(__SALFORDC__)
// @@ this doesn't work, of course, on unseekable file descriptors
off_t ofsCur = Tell(),
ofsMax = Length();
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:
// ----------------------------------------------------------------------------
// construction
// ----------------------------------------------------------------------------
+
wxTempFile::wxTempFile(const wxString& 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 wxChar *szMktempSuffix = _T("XXXXXX");
- m_strTemp << strName << szMktempSuffix;
- mktemp(MBSTRINGCAST m_strTemp.mb_str()); // will do because length doesn't change
-#else // Windows
- wxString strPath;
- wxSplitPath(strName, &strPath, NULL, NULL);
- if ( strPath.IsEmpty() )
- strPath = _T('.'); // GetTempFileName will fail if we give it empty string
-#ifdef __WIN32__
- if ( !GetTempFileName(strPath, _T("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)) )
-#endif
- wxLogLastError(_T("GetTempFileName"));
- m_strTemp.UngetWriteBuf();
-#endif // Windows/Unix
+ // we must have an absolute filename because otherwise CreateTempFileName()
+ // would create the temp file in $TMP (i.e. the system standard location
+ // for the temp files) which might be on another volume/drive/mount and
+ // wxRename()ing it later to m_strName from Commit() would then fail
+ //
+ // with the absolute filename, the temp file is created in the same
+ // directory as this one which ensures that wxRename() may work later
+ wxFileName fn(strName);
+ if ( !fn.IsAbsolute() )
+ {
+ fn.Normalize(wxPATH_NORM_ABSOLUTE);
+ }
+
+ m_strName = fn.GetFullPath();
+
+ m_strTemp = wxFileName::CreateTempFileName(m_strName, &m_file);
+
+ if ( m_strTemp.empty() )
+ {
+ // CreateTempFileName() failed
+ return FALSE;
+ }
- 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;
+ // the temp file should have the same permissions as the original one
+ mode_t mode;
- struct stat st;
- if ( stat(strName.fn_str(), &st) == 0 )
+ wxStructStat st;
+ if ( stat(m_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;
+ mode = st.st_mode;
}
else
{
- // file probably didn't exist, just create with default mode _using_
- // user's umask (new files creation should respet umask)
- changedUmask = FALSE;
+ // file probably didn't exist, just give it the default mode _using_
+ // user's umask (new files creation should respect umask)
+ mode_t mask = umask(0777);
+ mode = 0666 & ~mask;
+ umask(mask);
}
-#endif // Unix
-
- bool ok = m_file.Open(m_strTemp, wxFile::write, access);
-#ifdef __UNIX__
- if ( changedUmask )
+ if ( chmod(m_strTemp.mb_str(), mode) == -1 )
{
- // restore umask now that the file is created
- (void)umask(umaskOld);
+ wxLogSysError(_("Failed to set temporary file permissions"));
}
#endif // Unix
- return ok;
+ return TRUE;
}
// ----------------------------------------------------------------------------
{
m_file.Close();
- if ( wxFile::Exists(m_strName) && remove(m_strName.fn_str()) != 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.fn_str(), m_strName.fn_str()) != 0 ) {
+ if ( wxRename(m_strTemp, m_strName) != 0 ) {
wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());
return FALSE;
}
void wxTempFile::Discard()
{
m_file.Close();
- if ( remove(m_strTemp.fn_str()) != 0 )
+ if ( wxRemove(m_strTemp) != 0 )
wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
}
-#endif
\ No newline at end of file
+#endif // wxUSE_FILE
+
projects / wxWidgets.git / blobdiff