Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxTempFile now respects the access rights under Unix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-04-06 16:28:21 +00:00
parent c972e125b6
commit 49d5d881d4
1 changed files with 272 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

517
src/common/file.cpp
View File

@@ -31,29 +31,29 @@
#include <io.h> #include <io.h>
#ifndef __SALFORDC__ #ifndef __SALFORDC__
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#define NOSERVICE #define NOSERVICE
#define NOIME #define NOIME
#define NOATOM #define NOATOM
#define NOGDI #define NOGDI
#define NOGDICAPMASKS #define NOGDICAPMASKS
#define NOMETAFILE #define NOMETAFILE
#define NOMINMAX #define NOMINMAX
#define NOMSG #define NOMSG
#define NOOPENFILE #define NOOPENFILE
#define NORASTEROPS #define NORASTEROPS
#define NOSCROLL #define NOSCROLL
#define NOSOUND #define NOSOUND
#define NOSYSMETRICS #define NOSYSMETRICS
#define NOTEXTMETRIC #define NOTEXTMETRIC
#define NOWH #define NOWH
#define NOCOMM #define NOCOMM
#define NOKANJI #define NOKANJI
#define NOCRYPT #define NOCRYPT
#define NOMCX #define NOMCX
#endif #endif
#include <windows.h> // for GetTempFileName #include <windows.h> // for GetTempFileName
#elif (defined(__UNIX__) || defined(__GNUWIN32__)) #elif (defined(__UNIX__) || defined(__GNUWIN32__))
#include <unistd.h> #include <unistd.h>
#ifdef __GNUWIN32__ #ifdef __GNUWIN32__
@@ -83,42 +83,42 @@
// Microsoft compiler loves underscores, feed them to it // Microsoft compiler loves underscores, feed them to it
#ifdef __VISUALC__ #ifdef __VISUALC__
// functions // functions
#define open _open #define open _open
#define close _close #define close _close
#define read _read #define read _read
#define write _write #define write _write
#define lseek _lseek #define lseek _lseek
#define fsync _commit #define fsync _commit
#define access _access #define access _access
#define eof _eof #define eof _eof
// types // types
#define stat _stat #define stat _stat
// constants // constants
#define O_RDONLY _O_RDONLY #define O_RDONLY _O_RDONLY
#define O_WRONLY _O_WRONLY #define O_WRONLY _O_WRONLY
#define O_RDWR _O_RDWR #define O_RDWR _O_RDWR
#define O_EXCL _O_EXCL #define O_EXCL _O_EXCL
#define O_CREAT _O_CREAT #define O_CREAT _O_CREAT
#define O_BINARY _O_BINARY #define O_BINARY _O_BINARY
#define S_IFDIR _S_IFDIR #define S_IFDIR _S_IFDIR
#define S_IFREG _S_IFREG #define S_IFREG _S_IFREG
#else #else
#define tell(fd) lseek(fd, 0, SEEK_CUR) #define tell(fd) lseek(fd, 0, SEEK_CUR)
#endif // VC++ #endif // VC++
#if defined(__BORLANDC__) || defined(_MSC_VER) #if defined(__BORLANDC__) || defined(_MSC_VER)
#define W_OK 2 #define W_OK 2
#define R_OK 4 #define R_OK 4
#endif #endif
// there is no distinction between text and binary files under Unix // there is no distinction between text and binary files under Unix
#ifdef __UNIX__ #ifdef __UNIX__
#define O_BINARY (0) #define O_BINARY (0)
#endif //__UNIX__ #endif //__UNIX__
#ifdef __SALFORDC__ #ifdef __SALFORDC__
@@ -141,6 +141,14 @@
char gwxMacFileName3[ MAX_PATH ] ; char gwxMacFileName3[ MAX_PATH ] ;
#endif #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 // implementation of wxFile
// ============================================================================ // ============================================================================
@@ -150,33 +158,31 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
bool wxFile::Exists(const char *name) bool wxFile::Exists(const char *name)
{ {
#ifdef __SALFORDC__ struct stat st;
struct _stat st;
#else
struct stat st;
#endif
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) bool wxFile::Access(const char *name, OpenMode mode)
{ {
int how = 0; int how = 0;
switch ( mode ) { switch ( mode ) {
case read: case read:
how = R_OK; how = R_OK;
break; break;
case write: case write:
how = W_OK; how = W_OK;
break; break;
default: default:
wxFAIL_MSG("bad wxFile::Access mode parameter."); 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 // ctors
wxFile::wxFile(const char *szFileName, OpenMode mode) wxFile::wxFile(const char *szFileName, OpenMode mode)
{ {
m_fd = fd_invalid; m_fd = fd_invalid;
m_error = FALSE; m_error = FALSE;
Open(szFileName, mode); Open(szFileName, mode);
} }
// dtor // dtor
wxFile::~wxFile() wxFile::~wxFile()
{ {
Close(); Close();
} }
// create the file, fail if it already exists and bOverwrite // create the file, fail if it already exists and bOverwrite
bool wxFile::Create(const char *szFileName, bool bOverwrite, int accessMode) bool wxFile::Create(const char *szFileName, bool bOverwrite, int accessMode)
{ {
// if bOverwrite we create a new file or truncate the existing one, // 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 // otherwise we only create the new file and fail if it already exists
#ifdef __SALFORDC__ int fd = open(szFileName,
int fd = open(szFileName, O_WRONLY | O_CREAT | O_WRONLY | O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL)
(bOverwrite ? O_TRUNC : O_EXCL)); ACCESS(accessMode));
#else
int fd = open(szFileName, O_WRONLY | O_CREAT |
(bOverwrite ? O_TRUNC : O_EXCL), accessMode);
#endif
if ( fd == -1 ) { if ( fd == -1 ) {
wxLogSysError(_("can't create file '%s'"), szFileName); wxLogSysError(_("can't create file '%s'"), szFileName);
return FALSE; return FALSE;
} }
else { else {
Attach(fd); Attach(fd);
return TRUE; return TRUE;
} }
} }
// open the file // open the file
bool wxFile::Open(const char *szFileName, OpenMode mode, int accessMode) bool wxFile::Open(const char *szFileName, OpenMode mode, int accessMode)
{ {
int flags = O_BINARY; int flags = O_BINARY;
switch ( mode ) { switch ( mode ) {
case read: case read:
flags |= O_RDONLY; flags |= O_RDONLY;
break; break;
case write: case write:
flags |= O_WRONLY | O_CREAT | O_TRUNC; flags |= O_WRONLY | O_CREAT | O_TRUNC;
break; break;
case write_append: case write_append:
flags |= O_WRONLY | O_APPEND; flags |= O_WRONLY | O_APPEND;
break; break;
case read_write: case read_write:
flags |= O_RDWR; flags |= O_RDWR;
break; break;
} }
#ifdef __SALFORDC__ int fd = open(szFileName, flags ACCESS(accessMode));
int fd = open(szFileName, flags);
#else
int fd = open(szFileName, flags, accessMode);
#endif
if ( fd == -1 ) { if ( fd == -1 ) {
wxLogSysError(_("can't open file '%s'"), szFileName); wxLogSysError(_("can't open file '%s'"), szFileName);
return FALSE; return FALSE;
} }
else { else {
Attach(fd); Attach(fd);
return TRUE; return TRUE;
} }
} }
// close // close
bool wxFile::Close() bool wxFile::Close()
{ {
if ( IsOpened() ) { if ( IsOpened() ) {
if ( close(m_fd) == -1 ) { if ( close(m_fd) == -1 ) {
wxLogSysError(_("can't close file descriptor %d"), m_fd); wxLogSysError(_("can't close file descriptor %d"), m_fd);
m_fd = fd_invalid; m_fd = fd_invalid;
return FALSE; return FALSE;
}
else
m_fd = fd_invalid;
} }
else
m_fd = fd_invalid;
}
return TRUE; return TRUE;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -283,56 +281,56 @@ bool wxFile::Close()
// read // read
off_t wxFile::Read(void *pBuf, off_t nCount) off_t wxFile::Read(void *pBuf, off_t nCount)
{ {
wxCHECK( (pBuf != NULL) && IsOpened(), 0 ); wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
#ifdef __MWERKS__ #ifdef __MWERKS__
int iRc = ::read(m_fd, (char*) pBuf, nCount); int iRc = ::read(m_fd, (char*) pBuf, nCount);
#else #else
int iRc = ::read(m_fd, pBuf, nCount); int iRc = ::read(m_fd, pBuf, nCount);
#endif #endif
if ( iRc == -1 ) { if ( iRc == -1 ) {
wxLogSysError(_("can't read from file descriptor %d"), m_fd); wxLogSysError(_("can't read from file descriptor %d"), m_fd);
return wxInvalidOffset; return wxInvalidOffset;
} }
else else
return (size_t)iRc; return (size_t)iRc;
} }
// write // write
size_t wxFile::Write(const void *pBuf, size_t nCount) size_t wxFile::Write(const void *pBuf, size_t nCount)
{ {
wxCHECK( (pBuf != NULL) && IsOpened(), 0 ); wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
#ifdef __MWERKS__ #ifdef __MWERKS__
int iRc = ::write(m_fd, (const char*) pBuf, nCount); int iRc = ::write(m_fd, (const char*) pBuf, nCount);
#else #else
int iRc = ::write(m_fd, pBuf, nCount); int iRc = ::write(m_fd, pBuf, nCount);
#endif #endif
if ( iRc == -1 ) { if ( iRc == -1 ) {
wxLogSysError(_("can't write to file descriptor %d"), m_fd); wxLogSysError(_("can't write to file descriptor %d"), m_fd);
m_error = TRUE; m_error = TRUE;
return 0; return 0;
} }
else else
return iRc; return iRc;
} }
// flush // flush
bool wxFile::Flush() bool wxFile::Flush()
{ {
if ( IsOpened() ) { if ( IsOpened() ) {
#if defined(__VISUALC__) || wxHAVE_FSYNC #if defined(__VISUALC__) || wxHAVE_FSYNC
if ( fsync(m_fd) == -1 ) if ( fsync(m_fd) == -1 )
{ {
wxLogSysError(_("can't flush file descriptor %d"), m_fd); wxLogSysError(_("can't flush file descriptor %d"), m_fd);
return FALSE; return FALSE;
} }
#else // no fsync #else // no fsync
// just do nothing // just do nothing
#endif // fsync #endif // fsync
} }
return TRUE; return TRUE;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -342,117 +340,117 @@ bool wxFile::Flush()
// seek // seek
off_t wxFile::Seek(off_t ofs, wxSeekMode mode) off_t wxFile::Seek(off_t ofs, wxSeekMode mode)
{ {
wxASSERT( IsOpened() ); wxASSERT( IsOpened() );
int flag = -1; int flag = -1;
switch ( mode ) { switch ( mode ) {
case wxFromStart: case wxFromStart:
flag = SEEK_SET; flag = SEEK_SET;
break; break;
case wxFromCurrent: case wxFromCurrent:
flag = SEEK_CUR; flag = SEEK_CUR;
break; break;
case wxFromEnd: case wxFromEnd:
flag = SEEK_END; flag = SEEK_END;
break; break;
default: default:
wxFAIL_MSG(_("unknown seek origin")); wxFAIL_MSG(_("unknown seek origin"));
} }
int iRc = lseek(m_fd, ofs, flag); int iRc = lseek(m_fd, ofs, flag);
if ( iRc == -1 ) { if ( iRc == -1 ) {
wxLogSysError(_("can't seek on file descriptor %d"), m_fd); wxLogSysError(_("can't seek on file descriptor %d"), m_fd);
return wxInvalidOffset; return wxInvalidOffset;
} }
else else
return (off_t)iRc; return (off_t)iRc;
} }
// get current off_t // get current off_t
off_t wxFile::Tell() const off_t wxFile::Tell() const
{ {
wxASSERT( IsOpened() ); wxASSERT( IsOpened() );
int iRc = tell(m_fd); int iRc = tell(m_fd);
if ( iRc == -1 ) { if ( iRc == -1 ) {
wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd); wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd);
return wxInvalidOffset; return wxInvalidOffset;
} }
else else
return (off_t)iRc; return (off_t)iRc;
} }
// get current file length // get current file length
off_t wxFile::Length() const off_t wxFile::Length() const
{ {
wxASSERT( IsOpened() ); wxASSERT( IsOpened() );
#ifdef __VISUALC__ #ifdef __VISUALC__
int iRc = _filelength(m_fd); int iRc = _filelength(m_fd);
#else // !VC++ #else // !VC++
int iRc = tell(m_fd); int iRc = tell(m_fd);
if ( iRc != -1 ) { if ( iRc != -1 ) {
// @ have to use const_cast :-( // @ have to use const_cast :-(
int iLen = ((wxFile *)this)->SeekEnd(); int iLen = ((wxFile *)this)->SeekEnd();
if ( iLen != -1 ) { if ( iLen != -1 ) {
// restore old position // restore old position
if ( ((wxFile *)this)->Seek(iRc) == -1 ) { if ( ((wxFile *)this)->Seek(iRc) == -1 ) {
// error // error
iLen = -1; iLen = -1;
}
} }
}
iRc = iLen; iRc = iLen;
} }
#endif // VC++ #endif // VC++
if ( iRc == -1 ) { if ( iRc == -1 ) {
wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd); wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd);
return wxInvalidOffset; return wxInvalidOffset;
} }
else else
return (off_t)iRc; return (off_t)iRc;
} }
// is end of file reached? // is end of file reached?
bool wxFile::Eof() const 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 // @@ this doesn't work, of course, on unseekable file descriptors
off_t ofsCur = Tell(), off_t ofsCur = Tell(),
ofsMax = Length(); ofsMax = Length();
if ( ofsCur == wxInvalidOffset || ofsMax == wxInvalidOffset ) if ( ofsCur == wxInvalidOffset || ofsMax == wxInvalidOffset )
iRc = -1; iRc = -1;
else else
iRc = ofsCur == ofsMax; iRc = ofsCur == ofsMax;
#else // Windows and "native" compiler #else // Windows and "native" compiler
iRc = eof(m_fd); iRc = eof(m_fd);
#endif // Windows/Unix #endif // Windows/Unix
switch ( iRc ) { switch ( iRc ) {
case 1: case 1:
break; break;
case 0: case 0:
return FALSE; return FALSE;
case -1: case -1:
wxLogSysError(_("can't determine if the end of file is reached on \ wxLogSysError(_("can't determine if the end of file is reached on \
descriptor %d"), m_fd); descriptor %d"), m_fd);
break; break;
default: default:
wxFAIL_MSG(_("invalid eof() return value.")); wxFAIL_MSG(_("invalid eof() return value."));
} }
return TRUE; return TRUE;
} }
// ============================================================================ // ============================================================================
@@ -464,37 +462,66 @@ descriptor %d"), m_fd);
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxTempFile::wxTempFile(const wxString& strName) wxTempFile::wxTempFile(const wxString& strName)
{ {
Open(strName); Open(strName);
} }
bool wxTempFile::Open(const wxString& 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 // 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 // otherwise rename() in Commit() might not work (if the files are on
// different partitions for example). Unfortunately, the only standard // different partitions for example). Unfortunately, the only standard
// (POSIX) temp file creation function tmpnam() can't do it. // (POSIX) temp file creation function tmpnam() can't do it.
#if defined(__UNIX__) || defined(__WXSTUBS__)|| defined( __WXMAC__ ) #if defined(__UNIX__) || defined(__WXSTUBS__)|| defined( __WXMAC__ )
static const char *szMktempSuffix = "XXXXXX"; static const char *szMktempSuffix = "XXXXXX";
m_strTemp << strName << szMktempSuffix; m_strTemp << strName << szMktempSuffix;
mktemp((char *)m_strTemp.c_str()); // will do because length doesn't change mktemp((char *)m_strTemp.c_str()); // will do because length doesn't change
#else // Windows #else // Windows
wxString strPath; wxString strPath;
wxSplitPath(strName, &strPath, NULL, NULL); wxSplitPath(strName, &strPath, NULL, NULL);
if ( strPath.IsEmpty() ) 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__ #ifdef __WIN32__
if ( !GetTempFileName(strPath, "wx_",0, m_strTemp.GetWriteBuf(MAX_PATH)) ) if ( !GetTempFileName(strPath, "wx_",0, m_strTemp.GetWriteBuf(MAX_PATH)) )
#else #else
// Not sure why MSVC++ 1.5 header defines first param as BYTE - bug? // 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) (const char*) strPath, "wx_",0, m_strTemp.GetWriteBuf(MAX_PATH)) )
#endif #endif
wxLogLastError("GetTempFileName"); wxLogLastError("GetTempFileName");
m_strTemp.UngetWriteBuf(); 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() wxTempFile::~wxTempFile()
{ {
if ( IsOpened() ) if ( IsOpened() )
Discard(); Discard();
} }
bool wxTempFile::Commit() bool wxTempFile::Commit()
{ {
m_file.Close(); m_file.Close();
if ( wxFile::Exists(m_strName) && remove(m_strName) != 0 ) { if ( wxFile::Exists(m_strName) && remove(m_strName) != 0 ) {
wxLogSysError(_("can't remove file '%s'"), m_strName.c_str()); wxLogSysError(_("can't remove file '%s'"), m_strName.c_str());
return FALSE; return FALSE;
} }
if ( rename(m_strTemp, m_strName) != 0 ) { if ( rename(m_strTemp, m_strName) != 0 ) {
wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str()); wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
} }
void wxTempFile::Discard() void wxTempFile::Discard()
{ {
m_file.Close(); m_file.Close();
if ( remove(m_strTemp) != 0 ) if ( remove(m_strTemp) != 0 )
wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str()); wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
} }