wxTempFile now respects the access rights under Unix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
parent
c972e125b6
commit
49d5d881d4
@ -31,29 +31,29 @@
|
||||
#include <io.h>
|
||||
|
||||
#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
|
||||
#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 <windows.h> // for GetTempFileName
|
||||
#include <windows.h> // for GetTempFileName
|
||||
#elif (defined(__UNIX__) || defined(__GNUWIN32__))
|
||||
#include <unistd.h>
|
||||
#ifdef __GNUWIN32__
|
||||
@ -83,42 +83,42 @@
|
||||
|
||||
// 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
|
||||
// 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
|
||||
// types
|
||||
#define stat _stat
|
||||
|
||||
// constants
|
||||
// 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 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
|
||||
#define S_IFDIR _S_IFDIR
|
||||
#define S_IFREG _S_IFREG
|
||||
#else
|
||||
#define tell(fd) lseek(fd, 0, SEEK_CUR)
|
||||
#define tell(fd) lseek(fd, 0, SEEK_CUR)
|
||||
#endif // VC++
|
||||
|
||||
#if defined(__BORLANDC__) || defined(_MSC_VER)
|
||||
#define W_OK 2
|
||||
#define R_OK 4
|
||||
#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)
|
||||
#define O_BINARY (0)
|
||||
#endif //__UNIX__
|
||||
|
||||
#ifdef __SALFORDC__
|
||||
@ -141,6 +141,14 @@
|
||||
char gwxMacFileName3[ MAX_PATH ] ;
|
||||
#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
|
||||
|
||||
// ============================================================================
|
||||
// implementation of wxFile
|
||||
// ============================================================================
|
||||
@ -150,33 +158,31 @@
|
||||
// ----------------------------------------------------------------------------
|
||||
bool wxFile::Exists(const char *name)
|
||||
{
|
||||
#ifdef __SALFORDC__
|
||||
struct _stat st;
|
||||
#else
|
||||
struct stat st;
|
||||
#endif
|
||||
struct stat st;
|
||||
|
||||
return !access(name, 0) && !stat((char*) name, &st) && (st.st_mode & S_IFREG);
|
||||
return !access(name, 0) &&
|
||||
!stat((char*) name, &st) &&
|
||||
(st.st_mode & S_IFREG);
|
||||
}
|
||||
|
||||
bool wxFile::Access(const char *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("bad wxFile::Access mode parameter.");
|
||||
}
|
||||
|
||||
return access(name, how) == 0;
|
||||
return access(name, how) == 0;
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@ -186,94 +192,86 @@ bool wxFile::Access(const char *name, OpenMode mode)
|
||||
// ctors
|
||||
wxFile::wxFile(const char *szFileName, OpenMode mode)
|
||||
{
|
||||
m_fd = fd_invalid;
|
||||
m_error = FALSE;
|
||||
m_fd = fd_invalid;
|
||||
m_error = FALSE;
|
||||
|
||||
Open(szFileName, mode);
|
||||
Open(szFileName, mode);
|
||||
}
|
||||
|
||||
// dtor
|
||||
wxFile::~wxFile()
|
||||
{
|
||||
Close();
|
||||
Close();
|
||||
}
|
||||
|
||||
// create the file, fail if it already exists and bOverwrite
|
||||
bool wxFile::Create(const char *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 __SALFORDC__
|
||||
int fd = open(szFileName, O_WRONLY | O_CREAT |
|
||||
(bOverwrite ? O_TRUNC : O_EXCL));
|
||||
#else
|
||||
int fd = open(szFileName, O_WRONLY | O_CREAT |
|
||||
(bOverwrite ? O_TRUNC : O_EXCL), accessMode);
|
||||
#endif
|
||||
// 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 ( fd == -1 ) {
|
||||
wxLogSysError(_("can't create file '%s'"), szFileName);
|
||||
return FALSE;
|
||||
}
|
||||
else {
|
||||
Attach(fd);
|
||||
return TRUE;
|
||||
}
|
||||
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 accessMode)
|
||||
{
|
||||
int flags = O_BINARY;
|
||||
int flags = O_BINARY;
|
||||
|
||||
switch ( mode ) {
|
||||
case read:
|
||||
flags |= O_RDONLY;
|
||||
break;
|
||||
switch ( mode ) {
|
||||
case read:
|
||||
flags |= O_RDONLY;
|
||||
break;
|
||||
|
||||
case write:
|
||||
flags |= O_WRONLY | O_CREAT | O_TRUNC;
|
||||
break;
|
||||
case write:
|
||||
flags |= O_WRONLY | O_CREAT | O_TRUNC;
|
||||
break;
|
||||
|
||||
case write_append:
|
||||
flags |= O_WRONLY | O_APPEND;
|
||||
break;
|
||||
case write_append:
|
||||
flags |= O_WRONLY | O_APPEND;
|
||||
break;
|
||||
|
||||
case read_write:
|
||||
flags |= O_RDWR;
|
||||
break;
|
||||
}
|
||||
case read_write:
|
||||
flags |= O_RDWR;
|
||||
break;
|
||||
}
|
||||
|
||||
#ifdef __SALFORDC__
|
||||
int fd = open(szFileName, flags);
|
||||
#else
|
||||
int fd = open(szFileName, flags, accessMode);
|
||||
#endif
|
||||
int fd = open(szFileName, flags ACCESS(accessMode));
|
||||
|
||||
if ( fd == -1 ) {
|
||||
wxLogSysError(_("can't open file '%s'"), szFileName);
|
||||
return FALSE;
|
||||
}
|
||||
else {
|
||||
Attach(fd);
|
||||
return TRUE;
|
||||
}
|
||||
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;
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@ -283,56 +281,56 @@ 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);
|
||||
int iRc = ::write(m_fd, (const char*) pBuf, nCount);
|
||||
#else
|
||||
int iRc = ::write(m_fd, pBuf, nCount);
|
||||
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;
|
||||
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() ) {
|
||||
#if defined(__VISUALC__) || wxHAVE_FSYNC
|
||||
if ( IsOpened() ) {
|
||||
#if defined(__VISUALC__) || wxHAVE_FSYNC
|
||||
if ( fsync(m_fd) == -1 )
|
||||
{
|
||||
wxLogSysError(_("can't flush file descriptor %d"), m_fd);
|
||||
return FALSE;
|
||||
}
|
||||
#else // no fsync
|
||||
#else // no fsync
|
||||
// just do nothing
|
||||
#endif // fsync
|
||||
}
|
||||
#endif // fsync
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@ -342,117 +340,117 @@ 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 flag = -1;
|
||||
switch ( mode ) {
|
||||
case wxFromStart:
|
||||
flag = SEEK_SET;
|
||||
break;
|
||||
|
||||
case wxFromCurrent:
|
||||
flag = SEEK_CUR;
|
||||
break;
|
||||
case wxFromCurrent:
|
||||
flag = SEEK_CUR;
|
||||
break;
|
||||
|
||||
case wxFromEnd:
|
||||
flag = SEEK_END;
|
||||
break;
|
||||
case wxFromEnd:
|
||||
flag = SEEK_END;
|
||||
break;
|
||||
|
||||
default:
|
||||
wxFAIL_MSG(_("unknown seek origin"));
|
||||
}
|
||||
default:
|
||||
wxFAIL_MSG(_("unknown seek origin"));
|
||||
}
|
||||
|
||||
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, flag);
|
||||
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 = 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;
|
||||
}
|
||||
|
||||
// get current file length
|
||||
off_t wxFile::Length() const
|
||||
{
|
||||
wxASSERT( IsOpened() );
|
||||
wxASSERT( IsOpened() );
|
||||
|
||||
#ifdef __VISUALC__
|
||||
#ifdef __VISUALC__
|
||||
int iRc = _filelength(m_fd);
|
||||
#else // !VC++
|
||||
#else // !VC++
|
||||
int iRc = tell(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 // VC++
|
||||
|
||||
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__ ) || defined(__SALFORDC__)
|
||||
#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;
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
@ -464,37 +462,66 @@ descriptor %d"), m_fd);
|
||||
// ----------------------------------------------------------------------------
|
||||
wxTempFile::wxTempFile(const wxString& strName)
|
||||
{
|
||||
Open(strName);
|
||||
Open(strName);
|
||||
}
|
||||
|
||||
bool wxTempFile::Open(const wxString& strName)
|
||||
{
|
||||
m_strName = 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__ )
|
||||
// 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_strTemp << strName << szMktempSuffix;
|
||||
mktemp((char *)m_strTemp.c_str()); // will do because length doesn't change
|
||||
#else // Windows
|
||||
#else // Windows
|
||||
wxString strPath;
|
||||
wxSplitPath(strName, &strPath, NULL, NULL);
|
||||
if ( strPath.IsEmpty() )
|
||||
strPath = '.'; // GetTempFileName will fail if we give it empty string
|
||||
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)) )
|
||||
// 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");
|
||||
wxLogLastError("GetTempFileName");
|
||||
m_strTemp.UngetWriteBuf();
|
||||
#endif // Windows/Unix
|
||||
#endif // Windows/Unix
|
||||
|
||||
return m_file.Open(m_strTemp, wxFile::write);
|
||||
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 )
|
||||
{
|
||||
// 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;
|
||||
}
|
||||
else
|
||||
{
|
||||
wxLogLastError("stat");
|
||||
}
|
||||
|
||||
// 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);
|
||||
|
||||
#ifdef __UNIX__
|
||||
// restore umask now that the file is created
|
||||
(void)umask(umaskOld);
|
||||
#endif // Unix
|
||||
|
||||
return ok;
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@ -503,30 +530,30 @@ bool wxTempFile::Open(const wxString& strName)
|
||||
|
||||
wxTempFile::~wxTempFile()
|
||||
{
|
||||
if ( IsOpened() )
|
||||
Discard();
|
||||
if ( IsOpened() )
|
||||
Discard();
|
||||
}
|
||||
|
||||
bool wxTempFile::Commit()
|
||||
{
|
||||
m_file.Close();
|
||||
m_file.Close();
|
||||
|
||||
if ( wxFile::Exists(m_strName) && remove(m_strName) != 0 ) {
|
||||
wxLogSysError(_("can't remove file '%s'"), m_strName.c_str());
|
||||
return FALSE;
|
||||
}
|
||||
if ( wxFile::Exists(m_strName) && remove(m_strName) != 0 ) {
|
||||
wxLogSysError(_("can't remove file '%s'"), m_strName.c_str());
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if ( rename(m_strTemp, m_strName) != 0 ) {
|
||||
wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());
|
||||
return FALSE;
|
||||
}
|
||||
if ( rename(m_strTemp, m_strName) != 0 ) {
|
||||
wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
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 ( remove(m_strTemp) != 0 )
|
||||
wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user